diff --git a/binaries/Tag/SOL_M2_154_SSD_0028.bin b/binaries/Tag/SOL_M2_154_SSD_0028.bin new file mode 100644 index 00000000..1ac8c914 Binary files /dev/null and b/binaries/Tag/SOL_M2_154_SSD_0028.bin differ diff --git a/binaries/Tag/SOL_M2_29_LT_0028.bin b/binaries/Tag/SOL_M2_29_LT_0028.bin new file mode 100644 index 00000000..1d623e76 Binary files /dev/null and b/binaries/Tag/SOL_M2_29_LT_0028.bin differ diff --git a/binaries/Tag/SOL_M2_29_SSD_0028.bin b/binaries/Tag/SOL_M2_29_SSD_0028.bin new file mode 100644 index 00000000..f8e3c650 Binary files /dev/null and b/binaries/Tag/SOL_M2_29_SSD_0028.bin differ diff --git a/binaries/Tag/SOL_M2_29_UC_0028.bin b/binaries/Tag/SOL_M2_29_UC_0028.bin new file mode 100644 index 00000000..c5c8c8a6 Binary files /dev/null and b/binaries/Tag/SOL_M2_29_UC_0028.bin differ diff --git a/binaries/Tag/SOL_M2_42_SSD_0028.bin b/binaries/Tag/SOL_M2_42_SSD_0028.bin new file mode 100644 index 00000000..3e234fc9 Binary files /dev/null and b/binaries/Tag/SOL_M2_42_SSD_0028.bin differ diff --git a/zbs243_Tag_FW/main.c b/zbs243_Tag_FW/main.c index ce5bc55f..77c5ead7 100755 --- a/zbs243_Tag_FW/main.c +++ b/zbs243_Tag_FW/main.c @@ -442,7 +442,9 @@ void TagChanSearch() { #ifndef LEAN_VERSION void TagSlideShow() { currentChannel = 11; // suppress the no-rf image thing - displayCustomImage(CUSTOM_IMAGE_SPLASHSCREEN); + if(!displayCustomImage(CUSTOM_IMAGE_SPLASHSCREEN)){ + showSplashScreen(); // show -something- during bootup if custom splash is not defined + } // do a short channel search currentChannel = channelSelect(2); @@ -461,6 +463,9 @@ void TagSlideShow() { } } powerDown(INIT_RADIO); + powerUp(INIT_EEPROM); + writeSettings(); // entered slideshow mode, save settings to ensure the next boot is into slideshow mode + powerDown(INIT_RADIO); // suppress the no-rf image currentChannel = 11; @@ -628,7 +633,7 @@ void executeCommand(uint8_t cmd) { void main() { setupPortsInitial(); powerUp(INIT_BASE | INIT_UART); - pr("BOOTED> %d.%d.%d%s\n", fwVersion / 100, (fwVersion % 100) / 10, (fwVersion % 10), fwVersionSuffix); + pr("BOOTED> %04X%s\n",fwVersion, fwVersionSuffix); #ifdef DEBUGGUI displayLoop(); // remove me diff --git a/zbs243_Tag_FW/settings.h b/zbs243_Tag_FW/settings.h index 7a4f1348..f0682134 100755 --- a/zbs243_Tag_FW/settings.h +++ b/zbs243_Tag_FW/settings.h @@ -3,10 +3,10 @@ #include -#define FW_VERSION 0x0027 // version number -#define FW_VERSION_SUFFIX "-RDRW" // suffix, like -RC1 or whatever. -// #define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers -//#define DEBUGPROTO // debug protocol +#define FW_VERSION 0x0028 // version number +#define FW_VERSION_SUFFIX "-SLDS" // suffix, like -RC1 or whatever. +// #define DEBUGBLOCKS // uncomment to enable extra debug information on the block transfers +//#define DEBUGPROTO // debug protocol // #define DEBUGOTA // debug OTA FW updates //#define DEBUGDRAWING // debug the drawing part //#define DEBUGEPD // debug the EPD driver