mirror of https://github.com/e2002/yoradio.git
pl_text_size_018
This commit is contained in:
parent
ebd6acd3fe
commit
9c1bf08ecc
|
|
@ -252,7 +252,8 @@ void Display::_setReturnTicker(uint8_t time_s){
|
||||||
|
|
||||||
void Display::_swichMode(displayMode_e newmode) {
|
void Display::_swichMode(displayMode_e newmode) {
|
||||||
#ifdef USE_NEXTION
|
#ifdef USE_NEXTION
|
||||||
nextion.swichMode(newmode);
|
//nextion.swichMode(newmode);
|
||||||
|
nextion.putRequest({NEWMODE, newmode});
|
||||||
#endif
|
#endif
|
||||||
if (newmode == _mode || network.status != CONNECTED) return;
|
if (newmode == _mode || network.status != CONNECTED) return;
|
||||||
_mode = newmode;
|
_mode = newmode;
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef options_h
|
#ifndef options_h
|
||||||
#define options_h
|
#define options_h
|
||||||
|
|
||||||
#define YOVERSION "0.9.017"
|
#define YOVERSION "0.9.018"
|
||||||
|
|
||||||
/*******************************************************
|
/*******************************************************
|
||||||
DO NOT EDIT THIS FILE.
|
DO NOT EDIT THIS FILE.
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ void nextionCore0( void * pvParameters ){
|
||||||
|
|
||||||
void Nextion::begin(bool dummy) {
|
void Nextion::begin(bool dummy) {
|
||||||
_dummyDisplay=dummy;
|
_dummyDisplay=dummy;
|
||||||
|
mode=LOST;
|
||||||
hSerial.begin(NEXTION_BAUD, SERIAL_8N1, NEXTION_RX, NEXTION_TX);
|
hSerial.begin(NEXTION_BAUD, SERIAL_8N1, NEXTION_RX, NEXTION_TX);
|
||||||
if (!hSerial) {
|
if (!hSerial) {
|
||||||
Serial.println("Invalid HardwareSerial pin configuration, check config");
|
Serial.println("Invalid HardwareSerial pin configuration, check config");
|
||||||
|
|
@ -459,7 +460,9 @@ void Nextion::swichMode(displayMode_e newmode){
|
||||||
if (newmode == VOL) {
|
if (newmode == VOL) {
|
||||||
_volDelay = millis();
|
_volDelay = millis();
|
||||||
}
|
}
|
||||||
//if (newmode == mode) return;
|
if (newmode == mode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
mode = newmode;
|
mode = newmode;
|
||||||
#ifdef DUMMYDISPLAY
|
#ifdef DUMMYDISPLAY
|
||||||
display.mode(newmode);
|
display.mode(newmode);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue