diff --git a/firmware/assets/Fairydust.png b/firmware/assets/Fairydust.png new file mode 100644 index 0000000..fb9b795 Binary files /dev/null and b/firmware/assets/Fairydust.png differ diff --git a/firmware/assets/fairydust.bin b/firmware/assets/fairydust.bin new file mode 100644 index 0000000..efa81ee Binary files /dev/null and b/firmware/assets/fairydust.bin differ diff --git a/firmware/assets/-grayout.bin b/firmware/assets/grayout.bin similarity index 100% rename from firmware/assets/-grayout.bin rename to firmware/assets/grayout.bin diff --git a/firmware/assets/out.png b/firmware/assets/out.png index 95166cb..463c69f 100644 Binary files a/firmware/assets/out.png and b/firmware/assets/out.png differ diff --git a/firmware/src/applications/assets/fusion_font.bin b/firmware/src/applications/assets/fusion_font.bin new file mode 100644 index 0000000..7e4fdc8 Binary files /dev/null and b/firmware/src/applications/assets/fusion_font.bin differ diff --git a/firmware/src/applications/image_display.cpp b/firmware/src/applications/image_display.cpp index c89658a..508de66 100644 --- a/firmware/src/applications/image_display.cpp +++ b/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; diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index 0dc8192..af40db5 100644 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -21,7 +21,7 @@ struct ImageDisplayApp image_display {}; std::vector> apps = { std::ref(beat_detect_app), std::ref(fackel_app), - std::ref(image_display), + //std::ref(image_display), }; static unsigned int current_app = 0; diff --git a/firmware/src/zauberstab.cpp b/firmware/src/zauberstab.cpp index c65e1bb..b54a18d 100644 --- a/firmware/src/zauberstab.cpp +++ b/firmware/src/zauberstab.cpp @@ -34,8 +34,8 @@ int zauberstab_init() } myAcc.setDataRate(ADXL345_DATA_RATE_200); - myAcc.setRange(ADXL345_RANGE_8G); - myAcc.setGeneralTapParameters(ADXL345_XY0, 3.0, 30, 100.0); + myAcc.setRange(ADXL345_RANGE_16G); + 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); diff --git a/inventor/klaue.stl b/inventor/klaue.stl new file mode 100644 index 0000000..bc6d28a Binary files /dev/null and b/inventor/klaue.stl differ diff --git a/inventor/mutter-halter.stl b/inventor/mutter-halter.stl new file mode 100644 index 0000000..f817166 Binary files /dev/null and b/inventor/mutter-halter.stl differ