everything from kitchen pc

Signed-off-by: Thomas Schmid <tom@binary-kitchen.de>

firmware/src/applications/image_display.cpp

@@ -6,6 +6,7 @@
 
 extern "C"
 {
+#define BASE_DIR "C:/Users/Binarykitchen/Documents/tom/fusion-zauberstab/firmware/"
 asm(
 ".macro inc_sample name, filename\n\t"
         ".pushsection .rodata\n\t"
@@ -23,7 +24,8 @@ asm(
 	extern const unsigned int label##_size; \
 
 
-incbin(fusion_font, "C:/Users/Binarykitchen/Documents/tom/fusion-zauberstab/firmware/src/applications/fusion_font.bin")
+
+incbin(fusion_font, BASE_DIR "assets/fairydust.bin")
 }
 
 static CRGB get_pixel(unsigned int x, unsigned int y, unsigned int sx, const unsigned char *data) {
@@ -47,9 +49,10 @@ void ImageDisplayApp::deinit() {
 
 void ImageDisplayApp::loop() {
     static unsigned int col = 0;
+    unsigned int sx = fusion_font_size/(3*48);
 
     for (int i = 0; i< NUM_LEDS; i++) {
-        leds[i] = get_pixel(col, i, 218, fusion_font);
+        leds[i] = get_pixel(col, i, sx, fusion_font);
     }
     col++;
     col = col % 218;

firmware/src/main.cpp

@@ -21,7 +21,7 @@ struct ImageDisplayApp image_display {};
 std::vector<std::reference_wrapper<App>> apps = {
     std::ref<App>(beat_detect_app),
     std::ref<App>(fackel_app),
-    std::ref<App>(image_display),
+    //std::ref<App>(image_display),
     };
 
 static unsigned int current_app = 0;

firmware/src/zauberstab.cpp

@@ -34,8 +34,8 @@ int zauberstab_init()
     }
 
     myAcc.setDataRate(ADXL345_DATA_RATE_200);
-    myAcc.setRange(ADXL345_RANGE_8G);
+    myAcc.setRange(ADXL345_RANGE_16G);
-    myAcc.setGeneralTapParameters(ADXL345_XY0, 3.0, 30, 100.0);
+    myAcc.setGeneralTapParameters(ADXL345_XY0, 5.0, 50, 100.0);
     myAcc.setAdditionalDoubleTapParameters(false, 250);
     myAcc.setInterrupt(ADXL345_DOUBLE_TAP, INT_PIN_1);
     attachInterrupt(digitalPinToInterrupt(4), double_tab_int, RISING);