v0.7.540

e2002 · Sep 6, 2022 · dbe0f32 · dbe0f32
1 parent da238ea
commit dbe0f32
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -298,6 +298,9 @@ Work is in progress...
 
 ---
 ## Version history
+#### v0.7.540
+- fixed compilation error when using NEXTION display with DUMMY display
+
 #### v0.7.534
 - added control via uart (see [list of commands](https://github.com/e2002/yoradio/wiki/List-of-available-commands-(UART-telnet-GET-POST))). The uart and telnet commands are the same.
 - added additional commands

diff --git a/yoRadio/display.cpp b/yoRadio/display.cpp
@@ -687,6 +687,7 @@ void Display::wakeup(){
 
 #ifdef DUMMYDISPLAY
 /******************************************************************************************************************/
+#ifndef USE_NEXTION
 void ticks() {
   static bool divrssi;
   network.timeinfo.tm_sec ++;
@@ -698,7 +699,7 @@ void ticks() {
     divrssi=true;
   }
 }
-
+#endif
 void Display::bootString(const char* text, byte y) {
   #ifdef USE_NEXTION
   if(y==2) nextion.bootString(text);
@@ -712,8 +713,9 @@ void Display::init(){
 void Display::start(bool reboot){
   #ifdef USE_NEXTION
   nextion.start();
-  #endif
+  #else
   timer.attach_ms(1000, ticks);
+  #endif
 }
 void Display::putRequest(requestParams_t request){
   #ifdef USE_NEXTION

diff --git a/yoRadio/options.h b/yoRadio/options.h
@@ -1,7 +1,7 @@
 #ifndef options_h
 #define options_h
 
-#define VERSION "0.7.534"
+#define VERSION "0.7.540"
 
 /*******************************************************
 DO NOT EDIT THIS FILE.