diff --git a/platformio.ini b/platformio.ini index 141e897..96c6eca 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,7 +12,7 @@ platform = espressif32 board = wt32-eth01 framework = arduino -lib_deps = siwats/ESPMegaPROR3@^1.1.5 +lib_deps = siwats/ESPMegaPROR3@^1.2.1 knolleary/PubSubClient@^2.8 ivanseidel/ArduinoThread@^2.1.1 arduino-libraries/Arduino_BuiltIn@^1.0.0 @@ -20,4 +20,5 @@ lib_deps = siwats/ESPMegaPROR3@^1.1.5 z3t0/IRremote@^4.2.0 robtillaart/DHTNEW@^0.4.18 seithan/Easy Nextion Library@^1.0.6 -monitor_speed = 115200 \ No newline at end of file +monitor_speed = 115200 +board_build.partitions = no_ota.csv \ No newline at end of file diff --git a/src/lcd.cpp b/src/lcd.cpp index db62070..1a74694 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -5,21 +5,6 @@ void lcd_send_stop_bit() { Serial.write(0xFF); Serial.write(0xFF); } -int lcd_get_int() { - return 0; -} - -float lcd_get_float() { - -} - -String lcd_get_str() { - -} - -String lcd_set_var(String var, String value) { - -} void lcd_send_command(String command) { lcd_send_stop_bit(); @@ -27,14 +12,6 @@ void lcd_send_command(String command) { lcd_send_stop_bit(); } -String lcd_wait_response() { - -} - -void lcd_touch_callback(int page, int id) { - -} - void lcd_reset() { lcd_send_stop_bit(); lcd_send_command("rest"); diff --git a/src/main.cpp b/src/main.cpp index d72f841..ba255fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -816,8 +816,10 @@ void lcd_refresh() } void lcd_top_bar_update() { - String time_str = String(rtc.getHour()) + ":" + String(rtc.getMinute()); - panel.writeStr("time.txt", time_str); + char time_buffer[15]; + //rtctime_t time = ESPMega_getTime(); + //sprintf(time_buffer, "%02d:%02d",time.hours,time.minutes); + //panel.writeStr("time.txt", time_buffer); panel.writeNum("server.pic", standalone ? 4 : 5); panel.writeNum("lan.pic", ETH.linkUp() ? 3 : 2); }