This commit is contained in:
e2002
2022-09-06 18:18:13 +03:00
parent da238ea42a
commit dbe0f32e14
3 changed files with 8 additions and 3 deletions

View File

@@ -298,6 +298,9 @@ Work is in progress...
--- ---
## Version history ## Version history
#### v0.7.540
- fixed compilation error when using NEXTION display with DUMMY display
#### v0.7.534 #### 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 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 - added additional commands

View File

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

View File

@@ -1,7 +1,7 @@
#ifndef options_h #ifndef options_h
#define options_h #define options_h
#define VERSION "0.7.534" #define VERSION "0.7.540"
/******************************************************* /*******************************************************
DO NOT EDIT THIS FILE. DO NOT EDIT THIS FILE.