M2 ZBS243 v0028 - Slideshow fix

This commit is contained in:
jjwbruijn
2024-05-03 20:47:19 +02:00
parent ab744c0d87
commit f9ea040b33
7 changed files with 11 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -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

View File

@@ -3,10 +3,10 @@
#include <stdint.h>
#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