diff --git a/tag_fw/board/zbs154v033/screen.h b/tag_fw/board/zbs154v033/screen.h index 6d1d4997..034fd430 100644 --- a/tag_fw/board/zbs154v033/screen.h +++ b/tag_fw/board/zbs154v033/screen.h @@ -21,7 +21,5 @@ #define SCREEN_DATA_PASSES 2 -#define SCREEN_LUT_LENGTH 10 - #endif \ No newline at end of file diff --git a/tag_fw/board/zbs29v033/screen.h b/tag_fw/board/zbs29v033/screen.h index 101e5339..a7352485 100644 --- a/tag_fw/board/zbs29v033/screen.h +++ b/tag_fw/board/zbs29v033/screen.h @@ -21,7 +21,4 @@ #define SCREEN_DATA_PASSES 2 -#define SCREEN_LUT_LENGTH 7 - - #endif \ No newline at end of file diff --git a/tag_fw/board/zbs42v033/screen.h b/tag_fw/board/zbs42v033/screen.h index 5f7891ff..96501a0e 100644 --- a/tag_fw/board/zbs42v033/screen.h +++ b/tag_fw/board/zbs42v033/screen.h @@ -21,7 +21,5 @@ #define SCREEN_DATA_PASSES 2 -#define SCREEN_LUT_LENGTH 7 - #endif \ No newline at end of file diff --git a/tag_fw/fw154.bin b/tag_fw/fw154.bin index 4d7904aa..3f06a828 100644 Binary files a/tag_fw/fw154.bin and b/tag_fw/fw154.bin differ diff --git a/tag_fw/fw29.bin b/tag_fw/fw29.bin index 18c0e8b9..211ef15d 100644 Binary files a/tag_fw/fw29.bin and b/tag_fw/fw29.bin differ diff --git a/tag_fw/fw42.bin b/tag_fw/fw42.bin index 7d76b092..3fbc023d 100644 Binary files a/tag_fw/fw42.bin and b/tag_fw/fw42.bin differ diff --git a/tag_fw/lut.h b/tag_fw/lut.h index 9a09d3ca..4f9eba67 100644 --- a/tag_fw/lut.h +++ b/tag_fw/lut.h @@ -10,11 +10,10 @@ #define LUTGROUP_IMPROVE_REDS 5 #define LUTGROUP_UNUSED 6 -#if (SCREEN_LUT_LENGTH == 10) #define LUTGROUP_UNKNOWN 7 #define LUTGROUP_UNUSED3 8 #define LUTGROUP_UNUSED4 9 -#endif + struct vgroup { uint8_t A : 2; diff --git a/tag_fw/settings.h b/tag_fw/settings.h index 04be2750..42a795c9 100644 --- a/tag_fw/settings.h +++ b/tag_fw/settings.h @@ -3,9 +3,9 @@ #include -#define FW_VERSION 013 // version number (max 2.5.5 :) ) -#define FW_VERSION_SUFFIX "-rf99" // suffix, like -RC1 or whatever. -#define HAS_BUTTON // uncomment to enable reading a push button (connect between 'TEST' en 'GND' on the tag, along with a 100nF capacitor in parallel). -#define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers - +#define FW_VERSION 014 // version number (max 2.5.5 :) ) +#define FW_VERSION_SUFFIX "-lutje" // suffix, like -RC1 or whatever. +#define HAS_BUTTON // uncomment to enable reading a push button (connect between 'TEST' en 'GND' on the tag, along with a 100nF capacitor in parallel). +#define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers +//#define PRINT_LUT // uncomment if you want the tag to print the LUT for the current temperature bracket #endif \ No newline at end of file diff --git a/tag_fw/userinterface.c b/tag_fw/userinterface.c index a77e134c..0af58a67 100644 --- a/tag_fw/userinterface.c +++ b/tag_fw/userinterface.c @@ -180,7 +180,7 @@ void addScanResult(uint8_t channel, uint8_t lqi) { #if (SCREEN_WIDTH == 128) // 2.9" epdPrintBegin(56 + ((resultcounter % 4) * 16), 282 - (47 * (resultcounter / 4)), EPD_DIRECTION_Y, EPD_SIZE_SINGLE, EPD_COLOR_BLACK); #endif -#if (SCREEN_WIDTH ==150) // 1.54" +#if (SCREEN_WIDTH ==152) // 1.54" epdPrintBegin(4 + (47 * (resultcounter / 8)), 31 + (15 * (resultcounter % 8)), EPD_DIRECTION_X, EPD_SIZE_SINGLE, EPD_COLOR_BLACK); #endif #if (SCREEN_WIDTH == 400) // 4.2"