From dbe0f32e1410be117b0b9010e12cb050a7f4dda9 Mon Sep 17 00:00:00 2001 From: e2002 Date: Tue, 6 Sep 2022 18:18:13 +0300 Subject: [PATCH] v0.7.540 --- README.md | 3 +++ yoRadio/display.cpp | 6 ++++-- yoRadio/options.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7bb8d7e..a41d439 100644 --- 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 index 3744742..62aa41f 100644 --- 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 index 4f97ef4..3771e3c 100644 --- 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.