Skip to content

Commit dbe0f32

Browse files
committed
v0.7.540
1 parent da238ea commit dbe0f32

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,9 @@ Work is in progress...
298298

299299
---
300300
## Version history
301+
#### v0.7.540
302+
- fixed compilation error when using NEXTION display with DUMMY display
303+
301304
#### v0.7.534
302305
- 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.
303306
- added additional commands

yoRadio/display.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ void Display::wakeup(){
687687

688688
#ifdef DUMMYDISPLAY
689689
/******************************************************************************************************************/
690+
#ifndef USE_NEXTION
690691
void ticks() {
691692
static bool divrssi;
692693
network.timeinfo.tm_sec ++;
@@ -698,7 +699,7 @@ void ticks() {
698699
divrssi=true;
699700
}
700701
}
701-
702+
#endif
702703
void Display::bootString(const char* text, byte y) {
703704
#ifdef USE_NEXTION
704705
if(y==2) nextion.bootString(text);
@@ -712,8 +713,9 @@ void Display::init(){
712713
void Display::start(bool reboot){
713714
#ifdef USE_NEXTION
714715
nextion.start();
715-
#endif
716+
#else
716717
timer.attach_ms(1000, ticks);
718+
#endif
717719
}
718720
void Display::putRequest(requestParams_t request){
719721
#ifdef USE_NEXTION

yoRadio/options.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef options_h
22
#define options_h
33

4-
#define VERSION "0.7.534"
4+
#define VERSION "0.7.540"
55

66
/*******************************************************
77
DO NOT EDIT THIS FILE.

0 commit comments

Comments
 (0)