From 0e0c0283e37b5ee5ebb856698a2542270cc25acb Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Thu, 26 Sep 2024 21:36:51 +0100
Subject: [PATCH 01/12] Fix leftpondian date and add more info to LCD

---
 src/lcd_tft.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 7785c53c..d3eb6068 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -316,12 +316,20 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       render_image(status_icon.c_str(), 16, 52);
 
       char buffer[32];
+      char buffer2[10];
 
       snprintf(buffer, sizeof(buffer), "%d", _evse->getChargeCurrent());
-      render_right_text_box(buffer, 66, 220, 154, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, !_full_update, 3);
+      render_right_text_box(buffer, 66, 175, 154, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, !_full_update, 2);
       if(_full_update) {
-        render_left_text_box("A", 224, 200, 34, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, false, 1);
+        render_left_text_box("A", 224, 165, 34, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, false, 1);
       }
+      if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_EVSE_MCP9808)) {
+        snprintf(buffer, sizeof(buffer), "%.0fC", _evse->getTemperature(EVSE_MONITOR_TEMP_EVSE_MCP9808));
+        render_right_text_box(buffer, WHITE_AREA_X, 230, 45, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
+      }
+      snprintf(buffer, sizeof(buffer), "%.2f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
+      get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));
+      render_info_box(buffer2, buffer, 66, 175, INFO_BOX_WIDTH, INFO_BOX_HEIGHT, _full_update);
 
       String line = getLine(0);
       if(line.length() == 0) {
@@ -336,7 +344,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
         gettimeofday(&local_time, NULL);
         struct tm timeinfo;
         localtime_r(&local_time.tv_sec, &timeinfo);
-        strftime(buffer, sizeof(buffer), "%d/%m/%Y, %l:%M %p", &timeinfo);
+        strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M", &timeinfo);
         line = buffer;
       }
       render_centered_text_box(line.c_str(), INFO_BOX_X, 96, INFO_BOX_WIDTH, &FreeSans9pt7b, TFT_OPENEVSE_TEXT, TFT_WHITE, !_full_update);

From 4abc3c10b9af427ec50811b5f4fe8a8f629af967 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Fri, 27 Sep 2024 15:37:44 +0100
Subject: [PATCH 02/12] Separate car icon; backlight timeout

---
 src/lcd_tft.cpp | 142 ++++++++++++++++++++++++++++++++++--------------
 src/lcd_tft.h   |   6 ++
 2 files changed, 107 insertions(+), 41 deletions(-)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index d3eb6068..98d96d21 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -18,11 +18,15 @@
 #include "embedded_files.h"
 //#include "fonts/DejaVu_Sans_72.h"
 
+#define TFT_BACKLIGHT_TIMEOUT_MS 300000 // 5 mins
+#define TFT_BACKLIGHT_CHARGING_THRESHOLD 0.1  //stay awake if car is drawing more than this many amps
+
 #define TFT_OPENEVSE_BACK       0x2413
 #define TFT_OPENEVSE_GREEN      0x3E92
 #define TFT_OPENEVSE_TEXT       0x1BD1
 #define TFT_OPENEVSE_INFO_BACK  0x23d1
 
+
 // The TFT is natively portrait but we are rendering as landscape
 #define TFT_SCREEN_WIDTH        TFT_HEIGHT
 #define TFT_SCREEN_HEIGHT       TFT_WIDTH
@@ -195,8 +199,8 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
 #endif
 
     pinMode(LCD_BACKLIGHT_PIN, OUTPUT);
-    digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
-
+    //digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
+    wakeBacklight();
     _initialise = false;
   }
 
@@ -275,45 +279,49 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
         render_image("/button_bar.png", BUTTON_BAR_X, BUTTON_BAR_Y);
       }
 
-      String status_icon = "/car_disconnected.png";
-      if(_evse->isVehicleConnected())
+      String status_icon = "/disabled.png";
+      String car_icon = "/car_disconnected.png";
+
+      if(_evse->isVehicleConnected()) {
+        car_icon = "/car_connected.png";
+      }
+      
+      switch (_evse->getEvseState())
       {
-        switch (_evse->getEvseState())
-        {
-          case OPENEVSE_STATE_STARTING:
-            status_icon = "/start.png";
-            break;
-          case OPENEVSE_STATE_NOT_CONNECTED:
-            status_icon = "/not_connected.png";
-            break;
-          case OPENEVSE_STATE_CONNECTED:
-            status_icon = "/connected.png";
-            break;
-          case OPENEVSE_STATE_CHARGING:
-            status_icon = "/charging.png";
-            break;
-          case OPENEVSE_STATE_VENT_REQUIRED:
-          case OPENEVSE_STATE_DIODE_CHECK_FAILED:
-          case OPENEVSE_STATE_GFI_FAULT:
-          case OPENEVSE_STATE_NO_EARTH_GROUND:
-          case OPENEVSE_STATE_STUCK_RELAY:
-          case OPENEVSE_STATE_GFI_SELF_TEST_FAILED:
-          case OPENEVSE_STATE_OVER_TEMPERATURE:
-          case OPENEVSE_STATE_OVER_CURRENT:
-            status_icon = "/error.png";
-            break;
-          case OPENEVSE_STATE_SLEEPING:
-            status_icon = "/sleeping.png";
-            break;
-          case OPENEVSE_STATE_DISABLED:
-            status_icon = "/disabled.png";
-            break;
-          default:
-            break;
-        }
+        case OPENEVSE_STATE_STARTING:
+          status_icon = "/start.png";
+          break;
+        case OPENEVSE_STATE_NOT_CONNECTED:
+          status_icon = "/not_connected.png";
+          break;
+        case OPENEVSE_STATE_CONNECTED:
+          status_icon = "/connected.png";
+          break;
+        case OPENEVSE_STATE_CHARGING:
+          status_icon = "/charging.png";
+          break;
+        case OPENEVSE_STATE_VENT_REQUIRED:
+        case OPENEVSE_STATE_DIODE_CHECK_FAILED:
+        case OPENEVSE_STATE_GFI_FAULT:
+        case OPENEVSE_STATE_NO_EARTH_GROUND:
+        case OPENEVSE_STATE_STUCK_RELAY:
+        case OPENEVSE_STATE_GFI_SELF_TEST_FAILED:
+        case OPENEVSE_STATE_OVER_TEMPERATURE:
+        case OPENEVSE_STATE_OVER_CURRENT:
+          status_icon = "/error.png";
+          break;
+        case OPENEVSE_STATE_SLEEPING:
+          status_icon = "/sleeping.png";
+          break;
+        case OPENEVSE_STATE_DISABLED:
+          status_icon = "/disabled.png";
+          break;
+        default:
+          break;
       }
-
+    
       render_image(status_icon.c_str(), 16, 52);
+      render_image(car_icon.c_str(), 16, 102);
 
       char buffer[32];
       char buffer2[10];
@@ -323,11 +331,11 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       if(_full_update) {
         render_left_text_box("A", 224, 165, 34, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, false, 1);
       }
-      if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_EVSE_MCP9808)) {
-        snprintf(buffer, sizeof(buffer), "%.0fC", _evse->getTemperature(EVSE_MONITOR_TEMP_EVSE_MCP9808));
+      if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_MONITOR)) {
+        snprintf(buffer, sizeof(buffer), "%.0fC", _evse->getTemperature(EVSE_MONITOR_TEMP_MONITOR));
         render_right_text_box(buffer, WHITE_AREA_X, 230, 45, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       }
-      snprintf(buffer, sizeof(buffer), "%.2f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
+      snprintf(buffer, sizeof(buffer), "%.1f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
       get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));
       render_info_box(buffer2, buffer, 66, 175, INFO_BOX_WIDTH, INFO_BOX_HEIGHT, _full_update);
 
@@ -372,6 +380,47 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
   _tft.endWrite();
 #endif
 
+  uint8_t evse_state = _evse->getEvseState();
+  bool vehicle_state = _evse->isVehicleConnected();
+  if (evse_state != _previous_evse_state || vehicle_state != _previous_vehicle_state) {  //wake backlight on state change
+    wakeBacklight();
+    _previous_evse_state = evse_state;
+    _previous_vehicle_state = vehicle_state;
+  } else {  //otherwise timeout backlight in appropriate states
+    bool timeout = true;
+    if (_evse->isVehicleConnected()) {
+          switch (_evse->getEvseState()) {
+            case OPENEVSE_STATE_STARTING:
+            case OPENEVSE_STATE_VENT_REQUIRED:
+            case OPENEVSE_STATE_DIODE_CHECK_FAILED:
+            case OPENEVSE_STATE_GFI_FAULT:
+            case OPENEVSE_STATE_NO_EARTH_GROUND:
+            case OPENEVSE_STATE_STUCK_RELAY:
+            case OPENEVSE_STATE_GFI_SELF_TEST_FAILED:
+            case OPENEVSE_STATE_OVER_TEMPERATURE:
+            case OPENEVSE_STATE_OVER_CURRENT:
+              timeout = false;
+              break;
+            case OPENEVSE_STATE_NOT_CONNECTED:
+            case OPENEVSE_STATE_CONNECTED:
+            case OPENEVSE_STATE_SLEEPING:
+            case OPENEVSE_STATE_DISABLED:
+              timeout = true;
+              break;
+            case OPENEVSE_STATE_CHARGING:
+              if (_evse->getAmps() >= TFT_BACKLIGHT_CHARGING_THRESHOLD) {
+                timeout = false;
+              }
+            default:
+              timeout = true;
+              break;
+          }
+        }
+    if (timeout) {
+      timeoutBacklight();
+    }
+  }
+
   DBUGVAR(nextUpdate);
   return nextUpdate;
 }
@@ -505,6 +554,7 @@ unsigned long LcdTask::displayNextMessage()
     }
 
     // Display the message
+    wakeBacklight();
     showText(msg->getX(), msg->getY(), msg->getMsg(), msg->getClear());
 
     _nextMessageTime = millis() + msg->getTime();
@@ -561,6 +611,16 @@ String LcdTask::getLine(int line)
   return String(start, len);
 }
 
+void LcdTask::wakeBacklight() {
+  digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
+  _last_backlight_wakeup = millis();
+}
+
+void LcdTask::timeoutBacklight() {
+  if (millis() - _last_backlight_wakeup >= TFT_BACKLIGHT_TIMEOUT_MS) {
+    digitalWrite(LCD_BACKLIGHT_PIN, LOW);
+  }
+}
 
 LcdTask lcd;
 
diff --git a/src/lcd_tft.h b/src/lcd_tft.h
index c246581a..b33a0ac9 100644
--- a/src/lcd_tft.h
+++ b/src/lcd_tft.h
@@ -95,6 +95,9 @@ class LcdTask : public MicroTasks::Task
     EvseManager *_evse;
     Scheduler *_scheduler;
     ManualOverride *_manual;
+    long _last_backlight_wakeup = 0;
+    uint8_t _previous_evse_state;
+    bool _previous_vehicle_state;
 
     char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
     bool _msg_cleared;
@@ -108,6 +111,9 @@ class LcdTask : public MicroTasks::Task
 
     String getLine(int line);
 
+    void wakeBacklight();
+    void timeoutBacklight();
+
   protected:
     void setup();
     unsigned long loop(MicroTasks::WakeReason reason);

From 5d06f96ebacb5e560e5978054d13f4df1833be5c Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Fri, 27 Sep 2024 20:54:59 +0100
Subject: [PATCH 03/12] WiFi status icon

---
 gui-tft/access_point.png           | Bin 0 -> 1328 bytes
 gui-tft/access_point_connected.png | Bin 0 -> 1276 bytes
 gui-tft/no_wifi.png                | Bin 0 -> 1301 bytes
 gui-tft/wifi.png                   | Bin 0 -> 1877 bytes
 platformio.ini                     |   2 +-
 src/LedManagerTask.cpp             |   9 ++++++++-
 src/lcd_tft.cpp                    |  24 ++++++++++++++++++++++--
 src/lcd_tft.h                      |   3 +++
 src/net_manager.cpp                |   5 +++++
 9 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 gui-tft/access_point.png
 create mode 100644 gui-tft/access_point_connected.png
 create mode 100644 gui-tft/no_wifi.png
 create mode 100644 gui-tft/wifi.png

diff --git a/gui-tft/access_point.png b/gui-tft/access_point.png
new file mode 100644
index 0000000000000000000000000000000000000000..2071a43d8590e9789b8fa2d6475ecaae3ae5c464
GIT binary patch
literal 1328
zcmV-01<(44P)<h;3K|Lk000e1NJLTq001rk001Hg1^@s6Abaaf00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru=m{GWEf#iFb2k701ieW_
zK~z}7?U;Q`lUEeRe{WlC0WB&YMJeD=K!ZTC2x_Kc!T7Okr~xxIi<xnoON=p_)9EnA
zOvcQX=;BN^7lTF<ow`MF@mrjtvT0y4DfopFilBg{A22}M`tFabFWU^s+R?-&p1+!t
z`<(YVx6eK2+$+hlEL*G&3Vtf3`d%v*tAiKO;=;p7HAeAyUJh~LVMq-R?Q+%^J8^VB
zA`mPrSj+jfi&3{FWNa`uwGt@y$nC*mb)dR*+d`n3xv3SEuM)|M7{q5&QZWRneZntG
z8^QZ2aXw)!RtFkifVswSwk}_QeqbnL;)gSD&q=TF3r9w?ap_ygvP@D*DIcG%^qPap
zTR^;4L(!7C=m&<1>|3l}fAqeyi_WfYBuQe?n<k%j-fQBU@}@F8Dja~5mnvC#s>17!
z{?g{8aMxj6ZZ{gWnw9fsp_3&45uZ3Dl<drOvD3{hEZBPnfK?euG;jWps&$L|#O|0o
z8SA#y9C~LK0N>YGICAa^0Fgrn^X1G;{}F#LdmKSQ;#d?PEd#(5sb|If*U@PQ5FIhJ
z&z(y!8jvK3tc)}^&&U8^`QeM$9322m9hc%i;^|2v0BE(^*;;iMfYozNgy^&YY&&qA
z9$5xpTv!NmVj~pn>fOh%J39f$pEi+jwTd2D=8E|i0LJJ@rWwNgL);iGh}^a`^(Heq
z0f3si1`5k-0oa+J#qq*r6t7uA<=RE0gleg9baC*^uK)}T31-D>Vu#CX?kcgSB**nX
z@dRBEK^h^G<~ADuZ;u*=PCEdAitBd($cv9;wrK)tl?eTcaTo=;lL6RV_J<O0WK0wQ
zM{hPNKEn`w{}Yc1)jj7M9MbD+u?ejvL=AavUBuu)VvWm#+v5?~L86@A?Q!*z@uIT)
zXX3T?Kb7A>8qqClAG9mJF>%oVoW9XWSI<AY@s(O3hwP{@G-`pp|MXw`yRO}yC;d;{
z>Un~*vrFu1i~)eNtq$7S?Ep+jOGdAfsOsouWAPycccIeEy7NLJOQ(-l{1=}lGdU?%
z@zpiA`R8ypG`9ed7$2j|DCa87N-f_1ZY}^P>Ut0F1FJ~vlgwmHnQ0<UQwzIpiZv6*
zCIaAcx%r{G-ao|8U%d`MuujYR8KPmVI8shSlSpWM`shCEc<!WE(Wuq9TyDPFe?pN?
zda|fWH|iT{dhGTO@%3fZJhX`$(rnXsOp$teWSPa^?5F%{EeB6sRO<M@ZQq&Ss4(AR
z)9w=X-gyAPhJ`bghPJQtvVUilJ;y}H4AE)%`h$E@LbX(Nbo0iJpIKURsZZRtYxPY3
z_7GcsuM?d&FN?8>qM=pR+~zxTgMW!{EU%@kQs_E1I+DV9IbIK0ixP)3Cwqc8^fo6S
z?LOxJ=@4K}@lh^cyTN0Zo12#VUgPWAJ7~8%d1!O6YWqQ|JA1s2;nPI|VAl2$pRZmQ
ztR0Lh`1XHY-&6#sy(IpU_)FqGn9b$E<r3}N{&X<wZ`1fAsPl<T!S(};8WzEtvse8>
zT#8@0MRo?rgXc4g9jZq)DKReK^qp!npeoAGK_9FQ7}EM+Ek*e`NY5VjKmD<k>U%9T
mwmV-~d88T*6y=MD{l5U#v!lPL!6j$_0000<MNUMnLSTXofOP%<

literal 0
HcmV?d00001

diff --git a/gui-tft/access_point_connected.png b/gui-tft/access_point_connected.png
new file mode 100644
index 0000000000000000000000000000000000000000..34dc63f2689cbfa1df3b14074a7e3c2085d93e48
GIT binary patch
literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq001rk001Hg1^@s6Abaaf00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru=m{GWEh)e=UJ3vJ1c^yR
zK~z}7?U-w9Q)L*(f9IU`^g>%)*KVETvg`r@0jCU|fFn^c1dWOz!C?HhI5osbRE&JW
z3+e|=&=|i+4Do`I4<ZSQ1SZbQxL-`n5LRIh+I8!?OS|6NbNq0QXQ0`K);3`Y&!^_i
z`M>?0=ltL2eco44RaFgTqI@{;6aHkFP&Ueq7(TO$Mw^#SHEsB07s5b#Ty5{&&4iL>
zI)p>Cu(N3+lC^#LHh*fE=@J<=PbeEjJU0<wx`jVEj99Ei>P-%wbS=OpNJZ%%w9n=~
zTWwL=P&SIG7~vARg6;L|ahmNkg?(%b9VtlPYN=vt!{ex^)L-dh=h$xrGl+!>oPvp0
z=RAzlYzH8a9x3=whx19|xfB8dPt3ZvsLU4({zBCXYHV%*I)~2j@o3@M^5<f_*SDXn
zlEWlOJU4qaB0~AV=SX(iJc|Ihk_hw0U>5+7IU4wW;j?_+uyIQ5i=I}FEPkFhYaRgL
zhh%^QgQo%TSZ31UzN38L8{D^J7PV!ud*D|98cj|*=B&ml$y8Y@rp#QOtqK8wm7d#p
zx}q6?9mB^N%}fBWvSLB`z!y2^0uWA*aUk&*03FpUu}KyHcJ?1aK?R^zve7KN4edL@
zLyTwQ06glu8;c;KpmJu+uRU+~FyG`V5BRONN&x<x7%;{b&#VLBe6*iEv5Np~@h<1n
z1?}vZ{}j9GH{cOv0{JBS29E<U!(?T>b3OnkW0#G&TI{u@2cIdJ4V#40V*o6-RAZH7
z0M14G0Ju}GWUX%*lAujpH^av>-c|s<9PgR5j@1jm(d1+jyk=+V!QDFGb)`|a2tYU+
z(-yFN%YUA$)Pa&}p1hjZ5}}vVaWy*$BM7Aj59X7`Z<D@TUdoIbWAkj)031sMNanBK
zjnC+IXfipGbnT%2)von*PE|?|o>moN*@X6)?NtEu=3)$|$2EUeG+{;{q@;NF@_s|t
z9qHjS-69(+mm1?ICbY%9^cr9Hr6T27oc)O~01b{BqeuBA(qq)(w`$jDP^pli8PZ>D
zouiR9ueJyD$A|birFpx>RS!T`$<e7-s*;0uk6i%3CRu3LH;fM=C+Uw50kF(HZ^}Bp
zrg90AAdyvad=%(3tn*J*x){4kT=##;!M})}Cz94qNNcNGXf!!dP}$PAm*bH?_$GMN
zsN?^RufwM}JL>2CzVA4e)?RdT?fpij+8aJy-d<(TK(~?g*XBNgN0bREDP9R4WJl!0
zl)8h7el}nImi=*Up}y?BhlMU}LpwX_=Wz0BdBMMmU7&lo$Jp&QSGN`1WUa9Jc*u7b
z03+!rZwC*TzdHojI&g?nBNxdiIeHVJg7v{%jL}StNIJ^veft<H;xJRxK?2~VzyT=o
z)OR@-XWfNQ{@3wMWSYiJ@SET_!HbBLnkTE|w6^t{uCkP2D#xT*RJLE*OP%ay*ZA+{
z0e6Tp6H2D!6aSbDLNZtuXrI}M*zA}!?fl(n^CE7lS%pKCrwz12l-X3X3SshMze~T^
mkKK^KKC@H5*k6TDcJVjxrl5QLd9SGe0000<MNUMnLSTY~!e8S6

literal 0
HcmV?d00001

diff --git a/gui-tft/no_wifi.png b/gui-tft/no_wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..2299fdf767acfc39c8320187e227ac53d5899149
GIT binary patch
literal 1301
zcmV+w1?u{VP)<h;3K|Lk000e1NJLTq001rk001Hg1^@s6Abaaf00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru=m{GT2PaCV0ek=e1foeq
zK~z}7)tGBglw}mhf4d92ydb;5B8V(Eu~rO1MFbOF5y;Sy%v~EV%@hi0jp=lsv=5Y}
zjx{+tOf!{Jsf|sAg8IP}p^*lVOdCNG(UG_->*DUBT;#HSKz4@9iYyz*|J!q(=bZO9
z=RMC=WU*K*)dmyWj^t8W+eo#+#N(&{rGjvkH=k+a2~a8!RoymPG&{e?)Y{H?kV24g
z_QMn;`YBQAm+KlCFKX}XqS|0WTyU+L@utgljflspM3PlX{G?8H`BocDIE@AL4>}FW
zaWT~1)U$TaVM_0|4LgQ-)S*`{Bsney0M(?4>|B*-R~(0Ae3o3`xzIpDCQro2Q-L6p
z;w0(GNoQ9#?e{xqFc|T4cOx!3qK|KRRsHCKzZB$+Hg*PKAp!V$EA5JL^h_b|=3E#Z
z@V6tUvN~ZdApw&|^p}pFDI_)P4^l(@@shi-tGN9C0Z;Pv;G@;g6B-gQ;?l~>EwVy?
zoT^1|k@4b!+3foH6j{~!M~Wfxcw?7ks6pwmVZ62?5f_=%A<*lO=93!gPkO2rR~MPJ
z?|w%o2TuIX2e}tVp7DK2(X3snK_n7Able?tGc^r*>hw+AZD}KF`c#5clLjr1_0v=X
zpaG=LPNc0!<cSFa8;%u>3|yD^tWD@U=4Og6m6KUeLUzq<tNlBz#wIjCM6e&Nt?dKA
zd-XzG3|o#D(q^&P5AGz946xm8X(c<anD>ACvrq6OUk_f^%pz(2Y@5&kn@<+Q$zncF
zj6@ed7lpf9zi*0>ilEIhf{Yhly266UFl+m2WesnBo6TRQmYzQn=*{YdvzVctf``K0
z=IW86R<T)|z?I5c_UE1_uhGPNITtusR7S@7WWt{cw)&haDaYJx8TsV=W_c_jem>l&
zZzSzO=8{!P-deGU2=$a9m%J3UitTAyTm_d0n^G6&ODp)~*IbH?_j=~il4wGM{HUyN
zWb?6thnC4BgZJ0gm{7K?T7t8)(~!`ws{QyhO=pGfUvj$-ogky6a&*or8?}j#487e3
zG{6K`fep(S*|n_N1wO%57;<w_O2jOk6UL321`I~C&GGJT!swk<u2$Bd4)z~l&(7=F
zTmTGR-K;!x%G$TgPsuCsQOuh;9hubGYA>ny*Di305S5TVT&MUzAEx#@t7PXDvF=E|
zO`nS9R(`p3or@RC2=P)N7Ku22xq?lHPt)AhJ#6q{PtJ^`F|1jl=?8s|bw|!x+g~n@
zB5wB62r?=4`X;_Qo=;|#WAC-YE|s~@s2>Xb)0zYp&x^FSy_Fv94N}3r!w!WX_T=1~
znZv!7wn3paUhX8s%pBk&xX5^Y+5EB1_`z%S-2CDI-tGcFUT^5rHz(K^iDd9x_)hd3
zTX2BWw~TPhIKXahvHfDu(b4HpaED%&zb>mn-((!Luc+ke;|mV3ZGRR`{WhG!zyD$5
z@j{1w$F8%=P?C#9Y??ETNuF}@%PJkd6at6>-`Qg^kCO+_Uio{<5yw6mz<5)*$_Mcd
zT|9C@Hg2Hhf{Y!yctpJq`&%<}DXqOlO_TYtEst=O4?A={5BvWCPy)F|DR`RB00000
LNkvXXu0mjf?jUtZ

literal 0
HcmV?d00001

diff --git a/gui-tft/wifi.png b/gui-tft/wifi.png
new file mode 100644
index 0000000000000000000000000000000000000000..598e8ae96be17f69730512dba8fe3a3107622174
GIT binary patch
literal 1877
zcmV-b2demqP)<h;3K|Lk000e1NJLTq001rk001Hg1^@s6Abaaf00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru=m{GWCM;8}b4~yN2I5IX
zK~z}7)tFms6z3U+pMPd{*XupoX7T#4;I*-hiLs$10RlM)hzOxcq|i!9)zd|VRH>EH
zi%M-TN>!EiqP>bD^`a7050R=u6i7=O5uyZQzzM|=Z(@^RFpKTQ>s{}`>pjo>y;x(#
zKpVXH0>5{2_-EevzW4jT_ZuOll%ZIXpB*{L;8=uEEXjiif31t|CNIBwaR>fd7vg#}
zA)om5A(GiV%K<K{h4+8*UDT<-!v})n5ta+`C7n<#iPHCZh~<Xhcm!p+NaTwM#gb^1
zE>?jSs~KOlg;h0nHnlae+E+)N$BENs#iVISAf3sQoXIdTHO=6)2?lRWF*%zjl*tp*
z4Mc_S7oP9`M&9eq5)eR-qlzxCi^tam*wEQRQ+*wprXmmsarbpdi6JG)nOTNLZqOGT
z;r!?%!FZaRC1cSMyl3J$DQT}VvAuZ(Pj77J(e>?koDLMFvY6!y1%|JV@$P?yI5~8K
z{>1EjVD1Ily+pYv;c<_h7dN%D^O1*W@~uF*Ewp0p*f0!=B^{&$Ay5^8rmB=vA(3-o
zvY5^Eu5G2&@1v*fbB>)I<oLA+QQbhjU*Zxl3E0!%;hRrwWJ^y64qG*H?(Jo+f^;TJ
zB9$hU&XAhTlFsDNbpu5aSWG6Ib}LSMH7>gix6_8Isz@o3Qev;R^5i4kG<s`jJUzgl
z2Syk#>L~X^+$3O6V=eplY+=LNR?KE?0qJ-$&FDmg&#s3Fj)v(Qo#g#kn%jlG(yX!9
zUq|n%db(Eo2sGE@^VXCLSV|Nj=nORDuvxKN&AfJIh{>W}xyGMusNo0CZ=<)f6;)N{
zC6Uh;xI8+>xxp*Eb#a8_(HRf|i-3Y;{^QCEKotUAmJ77StnqSJGuyk{*s!*Rx*FHK
ze1s58MyEM^@<V=pDp)!3fA0S(8`rj?Y3lrg6R9+P14A4+6XfVvjGUARAZtk0Rhifo
zSc$*RjicIvt{cSDS%xQK92<)fHzYP8n3a;P_A0)<v5nnZ))Q#<EhzHv)HLgVaj0^s
z^meu^ARV1f@~^%D{@54fR5FWG5!i)bZ*wirKiWn6Dj!a}4U5TyswzmJR4S3n7x-af
zhJnkY{I!3W^QkNsXY-7o8RAAX$+vfJrX$dds+6-@<FemhaZXLAXz<n`gdmnk@z$yH
z{Qh*1V77o;5v-{;^P^o~VM|X39;Y2^l^G!fw<!e#G<a(XG}rT3PY3_#yTotL4U;eo
z{&abaeCY$ew|5&ItD6A$@Z-<Eya8Gt-g)4E>L?z^S!HH2n&97OFY$-7LtM@lu?oQs
zuZv&4w3E#}oz%LWm^AJG?!rO{EM^lPr-RPbKDymjg4e=CO9odHvy5IHXCfTo)W9%D
z`iBT*3zci!ttzzHt55_?WD0}|B{X1{&&`kbJ;mC9ACqZe(&Su+yj7rz5Gaar$2L2g
z$@0O4PdV^rAD44QRKTmL6s07k8yNQ^m4t3^KABn2J)iZuc;$sB=xSXxum4+w^MxYu
zWSZ*}5h95cCRN2(=f>aQ#a?a2Jok|Tuvc5zwy}#>(pkQ7>>O@IFjdm;x$`c{BII?0
z7dCa!(bBkpw5}UWM&rDF_7bo64>Or7P?BYWCPmQcw(+eed)eCCiOXS|@3IbCHSK;M
zyF51f5*aLua1V>~HWI2VCNxb$%%xn{b*_ZMy!ys_93732mlER(hD-nxkt7%2IL-dh
zBrosYinrE-qLl4Hu23XX`tnY>sN%fCXaVbNW>(kNP;ITESS&FT3iG?e?{YLWMP5R}
zkXVJlZ`Q~glBgju3qj711jEyiO3_&7qEs>%kHmQAqfa?>C5&y6W^GXscdH7o4qQc3
z6?)e+Q!JJ^a^@3GgyR$>)T#<E1y-=RqZyCG#!M#1z{ohquY?&Z>P+hfuU!~na6HOG
zjdfg$#5r_*3Xi(jcrVhA-$LAwpc^2-tSZ=qz^N#Ft)qeOJhO#1e<Nm-iIQF-6rSR5
zC;IuzrK{X5>d3hw&&jeEvWv=WaYYl5M-iYbG@o5AE6+W)p3Z>3Y;UE3q9_EK>UnPa
z1_nYAZbp&_z$ygRN=KhLC@c}`9ah>`HQaIDkdjt^JzhuElFpq=MqCwh1H;|Ys%m!(
z9uExhL^jVvBzD(pH>1;}a)k$z_~7&`Z}$gDB-8WLjg*p1F3*W`9}|quEGcnqsU9>{
z(s}*D2>D`(XEt|JU+W>BO7qS~pYZpAD}-{zB_&?bcK9Gbaat|Qj&yU46J^^P|FR?A
z-Lw+r;JzI!r>Hxv77p&)fw=W!|EGsfGB`HLjp@__E06A`l^onx{;~gGX|Ujc05-XT
P00000NkvXXu0mjfGHr-6

literal 0
HcmV?d00001

diff --git a/platformio.ini b/platformio.ini
index e7090fce..ebbc6cec 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -110,7 +110,7 @@ build_flags_openevse_tft =
   ${common.gfx_display_build_flags}
   -D NEO_PIXEL_PIN=26
   -D NEO_PIXEL_LENGTH=14
-  -D WIFI_PIXEL_NUMBER=1
+  -D WIFI_PIXEL_NUMBER=5
   -D WIFI_BUTTON=0
   -D WIFI_BUTTON_PRESSED_STATE=LOW
   -D I2C_SDA=22
diff --git a/src/LedManagerTask.cpp b/src/LedManagerTask.cpp
index 9003fb95..303e7348 100644
--- a/src/LedManagerTask.cpp
+++ b/src/LedManagerTask.cpp
@@ -190,11 +190,18 @@ void LedManagerTask::setup()
 #elif defined(NEO_PIXEL_PIN) && defined(NEO_PIXEL_LENGTH) && defined(ENABLE_WS2812FX)
   DEBUG.printf("Initialising NeoPixels WS2812FX MODE...\n");
   ws2812fx.init();
-  ws2812fx.setBrightness(brightness);
+  //ws2812fx.setBrightness(brightness);
   ws2812fx.setSpeed(DEFAULT_FX_SPEED);
   ws2812fx.setColor(BLACK);
   ws2812fx.setMode(FX_MODE_STATIC);
   //ws2812fx.setBrightness(this->brightness);
+  if (this->brightness == 0){
+    ws2812fx.setBrightness(255);
+  }
+  else {
+    ws2812fx.setBrightness(this->brightness-1);
+  }
+
   DBUGF("Brightness: %d ", this->brightness);
   DBUGF("Brightness: %d ", brightness);
 
diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 98d96d21..209a02ca 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -18,7 +18,7 @@
 #include "embedded_files.h"
 //#include "fonts/DejaVu_Sans_72.h"
 
-#define TFT_BACKLIGHT_TIMEOUT_MS 300000 // 5 mins
+#define TFT_BACKLIGHT_TIMEOUT_MS 600000 // 5 mins
 #define TFT_BACKLIGHT_CHARGING_THRESHOLD 0.1  //stay awake if car is drawing more than this many amps
 
 #define TFT_OPENEVSE_BACK       0x2413
@@ -161,6 +161,12 @@ void LcdTask::display(const char *msg, int x, int y, int time, uint32_t flags)
   display(new Message(msg, x, y, time, flags), flags);
 }
 
+void LcdTask::setWifiMode(bool client, bool connected)
+{
+  wifi_client = client;
+  wifi_connected = connected;
+}
+
 void LcdTask::begin(EvseManager &evse, Scheduler &scheduler, ManualOverride &manual)
 {
   _evse = &evse;
@@ -281,6 +287,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
 
       String status_icon = "/disabled.png";
       String car_icon = "/car_disconnected.png";
+      String wifi_icon = "/no_wifi.png";
 
       if(_evse->isVehicleConnected()) {
         car_icon = "/car_connected.png";
@@ -319,9 +326,22 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
         default:
           break;
       }
+
+      if (wifi_client) {
+        if (wifi_connected) {
+          wifi_icon = "/wifi.png";
+        }
+      } else {
+        if (wifi_connected) {
+          wifi_icon = "/access_point_connected.png";
+        } else {
+          wifi_icon = "/access_point.png";
+        }
+      }
     
       render_image(status_icon.c_str(), 16, 52);
-      render_image(car_icon.c_str(), 16, 102);
+      render_image(car_icon.c_str(), 16, 92);
+      render_image(wifi_icon.c_str(), 16, 132);
 
       char buffer[32];
       char buffer2[10];
diff --git a/src/lcd_tft.h b/src/lcd_tft.h
index b33a0ac9..83b48696 100644
--- a/src/lcd_tft.h
+++ b/src/lcd_tft.h
@@ -98,6 +98,8 @@ class LcdTask : public MicroTasks::Task
     long _last_backlight_wakeup = 0;
     uint8_t _previous_evse_state;
     bool _previous_vehicle_state;
+    bool wifi_client;
+    bool wifi_connected;
 
     char _msg[LCD_MAX_LINES][LCD_MAX_LEN + 1];
     bool _msg_cleared;
@@ -136,6 +138,7 @@ class LcdTask : public MicroTasks::Task
     void display(const __FlashStringHelper *msg, int x, int y, int time, uint32_t flags);
     void display(String &msg, int x, int y, int time, uint32_t flags);
     void display(const char *msg, int x, int y, int time, uint32_t flags);
+    void setWifiMode(bool client, bool connected);
 
     void fill_screen(uint16_t color) {
       _screen.fillScreen(color);
diff --git a/src/net_manager.cpp b/src/net_manager.cpp
index 311be78b..e7f87df0 100644
--- a/src/net_manager.cpp
+++ b/src/net_manager.cpp
@@ -135,6 +135,7 @@ void NetManagerTask::wifiStartAccessPoint()
   _lcd.display(String(F("Pass: ")) + _softAP_password, 0, 1, 15 * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, false);
+  _lcd.setWifiMode(false, false);
 
   _apClients = 0;
   _state = NetState::AccessPointConnecting;
@@ -155,6 +156,7 @@ void NetManagerTask::wifiStartClient()
   wifiClientConnect();
 
   _led.setWifiMode(true, false);
+  _lcd.setWifiMode(true, false);
   _state = NetState::StationClientConnecting;
 }
 
@@ -206,6 +208,7 @@ void NetManagerTask::haveNetworkConnection(IPAddress myAddress)
   Mongoose.ipConfigChanged();
 
   _led.setWifiMode(true, true);
+  _lcd.setWifiMode(true, true);
   _time.setHost(sntp_hostname.c_str());
 
   _apAutoApStopTime = millis() + ACCESS_POINT_AUTO_STOP_TIMEOUT;
@@ -282,6 +285,7 @@ void NetManagerTask::wifiOnAPModeStationConnected(const WiFiEventSoftAPModeStati
   _lcd.display(_ipaddress, 0, 1, (0 == _apClients ? 15 : 5) * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, true);
+  _lcd.setWifiMode(false, true);
 
   _apClients++;
 }
@@ -292,6 +296,7 @@ void NetManagerTask::wifiOnAPModeStationDisconnected(const WiFiEventSoftAPModeSt
 
   if(0 == _apClients && NetState::AccessPointConnecting == _state) {
     _led.setWifiMode(false, false);
+    _lcd.setWifiMode(false, false);
   }
 }
 

From ecf9900d1f2cca27f8d64f601e7f97217a8e78fc Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Fri, 27 Sep 2024 21:33:25 +0100
Subject: [PATCH 04/12] Make timeout optional, add missing files

---
 platformio.ini                                |   6 +-
 .../lcd_gui.access_point_connected_png.h      |  82 ++++++++++++
 src/lcd_static/lcd_gui.access_point_png.h     |  86 +++++++++++++
 src/lcd_static/lcd_gui.no_wifi_png.h          |  84 ++++++++++++
 src/lcd_static/lcd_gui.wifi_png.h             | 120 ++++++++++++++++++
 src/lcd_static/lcd_gui_static_files.h         |  10 ++
 src/lcd_tft.cpp                               |  17 ++-
 src/lcd_tft.h                                 |   4 +
 8 files changed, 403 insertions(+), 6 deletions(-)
 create mode 100644 src/lcd_static/lcd_gui.access_point_connected_png.h
 create mode 100644 src/lcd_static/lcd_gui.access_point_png.h
 create mode 100644 src/lcd_static/lcd_gui.no_wifi_png.h
 create mode 100644 src/lcd_static/lcd_gui.wifi_png.h

diff --git a/platformio.ini b/platformio.ini
index ebbc6cec..ec662ff1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -108,9 +108,11 @@ build_flags_openevse_tft =
   ${common.build_flags}
   ${common.src_build_flags}
   ${common.gfx_display_build_flags}
+  -D TFT_BACKLIGHT_TIMEOUT_MS=600000
+  -D TFT_BACKLIGHT_CHARGING_THRESHOLD=0.1
   -D NEO_PIXEL_PIN=26
-  -D NEO_PIXEL_LENGTH=14
-  -D WIFI_PIXEL_NUMBER=5
+  -D NEO_PIXEL_LENGTH=4
+  -D WIFI_PIXEL_NUMBER=1
   -D WIFI_BUTTON=0
   -D WIFI_BUTTON_PRESSED_STATE=LOW
   -D I2C_SDA=22
diff --git a/src/lcd_static/lcd_gui.access_point_connected_png.h b/src/lcd_static/lcd_gui.access_point_connected_png.h
new file mode 100644
index 00000000..c6da4d3c
--- /dev/null
+++ b/src/lcd_static/lcd_gui.access_point_connected_png.h
@@ -0,0 +1,82 @@
+static const char CONTENT_ACCESS_POINT_CONNECTED_PNG[] PROGMEM = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 
+  0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x22, 0x08, 0x06, 0x00, 0x00, 0x00, 0x20, 0x7b, 0xeb, 
+  0x4c, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 
+  0x07, 0xe8, 0x09, 0x1b, 0x13, 0x2d, 0x29, 0xc0, 0x33, 0x5e, 0x0a, 0x00, 0x00, 0x04, 0x89, 0x49, 
+  0x44, 0x41, 0x54, 0x58, 0xc3, 0xed, 0x98, 0x6b, 0x6c, 0x53, 0x65, 0x18, 0xc7, 0x7f, 0xe7, 0x9c, 
+  0xf6, 0xf4, 0x42, 0x5b, 0x5c, 0xd7, 0x6e, 0x9d, 0xe3, 0xb2, 0xec, 0x02, 0x01, 0x01, 0xa7, 0x0c, 
+  0x9d, 0x80, 0x23, 0x51, 0x31, 0x04, 0x8d, 0x8a, 0x21, 0xc1, 0x60, 0xfc, 0xb6, 0x38, 0x35, 0xc4, 
+  0x48, 0x54, 0x8c, 0x7c, 0xc2, 0x0b, 0xea, 0x07, 0x4d, 0xd0, 0x18, 0xbf, 0x48, 0x0c, 0xf1, 0x82, 
+  0x91, 0x0f, 0x22, 0x09, 0x8a, 0x04, 0x26, 0xce, 0xcb, 0xb8, 0x5f, 0x4c, 0xcc, 0x10, 0x56, 0x61, 
+  0x0e, 0xda, 0x75, 0xeb, 0xba, 0x4b, 0xbb, 0xde, 0xdb, 0x73, 0xfc, 0x70, 0x8e, 0x67, 0xa0, 0xd9, 
+  0x87, 0xd6, 0x36, 0x61, 0x09, 0xcf, 0xa7, 0xe6, 0xcd, 0xf9, 0xbf, 0xfd, 0x9d, 0xe7, 0xfc, 0xdf, 
+  0xe7, 0x7d, 0xde, 0x57, 0x50, 0x55, 0x55, 0x0d, 0x65, 0xa2, 0x7c, 0x38, 0xf0, 0x13, 0xfe, 0x64, 
+  0x98, 0x50, 0x36, 0xca, 0x8d, 0x18, 0x3e, 0xb3, 0x8b, 0x46, 0x9b, 0x97, 0x4d, 0x35, 0x6d, 0xf8, 
+  0x64, 0x17, 0xc2, 0x40, 0x7a, 0x5c, 0x6d, 0xef, 0xdd, 0xcd, 0x84, 0x92, 0x66, 0x3a, 0x84, 0x43, 
+  0xb4, 0xb0, 0xb3, 0x69, 0x23, 0x92, 0xb5, 0x7d, 0xf9, 0x36, 0x7f, 0x6a, 0x98, 0xe9, 0x12, 0x19, 
+  0x35, 0x4f, 0x28, 0x1b, 0x45, 0x3c, 0x37, 0x11, 0x60, 0xba, 0x85, 0x3f, 0x39, 0x8c, 0x58, 0xac, 
+  0x45, 0xea, 0x4d, 0x0e, 0x9e, 0x74, 0x2d, 0xc0, 0x26, 0x48, 0x45, 0xe9, 0x1f, 0xb4, 0xcf, 0xe6, 
+  0x3e, 0x5b, 0x6d, 0x51, 0xda, 0x50, 0x36, 0x8a, 0xa9, 0x18, 0xe1, 0x12, 0xb9, 0x82, 0xed, 0xf5, 
+  0xeb, 0x71, 0x9a, 0xed, 0x34, 0x85, 0x7d, 0x6c, 0x0b, 0x1d, 0x29, 0x48, 0xdf, 0x6a, 0xa9, 0x62, 
+  0x6b, 0xc3, 0xe3, 0xa8, 0xa8, 0xd4, 0x5f, 0xe9, 0x62, 0xe7, 0xd8, 0x6f, 0x05, 0x33, 0x88, 0x85, 
+  0x0a, 0x9c, 0x82, 0x89, 0x57, 0xe7, 0x3c, 0x8c, 0xd3, 0x6c, 0x07, 0x20, 0x90, 0x1e, 0x29, 0xf8, 
+  0x4f, 0x87, 0xf3, 0x49, 0xe2, 0xb9, 0x14, 0x02, 0x02, 0x4f, 0xcc, 0xba, 0xb7, 0xa8, 0xcc, 0x17, 
+  0x0c, 0xfe, 0x42, 0xd5, 0x0a, 0x6a, 0x6c, 0x6e, 0x00, 0x3a, 0x87, 0xce, 0xf1, 0xf1, 0x68, 0xe1, 
+  0xd9, 0xf2, 0xe7, 0x62, 0xbc, 0xd7, 0xb7, 0x9f, 0xac, 0x92, 0xc3, 0x24, 0x48, 0x3c, 0x37, 0x7b, 
+  0x35, 0x22, 0x42, 0xf9, 0xc0, 0xe7, 0x48, 0x76, 0xda, 0x3c, 0x8b, 0x00, 0xb8, 0x92, 0x08, 0xf3, 
+  0xc6, 0x60, 0x17, 0x00, 0x8f, 0x39, 0x1a, 0xf8, 0x7e, 0xe1, 0xb3, 0x7c, 0xde, 0xb0, 0x71, 0x4a, 
+  0xed, 0x8b, 0x9e, 0x56, 0x8e, 0x2c, 0x7e, 0x9e, 0x37, 0x6b, 0x1e, 0x00, 0xe0, 0x87, 0x64, 0x80, 
+  0x03, 0x83, 0xa7, 0x01, 0xf0, 0x58, 0x66, 0xd2, 0xe1, 0xbe, 0xa3, 0x7c, 0xe0, 0x1b, 0xdc, 0xb7, 
+  0x63, 0x16, 0xb5, 0x65, 0xb1, 0x7b, 0xe0, 0x57, 0x00, 0x1a, 0x4d, 0x4e, 0x3a, 0xe6, 0xac, 0xc6, 
+  0x2a, 0xc9, 0x54, 0x59, 0x2b, 0xa6, 0xcc, 0x5c, 0x9d, 0xad, 0x0a, 0x01, 0x81, 0x95, 0x9e, 0xdb, 
+  0x78, 0xba, 0xa2, 0x19, 0x80, 0x1d, 0xc3, 0xc7, 0x19, 0xcd, 0x4c, 0x00, 0xb0, 0xb2, 0x62, 0x41, 
+  0xf9, 0xc0, 0x17, 0x39, 0xe7, 0x02, 0x10, 0x4e, 0x8f, 0x71, 0x20, 0xf1, 0x17, 0x00, 0x1d, 0xd5, 
+  0x2b, 0xb1, 0x49, 0x16, 0x00, 0x76, 0xf6, 0x1f, 0x42, 0x41, 0x05, 0xa0, 0x56, 0xb2, 0xd1, 0x2c, 
+  0xbb, 0x0d, 0xed, 0x3b, 0xc1, 0x43, 0x8c, 0x67, 0xe2, 0x00, 0x3c, 0xea, 0xbb, 0x1b, 0x8b, 0x20, 
+  0xa2, 0xa0, 0x72, 0x66, 0xcc, 0xaf, 0x3d, 0x6f, 0xf7, 0x30, 0xdf, 0xe4, 0x2a, 0x0f, 0xf8, 0xad, 
+  0xb6, 0x4a, 0x00, 0xfe, 0x9c, 0x18, 0x30, 0xc6, 0x16, 0xcf, 0xac, 0x03, 0xe0, 0x7c, 0xb4, 0x9f, 
+  0x3d, 0xb1, 0x8b, 0x00, 0x6c, 0xf1, 0x2e, 0xe7, 0xd3, 0x05, 0xed, 0xec, 0x98, 0xff, 0x14, 0xbb, 
+  0xea, 0x37, 0xe0, 0x11, 0x65, 0x02, 0xf9, 0x24, 0xfb, 0x06, 0x8f, 0x03, 0x30, 0xc3, 0x64, 0x65, 
+  0xbd, 0x73, 0x3e, 0x00, 0x27, 0x63, 0x97, 0x8d, 0xb9, 0x5a, 0xec, 0xb5, 0xa5, 0x07, 0x9f, 0x29, 
+  0x98, 0x0d, 0x9b, 0x84, 0xd2, 0x63, 0x00, 0x2c, 0xb7, 0x54, 0x63, 0x95, 0x64, 0x00, 0xce, 0x45, 
+  0xfb, 0x00, 0xb8, 0x53, 0xae, 0x64, 0xad, 0x6f, 0x19, 0x92, 0xa0, 0x4d, 0x5d, 0x37, 0xc3, 0xc7, 
+  0x33, 0xde, 0x56, 0x00, 0xbe, 0x1c, 0xef, 0x99, 0xb4, 0x8e, 0xd5, 0x0b, 0xc0, 0xd1, 0xe4, 0x64, 
+  0x12, 0xbc, 0x66, 0x67, 0xe9, 0xc1, 0xdd, 0x3a, 0xe0, 0x75, 0xa5, 0x51, 0xb7, 0x08, 0x40, 0x38, 
+  0x1b, 0xd3, 0x16, 0xb0, 0x7c, 0xcb, 0x7f, 0x9e, 0xab, 0xd4, 0x81, 0x92, 0x6a, 0x9e, 0xbc, 0x9a, 
+  0xd7, 0x12, 0xa1, 0x97, 0xd3, 0x71, 0x35, 0x3b, 0x09, 0x23, 0x08, 0xa5, 0x07, 0x0f, 0xe6, 0x93, 
+  0xc6, 0x6f, 0x93, 0xbe, 0x5b, 0x5e, 0xca, 0x8c, 0x1a, 0x63, 0xf3, 0x6c, 0xd5, 0x00, 0x1c, 0x4b, 
+  0x04, 0x48, 0xe6, 0xaf, 0xdf, 0x8d, 0xcf, 0xe8, 0x76, 0x68, 0x32, 0x39, 0x91, 0x74, 0xed, 0xa0, 
+  0xfe, 0xd5, 0xae, 0xf5, 0x75, 0x4e, 0x55, 0x4a, 0x0f, 0x9e, 0x56, 0x15, 0x62, 0xd9, 0x84, 0xf6, 
+  0x99, 0xed, 0x55, 0x00, 0xf4, 0xe6, 0x62, 0x0c, 0xa7, 0xc7, 0x35, 0x7f, 0x56, 0x34, 0x61, 0x46, 
+  0x20, 0xa4, 0xa4, 0x78, 0xf7, 0xf2, 0x7e, 0x43, 0xd7, 0x1d, 0xe9, 0xe1, 0x33, 0xdd, 0x22, 0x1b, 
+  0x2b, 0x97, 0x1a, 0xe3, 0x27, 0x26, 0xb4, 0xc5, 0xbd, 0xf4, 0x1a, 0x5f, 0xf7, 0xa5, 0x22, 0xe5, 
+  0x59, 0x9c, 0xfd, 0x89, 0x30, 0x00, 0x0d, 0x8e, 0x1a, 0xa3, 0x47, 0xf9, 0x25, 0xd2, 0x63, 0xd4, 
+  0xe2, 0xb7, 0x6a, 0xd7, 0x68, 0x50, 0xa9, 0x90, 0xa1, 0x19, 0xd2, 0x5f, 0x6c, 0x9d, 0xa3, 0x91, 
+  0x36, 0xaf, 0xb6, 0x07, 0xf4, 0xc7, 0x87, 0xf8, 0x39, 0xa5, 0x79, 0xbb, 0xc5, 0x55, 0x0f, 0x40, 
+  0x56, 0xc9, 0xd1, 0xa9, 0x57, 0xaa, 0x92, 0x83, 0x77, 0x8f, 0x5d, 0x00, 0xc0, 0x26, 0x59, 0x68, 
+  0xd7, 0x37, 0x8c, 0x0f, 0x22, 0x27, 0xe9, 0x8f, 0x0f, 0x01, 0xb0, 0xcc, 0x3d, 0x6f, 0xca, 0x3a, 
+  0xbe, 0xa6, 0x72, 0x09, 0x92, 0x20, 0x91, 0x55, 0x72, 0x7c, 0x14, 0xe8, 0x34, 0xac, 0xf3, 0x4f, 
+  0x55, 0xba, 0x18, 0xbb, 0x4a, 0x5c, 0xf7, 0x7f, 0xc9, 0xc1, 0xbf, 0x88, 0x9e, 0x27, 0x92, 0xd6, 
+  0x4e, 0x48, 0x6b, 0xab, 0x5b, 0x68, 0x34, 0x39, 0x51, 0x50, 0xd9, 0xd2, 0xb7, 0x97, 0xe3, 0x91, 
+  0x3f, 0xf8, 0x26, 0x78, 0xd4, 0xa8, 0xe3, 0xff, 0x8e, 0xaf, 0xc3, 0xa7, 0x38, 0x3b, 0xea, 0xe7, 
+  0xfd, 0xbe, 0xef, 0x38, 0x96, 0xd6, 0x5e, 0x74, 0x73, 0xed, 0xfd, 0x46, 0xa5, 0xda, 0x1b, 0x3e, 
+  0x5d, 0xde, 0x5e, 0x65, 0xcf, 0x40, 0xb7, 0x91, 0xf5, 0xd7, 0xe6, 0x3e, 0x82, 0x47, 0x94, 0x09, 
+  0x29, 0x29, 0x5e, 0x09, 0x1e, 0x64, 0x47, 0xe4, 0xc4, 0x94, 0xba, 0x83, 0x89, 0x7e, 0x36, 0x5f, 
+  0xfd, 0x96, 0xfd, 0x71, 0x6d, 0xa1, 0xbe, 0xec, 0xbd, 0x87, 0x85, 0x2e, 0x6d, 0x43, 0x3b, 0x3b, 
+  0xea, 0xe7, 0x70, 0xf2, 0x6a, 0x79, 0xc1, 0xbf, 0x8a, 0x5d, 0xa0, 0x7b, 0xb8, 0xc7, 0xd8, 0xed, 
+  0x36, 0x57, 0xb7, 0x15, 0xdc, 0x64, 0xad, 0xb0, 0xfa, 0x78, 0xc8, 0x77, 0x17, 0x00, 0x23, 0xe9, 
+  0x28, 0x6f, 0x07, 0x0f, 0x97, 0xbf, 0x3b, 0x04, 0xd8, 0x3a, 0x70, 0x88, 0x53, 0x23, 0x17, 0xc9, 
+  0x28, 0x39, 0x7a, 0x13, 0xa1, 0x82, 0xf5, 0xc1, 0x5c, 0x8c, 0xd1, 0x4c, 0x8c, 0x48, 0x3a, 0xca, 
+  0xeb, 0x7d, 0xfb, 0x18, 0x2a, 0xe2, 0x30, 0x53, 0xd4, 0x41, 0x02, 0xe0, 0xa5, 0xc0, 0x01, 0x28, 
+  0xf2, 0xd4, 0x77, 0x39, 0x17, 0x67, 0xdd, 0x85, 0x4f, 0xfe, 0xd7, 0xf1, 0x4d, 0x64, 0x9a, 0xc6, 
+  0x4d, 0xf0, 0x9b, 0xe0, 0x37, 0xc1, 0x8b, 0x88, 0x94, 0x9a, 0x27, 0xab, 0xe4, 0xb4, 0xb6, 0xf5, 
+  0x9a, 0xae, 0xb2, 0x94, 0x61, 0x2a, 0xc7, 0xa4, 0x59, 0x54, 0xb6, 0x5f, 0xda, 0x4b, 0x9d, 0xec, 
+  0x66, 0xd7, 0xf8, 0xef, 0xe5, 0x01, 0x77, 0x88, 0x32, 0x13, 0x4a, 0xa6, 0xe4, 0x13, 0xff, 0x98, 
+  0x0c, 0x42, 0x32, 0x58, 0x16, 0x68, 0x9f, 0xd9, 0x89, 0xd8, 0xec, 0x98, 0x35, 0xed, 0xfc, 0xdd, 
+  0x68, 0xf3, 0x22, 0x6e, 0xaa, 0x59, 0x85, 0x43, 0x94, 0xa7, 0x0d, 0xb4, 0x43, 0x94, 0xd9, 0x54, 
+  0xb3, 0x0a, 0x61, 0xf2, 0x62, 0xbf, 0x4b, 0xbf, 0xd8, 0x8f, 0xdd, 0x90, 0xc0, 0x3e, 0xb3, 0x53, 
+  0xbf, 0xd8, 0x5f, 0x85, 0x4f, 0x76, 0xf1, 0x37, 0xf0, 0xa6, 0xa0, 0x7b, 0xfc, 0x79, 0xaf, 0xa9, 
+  0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00 };
+static const char CONTENT_ACCESS_POINT_CONNECTED_PNG_ETAG[] PROGMEM = "a3ab4943d6d6f57d5930622ec4e4d61edce4a07305ef3793ff9daf0a8741dd27";
diff --git a/src/lcd_static/lcd_gui.access_point_png.h b/src/lcd_static/lcd_gui.access_point_png.h
new file mode 100644
index 00000000..4f3044c3
--- /dev/null
+++ b/src/lcd_static/lcd_gui.access_point_png.h
@@ -0,0 +1,86 @@
+static const char CONTENT_ACCESS_POINT_PNG[] PROGMEM = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 
+  0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x22, 0x08, 0x06, 0x00, 0x00, 0x00, 0x20, 0x7b, 0xeb, 
+  0x4c, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 
+  0x07, 0xe8, 0x09, 0x1b, 0x13, 0x2d, 0x16, 0x76, 0x55, 0x73, 0x37, 0x00, 0x00, 0x04, 0xbd, 0x49, 
+  0x44, 0x41, 0x54, 0x58, 0xc3, 0xed, 0x98, 0x7d, 0x4c, 0x93, 0x57, 0x14, 0xc6, 0x7f, 0x6f, 0x5b, 
+  0x6c, 0x01, 0x2d, 0x2a, 0x1f, 0x45, 0x29, 0xe0, 0x50, 0x40, 0x83, 0x40, 0xb2, 0x08, 0x6a, 0xa6, 
+  0x62, 0xc1, 0xf8, 0xb1, 0x6c, 0xa8, 0x01, 0x33, 0x35, 0x8b, 0x99, 0x71, 0x9b, 0x4b, 0x8c, 0x31, 
+  0x9b, 0xd3, 0xe9, 0x30, 0xc6, 0x4c, 0xc6, 0xcc, 0x96, 0xe8, 0xe2, 0x4c, 0x36, 0x17, 0x83, 0x46, 
+  0x13, 0x9d, 0xba, 0x45, 0x71, 0xf1, 0x5b, 0x9c, 0xa2, 0xb2, 0x69, 0x60, 0x32, 0x29, 0xf8, 0x85, 
+  0x12, 0x8a, 0xa0, 0x80, 0xa5, 0x1f, 0x30, 0x40, 0xdb, 0xfa, 0xee, 0x8f, 0xab, 0x2f, 0xdb, 0x0c, 
+  0xc9, 0xda, 0xd1, 0xc4, 0x26, 0x9e, 0xbf, 0x9a, 0x93, 0xfb, 0x9c, 0xf7, 0x39, 0xb7, 0xcf, 0x3d, 
+  0xe7, 0xdc, 0x2b, 0xc9, 0xb2, 0x2c, 0x5b, 0xac, 0x0e, 0x0a, 0x7e, 0x2a, 0xa5, 0xfa, 0x5e, 0x2b, 
+  0x16, 0xab, 0x83, 0x17, 0xd1, 0xe2, 0xc2, 0xc3, 0x48, 0x35, 0x46, 0xf1, 0x79, 0x5e, 0x0e, 0x71, 
+  0xe1, 0x61, 0x48, 0x0d, 0x0f, 0xed, 0x72, 0xd6, 0x17, 0x3b, 0x71, 0x74, 0x3f, 0x22, 0x10, 0x2c, 
+  0x2c, 0x58, 0xcb, 0xf9, 0xb5, 0x8b, 0x51, 0xb7, 0x25, 0x64, 0x6c, 0x30, 0x37, 0xb5, 0x12, 0x28, 
+  0xf6, 0xc8, 0xed, 0xc1, 0x62, 0x75, 0xa0, 0xba, 0x74, 0xdb, 0x42, 0xa0, 0x99, 0xb9, 0xa9, 0x15, 
+  0x95, 0xaf, 0x12, 0xc9, 0x8a, 0x18, 0xc4, 0x67, 0x53, 0x52, 0x31, 0x04, 0xa9, 0x7d, 0xc2, 0x2f, 
+  0x4b, 0x1b, 0xc1, 0xfb, 0x29, 0x71, 0x3e, 0x61, 0x2d, 0x56, 0x07, 0x1a, 0x5f, 0x80, 0xb9, 0xc6, 
+  0x70, 0xb6, 0x2e, 0x5f, 0x80, 0x7e, 0x60, 0x28, 0x63, 0xe2, 0x87, 0x33, 0x6f, 0xcf, 0x49, 0xaf, 
+  0xf0, 0x0b, 0x47, 0x46, 0xb3, 0x71, 0xe9, 0x5b, 0xc8, 0xb2, 0x4c, 0x52, 0x49, 0x29, 0x1f, 0x9f, 
+  0xae, 0xf4, 0x9a, 0x83, 0xca, 0x5b, 0x40, 0xbc, 0x56, 0x43, 0xd1, 0x92, 0xb9, 0xe8, 0x07, 0x86, 
+  0x8a, 0xec, 0x5b, 0xac, 0x5e, 0x7f, 0xf4, 0xbe, 0xb3, 0x8b, 0xce, 0xae, 0x6e, 0x24, 0x49, 0x62, 
+  0xd1, 0x9b, 0x26, 0x9f, 0x76, 0xde, 0x6b, 0xe2, 0x9b, 0xf2, 0xa6, 0x32, 0x3c, 0x2a, 0x1c, 0x80, 
+  0x93, 0x97, 0x2a, 0x59, 0x79, 0xaa, 0xc2, 0xeb, 0x8f, 0xfe, 0xd2, 0xe6, 0xa4, 0x70, 0xd7, 0x61, 
+  0x5c, 0x6e, 0x37, 0x1a, 0xb5, 0x9a, 0x95, 0xf3, 0x67, 0xa1, 0x93, 0x24, 0xff, 0x11, 0x9f, 0x38, 
+  0x24, 0x94, 0xec, 0xcc, 0x74, 0xb1, 0xd3, 0xcd, 0x2d, 0x2c, 0xd8, 0x7b, 0x06, 0x80, 0x55, 0x19, 
+  0x49, 0x34, 0x6f, 0xfe, 0x90, 0xaa, 0x75, 0x8b, 0xfb, 0xc4, 0xee, 0x98, 0x3b, 0x19, 0xeb, 0xb6, 
+  0xd5, 0x1c, 0x7a, 0x67, 0x16, 0x00, 0xdf, 0xd7, 0x58, 0x38, 0x72, 0xee, 0x0a, 0x00, 0x91, 0x43, 
+  0x07, 0xf3, 0xe5, 0xcc, 0x4c, 0xff, 0x11, 0x7f, 0x2f, 0x7b, 0x1c, 0x41, 0x41, 0xe2, 0x58, 0x14, 
+  0x1f, 0x2d, 0x03, 0xc0, 0x14, 0xa9, 0x67, 0xc5, 0xfc, 0xd7, 0xd1, 0x69, 0x07, 0x10, 0x1d, 0x31, 
+  0xb4, 0xcf, 0x9d, 0x4b, 0x30, 0x1a, 0x90, 0x24, 0x89, 0xac, 0x8c, 0x34, 0x36, 0xcf, 0xc8, 0x00, 
+  0x60, 0xf9, 0xe1, 0x8b, 0xd8, 0x1c, 0x1d, 0x00, 0x4c, 0x1d, 0x97, 0xe2, 0x3f, 0xe2, 0xe9, 0x49, 
+  0x23, 0x00, 0x68, 0xb5, 0xda, 0xd9, 0x5a, 0x75, 0x17, 0x80, 0xd5, 0x73, 0x4d, 0x84, 0xe8, 0xb4, 
+  0x00, 0x6c, 0x3b, 0x70, 0x9c, 0x1e, 0x59, 0x06, 0x60, 0x5c, 0x58, 0x08, 0x73, 0x62, 0x23, 0x14, 
+  0xec, 0xea, 0xdd, 0xc7, 0xb0, 0x3b, 0x3b, 0x01, 0xc8, 0x9f, 0x36, 0x91, 0x70, 0xb5, 0x8a, 0x1e, 
+  0x59, 0xe6, 0x8a, 0xf9, 0x16, 0x00, 0xc6, 0xe8, 0x48, 0xa6, 0x19, 0xc2, 0xfc, 0x43, 0xdc, 0x18, 
+  0x2d, 0x88, 0xdc, 0xb6, 0x34, 0xf5, 0x26, 0x33, 0x3a, 0x01, 0x80, 0x9a, 0xba, 0x06, 0x0a, 0xcb, 
+  0x6b, 0x01, 0xd8, 0x99, 0x9f, 0xc5, 0xf1, 0xc2, 0x65, 0x14, 0xaf, 0x59, 0x42, 0xe5, 0xda, 0x45, 
+  0xa4, 0x84, 0x6a, 0xa9, 0x70, 0x74, 0x71, 0xf0, 0xcc, 0xaf, 0x00, 0x0c, 0x0c, 0x09, 0x66, 0xc5, 
+  0x6b, 0x62, 0x87, 0xcb, 0x6b, 0xee, 0x2a, 0xb1, 0xa6, 0x24, 0xc7, 0xf5, 0x3f, 0xf1, 0x04, 0x5d, 
+  0x10, 0x41, 0x1a, 0x21, 0x93, 0xe6, 0x36, 0x1b, 0x00, 0x6f, 0x8f, 0x1a, 0x86, 0x4e, 0x3b, 0x00, 
+  0x80, 0x8a, 0xeb, 0x77, 0x00, 0xc8, 0x8b, 0x8f, 0x64, 0xb6, 0x69, 0x02, 0x6a, 0x95, 0x08, 0xfd, 
+  0x8a, 0x71, 0x18, 0x05, 0xb9, 0x93, 0x01, 0xd8, 0x5c, 0xf6, 0x87, 0x12, 0x6f, 0x64, 0x4c, 0x14, 
+  0x00, 0x47, 0x6f, 0x36, 0x2a, 0x3e, 0xc3, 0x10, 0x7d, 0xff, 0x13, 0x8f, 0x09, 0xd5, 0x3d, 0xe7, 
+  0x1b, 0x1c, 0xd2, 0xeb, 0x6b, 0xb1, 0x09, 0xad, 0x26, 0x44, 0x0d, 0x79, 0x6e, 0x5d, 0xc4, 0xe0, 
+  0x41, 0x62, 0x8d, 0xcb, 0x83, 0xdb, 0xe3, 0x11, 0xd8, 0x41, 0xa2, 0x9c, 0xde, 0xed, 0x71, 0xf5, 
+  0x92, 0xf1, 0xa2, 0xb2, 0xfc, 0x67, 0xe2, 0xb5, 0xf6, 0x3f, 0x95, 0xdf, 0x41, 0x1a, 0xd1, 0x2d, 
+  0x6b, 0x1f, 0xb4, 0x2b, 0xbe, 0x31, 0x71, 0xd1, 0x00, 0x9c, 0xbe, 0xd1, 0x48, 0x57, 0xcf, 0x3f, 
+  0xbb, 0xf1, 0x95, 0x5a, 0x21, 0x87, 0xec, 0xa8, 0x30, 0x34, 0x6a, 0x81, 0xbd, 0xff, 0xf4, 0x5f, 
+  0xfb, 0xbb, 0xae, 0xdd, 0x9e, 0x27, 0xfd, 0x4f, 0xdc, 0xea, 0x79, 0x82, 0xb3, 0xb3, 0x4b, 0xec, 
+  0x6a, 0x8c, 0x01, 0x80, 0xb3, 0xad, 0x0e, 0xda, 0xda, 0xed, 0x00, 0x4c, 0x48, 0x4b, 0x46, 0xaf, 
+  0x92, 0xa8, 0xea, 0xe8, 0x66, 0x63, 0xf1, 0x21, 0x05, 0x77, 0xa1, 0xd2, 0xcc, 0xba, 0xf3, 0x42, 
+  0x22, 0x4b, 0xa7, 0x8f, 0x57, 0xfc, 0x17, 0x9f, 0x26, 0x33, 0x39, 0x29, 0x56, 0xf1, 0xd5, 0x35, 
+  0xb7, 0xf9, 0xe7, 0x70, 0x36, 0x34, 0xb7, 0x00, 0x90, 0x18, 0x1f, 0xa3, 0xcc, 0x28, 0xe7, 0x2a, 
+  0xcc, 0x4a, 0x2d, 0xde, 0xff, 0x6e, 0x2e, 0x00, 0x27, 0xea, 0x7a, 0x0f, 0xef, 0x03, 0xab, 0x48, 
+  0xec, 0x93, 0xcc, 0x64, 0x4c, 0x99, 0x69, 0x22, 0x4e, 0x53, 0x0b, 0xbb, 0x6e, 0x8a, 0x35, 0x13, 
+  0xc7, 0x26, 0x02, 0xe0, 0x72, 0xb9, 0xf9, 0xa1, 0xba, 0xde, 0x3f, 0xc4, 0xcf, 0x5f, 0xbd, 0x0e, 
+  0x40, 0xb0, 0x4e, 0xcb, 0xfa, 0x19, 0xa2, 0x61, 0xac, 0x38, 0x52, 0x4e, 0x43, 0x93, 0x48, 0x68, 
+  0x7c, 0xfa, 0xe8, 0x3e, 0xeb, 0x78, 0xee, 0xa4, 0x57, 0xd1, 0xa8, 0xd5, 0xb8, 0x5c, 0x6e, 0xbe, 
+  0xda, 0x7f, 0x42, 0x91, 0x4e, 0x7a, 0xb2, 0xa8, 0x4a, 0x37, 0xea, 0x1b, 0x69, 0x7a, 0xec, 0xf6, 
+  0x0f, 0xf1, 0xf5, 0x65, 0xd5, 0x3c, 0xb4, 0x89, 0x1b, 0xd2, 0x6c, 0xd3, 0x78, 0x4c, 0x91, 0x7a, 
+  0x7a, 0x64, 0x99, 0xc5, 0xdf, 0xec, 0xa7, 0xfc, 0x6a, 0x2d, 0x07, 0x4f, 0x5d, 0x54, 0xea, 0xf8, 
+  0xbf, 0x6d, 0xdf, 0x99, 0xdf, 0xa8, 0x30, 0xdf, 0x62, 0xd3, 0xee, 0x12, 0xf6, 0xde, 0x79, 0x00, 
+  0xc0, 0x86, 0x85, 0x33, 0x95, 0x86, 0xb6, 0xaf, 0xf4, 0xb2, 0x7f, 0x67, 0x95, 0x3d, 0xc7, 0x44, 
+  0xc7, 0x0c, 0xd1, 0x69, 0xf9, 0xfa, 0x83, 0x7c, 0x52, 0x42, 0xb5, 0x54, 0x75, 0x74, 0xf3, 0xc6, 
+  0x8e, 0x9f, 0x59, 0x5a, 0x72, 0xa9, 0x4f, 0xdc, 0xb6, 0x6b, 0xf5, 0x4c, 0xff, 0xf6, 0x10, 0x5b, 
+  0x7e, 0xaf, 0x13, 0x9d, 0x37, 0x2f, 0x8b, 0xb1, 0x89, 0xa2, 0xa1, 0x55, 0xd6, 0xdc, 0xe6, 0x3b, 
+  0x73, 0x83, 0x7f, 0x89, 0x6f, 0x2c, 0xaf, 0xa5, 0xac, 0x52, 0xe8, 0x3a, 0x36, 0x3a, 0x92, 0xc2, 
+  0x79, 0x39, 0x5e, 0x0f, 0x59, 0x8b, 0x12, 0x87, 0x33, 0x27, 0x7b, 0x82, 0x38, 0xf4, 0x36, 0x27, 
+  0x1f, 0xed, 0x3e, 0xe6, 0xff, 0xe9, 0x10, 0x60, 0x4e, 0xf1, 0x51, 0x2e, 0x5f, 0xbb, 0xc1, 0x63, 
+  0x97, 0x9b, 0x9b, 0x96, 0xfb, 0x5e, 0xe3, 0xeb, 0xdb, 0x3b, 0x68, 0xb7, 0x3b, 0x79, 0x68, 0x73, 
+  0xb0, 0x6a, 0xfb, 0x41, 0xaa, 0x3b, 0x7b, 0xbc, 0x8e, 0xe1, 0xd3, 0x45, 0x02, 0x60, 0xd6, 0xf6, 
+  0x12, 0x9f, 0xaf, 0x5e, 0x17, 0xac, 0x1d, 0x8c, 0x2a, 0xf8, 0xf6, 0x7f, 0x5d, 0xdf, 0x54, 0x04, 
+  0xa8, 0xbd, 0x24, 0xfe, 0x92, 0xf8, 0x4b, 0xe2, 0x3e, 0x98, 0xcd, 0xe5, 0xc1, 0xe5, 0x12, 0xed, 
+  0xdb, 0xfe, 0x74, 0x30, 0xeb, 0x6f, 0xd3, 0xf8, 0x23, 0xa8, 0xf3, 0x89, 0x4c, 0xc1, 0xf6, 0x03, 
+  0x8c, 0x1a, 0x16, 0xc1, 0x9a, 0xb3, 0x57, 0xfd, 0x42, 0x5c, 0x8a, 0x5f, 0xb9, 0x45, 0x76, 0x06, 
+  0xc8, 0x83, 0xe7, 0x33, 0x8b, 0x1d, 0xaa, 0x47, 0x35, 0x29, 0x31, 0x2e, 0xe0, 0xf4, 0x9d, 0x6a, 
+  0x34, 0xa0, 0x2a, 0xca, 0xcf, 0x41, 0x1f, 0xac, 0x0d, 0x18, 0xd2, 0xfa, 0x60, 0x2d, 0x45, 0xf9, 
+  0x39, 0x48, 0xcf, 0x1e, 0xf6, 0x3f, 0xfd, 0xb1, 0x94, 0xea, 0x7b, 0x2d, 0x34, 0xb6, 0x3b, 0x5f, 
+  0x58, 0x79, 0xa4, 0x1a, 0x0d, 0x14, 0xe5, 0x8b, 0x87, 0xfd, 0xbf, 0x00, 0xd6, 0xb3, 0xa3, 0xbf, 
+  0xa8, 0xc1, 0x25, 0x68, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
+  0x00 };
+static const char CONTENT_ACCESS_POINT_PNG_ETAG[] PROGMEM = "e2798523f4ed38570041e8ef4b2dd0ce53878539deebda0e3c7293f5c0b974ef";
diff --git a/src/lcd_static/lcd_gui.no_wifi_png.h b/src/lcd_static/lcd_gui.no_wifi_png.h
new file mode 100644
index 00000000..a24c6760
--- /dev/null
+++ b/src/lcd_static/lcd_gui.no_wifi_png.h
@@ -0,0 +1,84 @@
+static const char CONTENT_NO_WIFI_PNG[] PROGMEM = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 
+  0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x22, 0x08, 0x06, 0x00, 0x00, 0x00, 0x20, 0x7b, 0xeb, 
+  0x4c, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 
+  0x07, 0xe8, 0x09, 0x1b, 0x10, 0x07, 0x27, 0x4a, 0xa6, 0x01, 0x7c, 0x00, 0x00, 0x04, 0xa2, 0x49, 
+  0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5, 0x98, 0x6b, 0x50, 0x94, 0x65, 0x14, 0xc7, 0x7f, 0xbb, 0x0b, 
+  0xbb, 0xbc, 0x20, 0xbb, 0xc1, 0x22, 0x88, 0x2c, 0x37, 0xb1, 0x56, 0x0c, 0x42, 0x45, 0x04, 0x13, 
+  0x5d, 0x11, 0xc8, 0xd0, 0x91, 0xcc, 0x5d, 0x1b, 0x2f, 0xcd, 0x14, 0x0a, 0x69, 0x8d, 0xe9, 0x74, 
+  0x9f, 0xb4, 0x0f, 0x94, 0xa5, 0x8e, 0x35, 0x39, 0x3a, 0x4c, 0x33, 0x95, 0x53, 0xa9, 0x8d, 0x4d, 
+  0x85, 0x82, 0xfa, 0xc1, 0x14, 0xa1, 0x91, 0x06, 0x90, 0x4c, 0x1b, 0x41, 0x12, 0xd1, 0x91, 0xb8, 
+  0x2b, 0xeb, 0xe2, 0xee, 0xa2, 0x5c, 0xe4, 0xb2, 0x7d, 0x40, 0x76, 0x86, 0xcb, 0x8a, 0x2c, 0x1b, 
+  0xc8, 0xff, 0xdb, 0x73, 0x9e, 0xe7, 0x9c, 0xf7, 0x37, 0xe7, 0x3d, 0xcf, 0x55, 0x64, 0xb1, 0x58, 
+  0x2c, 0xd5, 0x06, 0x13, 0xdb, 0x8e, 0xe4, 0x52, 0x5a, 0xdb, 0x48, 0xb5, 0xc1, 0xc4, 0xe3, 0xa8, 
+  0x00, 0xa5, 0x82, 0x70, 0x95, 0x37, 0x9f, 0x69, 0xe3, 0x09, 0x50, 0x2a, 0x10, 0x55, 0xdd, 0x36, 
+  0x5a, 0x34, 0x3b, 0xbf, 0xc7, 0xd4, 0xda, 0xce, 0x78, 0x90, 0x42, 0x90, 0x71, 0xf6, 0xc3, 0x14, 
+  0x24, 0xfa, 0x29, 0x51, 0xe9, 0x97, 0xeb, 0x1a, 0x19, 0x2f, 0x6a, 0xef, 0xec, 0xa2, 0xda, 0x60, 
+  0x42, 0x5c, 0x70, 0xad, 0x9a, 0xf1, 0xa6, 0xcb, 0x75, 0x8d, 0x88, 0xc7, 0xaa, 0x44, 0x92, 0x55, 
+  0x4a, 0xfc, 0xa4, 0x4e, 0x76, 0xf9, 0x56, 0x1b, 0x4c, 0x38, 0x8d, 0x05, 0xf4, 0x0f, 0x3a, 0x0d, 
+  0xc9, 0x71, 0x31, 0xd4, 0xde, 0xd4, 0xb3, 0x76, 0xcf, 0x61, 0x4a, 0xef, 0xb6, 0x0d, 0x3b, 0x86, 
+  0x78, 0xd4, 0xa1, 0x57, 0x2e, 0x24, 0x39, 0x2e, 0x06, 0x00, 0xd5, 0xa4, 0x89, 0xec, 0x5c, 0x95, 
+  0x68, 0x57, 0x1c, 0x87, 0x64, 0x7c, 0x96, 0x5c, 0xe0, 0xb9, 0xd0, 0x40, 0x42, 0x26, 0x4f, 0xc4, 
+  0xc7, 0x53, 0x81, 0x20, 0x93, 0xe2, 0x24, 0xe9, 0xc9, 0x49, 0x67, 0x57, 0x37, 0xed, 0xf7, 0x3b, 
+  0x68, 0x30, 0x18, 0xf1, 0x74, 0x77, 0x23, 0x2e, 0x3a, 0xa2, 0x8f, 0x6f, 0x79, 0x55, 0xfd, 0xe8, 
+  0x82, 0xbf, 0x14, 0xe4, 0x8d, 0x36, 0x76, 0x06, 0x61, 0x21, 0x01, 0xf8, 0x7a, 0x2b, 0xed, 0x8a, 
+  0x71, 0xf4, 0x4c, 0x21, 0xef, 0xe6, 0x5c, 0x18, 0x1d, 0xf0, 0xb7, 0x23, 0xa7, 0xb2, 0x3a, 0x61, 
+  0x2e, 0x21, 0x01, 0x93, 0x47, 0xf4, 0x97, 0x8e, 0x9e, 0x29, 0x24, 0x35, 0xeb, 0x0f, 0x52, 0x43, 
+  0xfd, 0xf1, 0x92, 0xbb, 0xb1, 0xab, 0xb8, 0xfc, 0xff, 0x01, 0x4f, 0xf2, 0xf5, 0xe0, 0xa3, 0xd5, 
+  0xcf, 0x13, 0x1a, 0x12, 0x30, 0xe2, 0xd2, 0xca, 0xca, 0x2d, 0xb2, 0x42, 0x7f, 0x9c, 0xaa, 0x45, 
+  0x70, 0x91, 0xf1, 0xe2, 0x82, 0xd9, 0xec, 0xfa, 0xf9, 0x14, 0x59, 0xd5, 0xfa, 0x47, 0x8a, 0x21, 
+  0xf2, 0x78, 0x63, 0x97, 0x65, 0xa8, 0x41, 0xe9, 0xb1, 0x61, 0xbc, 0xb6, 0x22, 0x11, 0x17, 0x99, 
+  0xd4, 0x21, 0xd0, 0xeb, 0x8f, 0xe6, 0x93, 0x1a, 0xea, 0x4f, 0x7a, 0xaa, 0x16, 0x57, 0x17, 0x99, 
+  0xb5, 0xef, 0x7e, 0x47, 0x27, 0x07, 0x4e, 0xfc, 0xce, 0x07, 0xb9, 0x17, 0x47, 0x9e, 0xf1, 0x7d, 
+  0x49, 0xd1, 0xac, 0x5d, 0xaa, 0x41, 0x24, 0x12, 0x3d, 0x74, 0xdc, 0x1d, 0x73, 0x33, 0x35, 0x0d, 
+  0x7a, 0xea, 0xf4, 0x4d, 0xdc, 0x6d, 0x69, 0x23, 0x6a, 0xfa, 0x54, 0x82, 0x54, 0x93, 0x06, 0x2d, 
+  0x8f, 0xf5, 0xd3, 0x54, 0x03, 0xa0, 0x01, 0xa4, 0xce, 0x4e, 0xa4, 0xad, 0x48, 0xe4, 0x89, 0x09, 
+  0x02, 0x1b, 0x8e, 0x15, 0x8c, 0x0c, 0x5c, 0x97, 0xf8, 0xac, 0x4d, 0xe8, 0x3b, 0xe6, 0x66, 0x8a, 
+  0x2e, 0x95, 0x93, 0x59, 0x50, 0x42, 0x76, 0xcd, 0x6d, 0xab, 0xfd, 0x3b, 0xad, 0xc6, 0x26, 0x34, 
+  0x40, 0x44, 0xb0, 0x1f, 0xad, 0xad, 0xed, 0x03, 0xc0, 0x7b, 0xf5, 0x42, 0x5c, 0x0c, 0x5b, 0x8e, 
+  0x17, 0xd2, 0x66, 0xb1, 0xd8, 0x0f, 0xee, 0x24, 0x91, 0x0c, 0xb0, 0xdd, 0x6d, 0x69, 0x25, 0x3b, 
+  0xaf, 0x98, 0xf7, 0x7f, 0xfb, 0xb3, 0x4f, 0xf0, 0x24, 0x5f, 0x0f, 0x5e, 0xd6, 0xcc, 0x22, 0x69, 
+  0xfe, 0x6c, 0x9b, 0xd0, 0x00, 0x9b, 0x4f, 0x16, 0xc3, 0xc9, 0x62, 0x3e, 0x4f, 0x8c, 0x44, 0x17, 
+  0x3f, 0x17, 0x85, 0xbb, 0x5b, 0xbf, 0x6f, 0x8a, 0x91, 0x8a, 0xa0, 0xcd, 0x32, 0x82, 0x8c, 0x17, 
+  0x5e, 0xba, 0xc2, 0x82, 0xc8, 0x30, 0x6b, 0xfb, 0x6a, 0x65, 0x0d, 0x6f, 0x7e, 0x9b, 0xcd, 0x5f, 
+  0xa6, 0x96, 0x9e, 0x3f, 0x12, 0xe8, 0xcd, 0xea, 0x85, 0xb3, 0x98, 0xa1, 0x9e, 0x82, 0x87, 0xc2, 
+  0xdd, 0xe6, 0xea, 0x91, 0xa2, 0x56, 0xb1, 0x59, 0x9b, 0xc0, 0x95, 0xca, 0x5a, 0xf6, 0xe7, 0x9e, 
+  0x27, 0xaf, 0xd1, 0xc4, 0x7b, 0x39, 0x17, 0x38, 0x58, 0x54, 0x46, 0xc6, 0xfa, 0x64, 0xc2, 0x9f, 
+  0x0a, 0xb6, 0xfa, 0x9c, 0x2b, 0x29, 0xc7, 0xdc, 0x6d, 0x19, 0xf9, 0xe4, 0xfc, 0x66, 0x79, 0x2c, 
+  0x21, 0x7e, 0x3e, 0xdc, 0xa8, 0x6f, 0x24, 0xed, 0x41, 0xe6, 0x92, 0x55, 0x4a, 0xde, 0x5a, 0xb1, 
+  0x88, 0x08, 0xf5, 0x94, 0x21, 0x97, 0xbc, 0x14, 0xb5, 0x8a, 0xed, 0x69, 0x5a, 0x5c, 0x05, 0x97, 
+  0x07, 0x9b, 0x52, 0x17, 0xe7, 0x4b, 0x2b, 0xf8, 0xe4, 0xd7, 0x5c, 0x8a, 0x8d, 0xf7, 0x7a, 0xe6, 
+  0xd2, 0x92, 0x68, 0x42, 0x83, 0xfc, 0xa8, 0xac, 0x6f, 0x64, 0xf3, 0xb1, 0x82, 0x87, 0x96, 0xc9, 
+  0x23, 0x83, 0xf7, 0xd7, 0xd6, 0x98, 0x50, 0xb6, 0xac, 0x5a, 0x82, 0xb3, 0xb3, 0xd3, 0x90, 0xd0, 
+  0xaf, 0xaa, 0xfd, 0xf8, 0x34, 0x4d, 0x67, 0x85, 0xee, 0x5f, 0x72, 0xbb, 0x0f, 0x9d, 0x20, 0xa3, 
+  0xa4, 0x72, 0x74, 0xce, 0x2a, 0x1b, 0xb5, 0x89, 0x8f, 0x0c, 0xbd, 0xdd, 0x06, 0x34, 0xc0, 0x04, 
+  0x57, 0x81, 0x0d, 0xcb, 0x17, 0xd9, 0xb5, 0xac, 0xda, 0x05, 0x3e, 0xc1, 0x55, 0x18, 0x72, 0x73, 
+  0x51, 0x4a, 0xc4, 0x2c, 0x9d, 0x13, 0xc6, 0x8d, 0x9a, 0x06, 0x0c, 0x46, 0xb3, 0xcd, 0xf1, 0xee, 
+  0x6e, 0xc2, 0xe8, 0x9d, 0x55, 0xae, 0x56, 0xd6, 0xa0, 0x0e, 0xf6, 0x1f, 0x60, 0xcf, 0xce, 0xeb, 
+  0xd9, 0x5c, 0x00, 0x0c, 0x5d, 0xdd, 0xac, 0x3c, 0x74, 0xca, 0xda, 0xb7, 0xcc, 0x4f, 0xc9, 0x2b, 
+  0xf1, 0x51, 0xcc, 0x9b, 0x39, 0x1d, 0x99, 0xd4, 0xd9, 0x6a, 0x2f, 0xa9, 0xf8, 0xd7, 0x2e, 0x70, 
+  0x89, 0x10, 0x95, 0x90, 0x3e, 0x5c, 0xa7, 0xf8, 0x40, 0x1f, 0xa6, 0xf6, 0x3b, 0xab, 0x64, 0xe7, 
+  0x15, 0xb1, 0xee, 0x48, 0xbe, 0x4d, 0x9f, 0x8a, 0xe6, 0x56, 0x7e, 0xb9, 0x74, 0x9d, 0x8b, 0x17, 
+  0xcb, 0x08, 0xf1, 0x52, 0x20, 0x16, 0x89, 0x38, 0x7f, 0xb9, 0x82, 0x4d, 0x87, 0x4f, 0xd3, 0xdc, 
+  0xd5, 0x3d, 0x6c, 0xf0, 0x61, 0x4f, 0xce, 0x8c, 0xa5, 0x31, 0xac, 0x59, 0xa2, 0xe9, 0x07, 0x7d, 
+  0x8e, 0x75, 0x47, 0xce, 0x5a, 0xdb, 0x5f, 0x2e, 0x8e, 0x22, 0x6e, 0xf6, 0xd3, 0x08, 0x32, 0x29, 
+  0xf5, 0xfa, 0x26, 0xbe, 0x3a, 0x9e, 0x4f, 0x66, 0x95, 0x63, 0xef, 0xb5, 0xc3, 0x2e, 0x95, 0xb9, 
+  0xcf, 0xa8, 0x1f, 0x0a, 0xfd, 0xd3, 0x9a, 0x04, 0x16, 0xcf, 0x8b, 0xb4, 0xb6, 0xbd, 0x95, 0x1e, 
+  0xec, 0x0d, 0x52, 0xc1, 0xbe, 0xc3, 0x0e, 0x85, 0x1f, 0xf6, 0xe4, 0xdc, 0x9b, 0x99, 0xc3, 0xbd, 
+  0x96, 0xb6, 0x41, 0xa1, 0x35, 0x5e, 0xee, 0x24, 0xc4, 0xcc, 0x1c, 0xe0, 0x23, 0xb8, 0xc8, 0x78, 
+  0x7d, 0xd9, 0xfc, 0xb1, 0xcd, 0xf8, 0xc1, 0x6b, 0xf5, 0xdc, 0xfc, 0xe2, 0x00, 0xde, 0xee, 0x02, 
+  0x3f, 0x5e, 0x6f, 0xe8, 0xd3, 0x37, 0x27, 0xd8, 0x17, 0x89, 0x64, 0xf0, 0x5c, 0xf8, 0x4e, 0xf4, 
+  0x1c, 0x5b, 0x70, 0x80, 0xd3, 0xb7, 0x8c, 0x70, 0xcb, 0x38, 0xc0, 0x6e, 0x6e, 0xb1, 0xfd, 0x62, 
+  0xd0, 0xd1, 0xd1, 0xe9, 0x50, 0x70, 0x87, 0x5e, 0x96, 0xbf, 0x2e, 0xab, 0x42, 0xdf, 0x64, 0x1c, 
+  0xb4, 0xaf, 0xa8, 0xe4, 0xea, 0xe3, 0x0b, 0x0e, 0xb0, 0x6d, 0x7f, 0x16, 0x4d, 0xfd, 0x36, 0x9c, 
+  0xc2, 0xbf, 0xff, 0x61, 0xe3, 0xf1, 0x42, 0x87, 0x7e, 0xc7, 0xae, 0xb3, 0xca, 0x50, 0x92, 0x8b, 
+  0x45, 0x6c, 0x9a, 0x33, 0x8d, 0x49, 0x9e, 0x72, 0xf2, 0xcb, 0x2a, 0x1d, 0xbe, 0x14, 0x02, 0x88, 
+  0x02, 0xdf, 0xd9, 0x63, 0x31, 0x8f, 0x93, 0x07, 0xcf, 0x5e, 0xf9, 0x7b, 0xca, 0x11, 0xc7, 0x3e, 
+  0x19, 0xc0, 0x78, 0x53, 0xb8, 0xca, 0x07, 0xf1, 0x0e, 0x5d, 0x3c, 0x72, 0x41, 0x36, 0x6e, 0xa0, 
+  0xe5, 0x82, 0x8c, 0x1d, 0xba, 0x78, 0x44, 0xbd, 0x0f, 0xfb, 0x5b, 0x33, 0x73, 0x29, 0xad, 0xbd, 
+  0x45, 0x4d, 0x93, 0xf9, 0xb1, 0x2d, 0x8f, 0x70, 0x95, 0x0f, 0x3b, 0x74, 0x3d, 0x0f, 0xfb, 0xff, 
+  0x01, 0x50, 0x02, 0xb9, 0x46, 0x29, 0x78, 0x9a, 0xce, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 
+  0x44, 0xae, 0x42, 0x60, 0x82, 0x00 };
+static const char CONTENT_NO_WIFI_PNG_ETAG[] PROGMEM = "ec856c8b3b5f2dd7efc1781437a239a2137f0e9061d280f82b74c8449d265603";
diff --git a/src/lcd_static/lcd_gui.wifi_png.h b/src/lcd_static/lcd_gui.wifi_png.h
new file mode 100644
index 00000000..3f56bf2c
--- /dev/null
+++ b/src/lcd_static/lcd_gui.wifi_png.h
@@ -0,0 +1,120 @@
+static const char CONTENT_WIFI_PNG[] PROGMEM = {
+  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 
+  0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x22, 0x08, 0x06, 0x00, 0x00, 0x00, 0x20, 0x7b, 0xeb, 
+  0x4c, 0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 
+  0x43, 0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 
+  0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 
+  0x07, 0xe8, 0x09, 0x1b, 0x13, 0x26, 0x2c, 0x53, 0xad, 0x73, 0x4e, 0x00, 0x00, 0x06, 0xe2, 0x49, 
+  0x44, 0x41, 0x54, 0x58, 0xc3, 0xd5, 0x98, 0x5b, 0x6c, 0x14, 0xe7, 0x19, 0x86, 0x9f, 0x7f, 0x66, 
+  0x76, 0xd7, 0xeb, 0x3d, 0xdb, 0x66, 0xf1, 0xfa, 0xb0, 0xe0, 0xb5, 0xb1, 0x8d, 0x89, 0xb1, 0xa1, 
+  0x24, 0x01, 0x02, 0x39, 0x08, 0x88, 0x08, 0xa1, 0x49, 0xa4, 0xd0, 0x4a, 0x49, 0xd5, 0xd3, 0x45, 
+  0x85, 0x54, 0xa9, 0x95, 0xd2, 0x8b, 0x4a, 0x6d, 0x2f, 0x4a, 0x55, 0x95, 0xf6, 0xa2, 0xbd, 0x8a, 
+  0x22, 0xf5, 0xa2, 0x12, 0x55, 0x0f, 0x91, 0xaa, 0x42, 0x14, 0x48, 0x4b, 0x1b, 0x11, 0xa2, 0x04, 
+  0x62, 0xc0, 0x09, 0xc5, 0x10, 0x6f, 0x62, 0x93, 0x60, 0x30, 0x8b, 0xed, 0xc5, 0xeb, 0x5d, 0xef, 
+  0xc1, 0xeb, 0x3d, 0xcf, 0xfc, 0xbd, 0x58, 0x63, 0xc5, 0x40, 0x1b, 0xbc, 0xf8, 0x02, 0xbf, 0x77, 
+  0x73, 0xf8, 0x67, 0xde, 0xf9, 0xbe, 0xf7, 0xfb, 0xbf, 0xf7, 0x1b, 0x21, 0xa5, 0x94, 0xa1, 0x58, 
+  0x92, 0x9f, 0x1d, 0x39, 0xc9, 0xe0, 0x58, 0x84, 0x50, 0x2c, 0xc9, 0x83, 0x08, 0x7f, 0xad, 0x8b, 
+  0xee, 0x26, 0x2f, 0xbf, 0x7a, 0x71, 0x07, 0xfe, 0x5a, 0x17, 0xe2, 0x7a, 0x34, 0x21, 0x9f, 0xf8, 
+  0xf5, 0x21, 0x92, 0xd9, 0x3c, 0xcb, 0x01, 0x2e, 0xab, 0x85, 0xf7, 0x7f, 0xf2, 0x5d, 0xd4, 0xa9, 
+  0xc0, 0xc3, 0x07, 0x82, 0xe3, 0x11, 0x96, 0x0b, 0xf2, 0x25, 0x9d, 0x50, 0x2c, 0x89, 0xd2, 0xf7, 
+  0x79, 0x88, 0xe5, 0x86, 0xe0, 0x78, 0x04, 0x65, 0xb9, 0x48, 0xe4, 0x8b, 0x08, 0xc5, 0x92, 0x68, 
+  0x95, 0x2e, 0x56, 0x81, 0x16, 0xab, 0x19, 0x5f, 0xb5, 0x85, 0x55, 0x35, 0x76, 0x36, 0xb5, 0x35, 
+  0xb1, 0xda, 0x57, 0x47, 0x9d, 0xc7, 0x89, 0xd3, 0x66, 0xc5, 0xa4, 0x69, 0x48, 0x20, 0x9d, 0xc9, 
+  0x92, 0x9c, 0xc9, 0x30, 0x31, 0x35, 0xcd, 0xe0, 0xb5, 0x09, 0x06, 0x6f, 0x4c, 0x31, 0x39, 0x9b, 
+  0x27, 0x94, 0xc9, 0x13, 0xd3, 0x0d, 0x44, 0x85, 0xef, 0x17, 0x9e, 0xef, 0xff, 0x46, 0xde, 0xeb, 
+  0xcd, 0x12, 0x10, 0x40, 0x8f, 0xa3, 0x8a, 0x2e, 0xaf, 0x8b, 0xc7, 0xd7, 0x05, 0xd8, 0xd0, 0xd9, 
+  0x42, 0x53, 0x7d, 0x1d, 0x9a, 0xa6, 0x22, 0x10, 0x08, 0x71, 0xf7, 0x75, 0x48, 0x89, 0x21, 0x25, 
+  0xc9, 0x99, 0x59, 0x86, 0x46, 0x6e, 0xd0, 0x17, 0x1c, 0xe1, 0xfc, 0xe8, 0x24, 0xc1, 0x78, 0x9a, 
+  0x9b, 0x25, 0x63, 0xd1, 0x11, 0xbc, 0x67, 0xe2, 0x39, 0x29, 0x69, 0xaf, 0x32, 0xb1, 0xbd, 0x79, 
+  0x05, 0x4f, 0x6f, 0x6c, 0xe7, 0xd1, 0xf5, 0xed, 0x78, 0x9c, 0x0e, 0x14, 0xa5, 0xb2, 0x98, 0xe5, 
+  0x0b, 0x05, 0x86, 0xaf, 0x8e, 0xf1, 0xee, 0x7f, 0x86, 0x38, 0x39, 0x74, 0x83, 0xfe, 0xc4, 0xec, 
+  0x7c, 0x60, 0xee, 0x05, 0xda, 0xbd, 0x44, 0xb9, 0x28, 0xe1, 0x71, 0x8f, 0x9d, 0x17, 0x37, 0xb5, 
+  0xb3, 0xf3, 0x91, 0x87, 0x68, 0xf2, 0xad, 0x40, 0xb9, 0x2d, 0xb4, 0x62, 0xee, 0xd8, 0x30, 0x0c, 
+  0x8a, 0x25, 0x1d, 0xa4, 0x04, 0x21, 0x50, 0x15, 0x81, 0xa6, 0xaa, 0x94, 0x53, 0x21, 0x91, 0x73, 
+  0x61, 0xb2, 0x98, 0xcd, 0xf4, 0xae, 0x6d, 0xa5, 0xd5, 0xef, 0xa3, 0xa7, 0xed, 0x73, 0x8e, 0x9d, 
+  0x1d, 0xe4, 0xf8, 0xb5, 0x08, 0x51, 0xdd, 0x40, 0xbd, 0x5f, 0xe2, 0x12, 0x30, 0x09, 0xd8, 0xd3, 
+  0xe0, 0xe1, 0x9b, 0x4f, 0x6d, 0x64, 0x4b, 0x4f, 0x07, 0x0e, 0x5b, 0x35, 0x72, 0xee, 0xed, 0x65, 
+  0xae, 0x82, 0x74, 0x26, 0x4b, 0x22, 0x95, 0x26, 0x95, 0xce, 0x90, 0x9a, 0xcd, 0x92, 0xce, 0xe4, 
+  0xd0, 0x75, 0x03, 0x45, 0x11, 0x58, 0x4c, 0x26, 0x9c, 0x76, 0x2b, 0x4e, 0x7b, 0x35, 0x2e, 0xbb, 
+  0x0d, 0xb7, 0xd3, 0x86, 0xaa, 0xaa, 0x48, 0x29, 0x91, 0x52, 0x62, 0xaf, 0xb6, 0xf2, 0xe4, 0x23, 
+  0xdd, 0x34, 0x7a, 0x6b, 0x68, 0x3c, 0x3d, 0xc0, 0x9f, 0x07, 0x46, 0x18, 0x2f, 0xea, 0x28, 0xf7, 
+  0x43, 0xdc, 0x24, 0x60, 0x4f, 0x63, 0x2d, 0xfb, 0xf7, 0x6c, 0x61, 0xc3, 0xda, 0x56, 0xcc, 0x66, 
+  0x6d, 0x01, 0xe9, 0x78, 0x32, 0xcd, 0xe8, 0x44, 0x84, 0xcf, 0xae, 0x87, 0x09, 0x8e, 0x86, 0xe9, 
+  0x1b, 0x9d, 0xe4, 0xfd, 0x58, 0x9a, 0xdb, 0x85, 0xbe, 0xd2, 0xac, 0xb1, 0xd7, 0x5f, 0x47, 0xef, 
+  0xaa, 0x7a, 0xba, 0x56, 0xfb, 0x08, 0x34, 0xd7, 0xe3, 0xf3, 0xd6, 0x94, 0x0b, 0x58, 0x4a, 0x14, 
+  0x21, 0xe8, 0x0c, 0x34, 0xe3, 0xb0, 0x59, 0xb1, 0x5b, 0xcd, 0xbc, 0x76, 0x66, 0x88, 0xc9, 0xa2, 
+  0x5e, 0xb9, 0xc6, 0x9f, 0x6d, 0xa8, 0xe1, 0x07, 0xcf, 0x6f, 0xa3, 0xb7, 0xb3, 0x15, 0x55, 0x55, 
+  0xe6, 0x25, 0x91, 0xcf, 0x17, 0xb8, 0x3c, 0x3a, 0xc6, 0xb9, 0xc1, 0x2b, 0xbc, 0x75, 0x71, 0x84, 
+  0xe3, 0xd1, 0x19, 0x10, 0x02, 0x8b, 0x80, 0x82, 0x64, 0xfe, 0xe3, 0xca, 0x0b, 0x40, 0x15, 0x02, 
+  0x5d, 0x96, 0x0b, 0xb4, 0xc5, 0xac, 0xf1, 0x72, 0x57, 0x33, 0xdb, 0xbb, 0xdb, 0xd8, 0xb0, 0xb6, 
+  0x85, 0xba, 0x1a, 0xd7, 0xbc, 0x7c, 0x84, 0x10, 0x4c, 0x46, 0xa7, 0x39, 0x7c, 0xf2, 0x43, 0x7e, 
+  0x7e, 0x2a, 0x58, 0x39, 0xf1, 0x7f, 0xee, 0xff, 0x2a, 0x1b, 0xd7, 0xb6, 0xa2, 0x69, 0xea, 0xfc, 
+  0x83, 0x13, 0xa9, 0x34, 0x7d, 0x03, 0x43, 0x1c, 0x39, 0x13, 0xe4, 0xe8, 0x58, 0x8c, 0x9c, 0x94, 
+  0x08, 0x20, 0x6b, 0x48, 0xd6, 0x55, 0x99, 0xd8, 0x15, 0x58, 0x89, 0xbf, 0xce, 0x8d, 0xa3, 0xda, 
+  0x82, 0xae, 0x1b, 0xc4, 0xd3, 0x59, 0x86, 0x27, 0x62, 0x1c, 0x1b, 0x8b, 0x11, 0x37, 0x24, 0x36, 
+  0x21, 0x98, 0x95, 0x92, 0xad, 0xf6, 0x2a, 0xbe, 0xbe, 0xb1, 0x8d, 0xdd, 0x5b, 0xd6, 0x13, 0x68, 
+  0xf6, 0x2d, 0x28, 0xf2, 0xf0, 0xd4, 0x34, 0xeb, 0x7f, 0x71, 0xa8, 0x72, 0xa9, 0xf4, 0x76, 0xb6, 
+  0x2c, 0x20, 0x1d, 0x9d, 0x4e, 0xf2, 0xaf, 0xbe, 0x01, 0xfe, 0xd8, 0x17, 0xe4, 0x54, 0x32, 0x8b, 
+  0x53, 0x11, 0xd8, 0x85, 0x60, 0x6f, 0x73, 0x2d, 0xcf, 0x3f, 0xda, 0x45, 0xfb, 0x2a, 0x1f, 0x4e, 
+  0xbb, 0x0d, 0x8b, 0xc9, 0x84, 0xaa, 0x2a, 0x48, 0xa0, 0x54, 0x2a, 0x91, 0xcb, 0x17, 0xf8, 0x61, 
+  0x62, 0x86, 0x81, 0xcb, 0xa3, 0xfc, 0xb5, 0x7f, 0x98, 0xf3, 0xa9, 0x2c, 0x17, 0x67, 0xf3, 0x8c, 
+  0x9f, 0x19, 0xe2, 0x46, 0x34, 0xc9, 0xb7, 0x77, 0x6f, 0xa6, 0x23, 0xd0, 0x8c, 0xaa, 0x94, 0xb3, 
+  0x5a, 0xe3, 0xb2, 0xdf, 0x5f, 0x71, 0x4e, 0x4d, 0xa7, 0x68, 0xf0, 0xd6, 0x20, 0x84, 0x20, 0x96, 
+  0x48, 0xf1, 0xd6, 0xa9, 0xf3, 0xfc, 0xfe, 0x74, 0x90, 0x60, 0xb6, 0x80, 0x5b, 0x11, 0xac, 0xa9, 
+  0x36, 0xf3, 0xa3, 0x5d, 0x5f, 0x61, 0x4b, 0x4f, 0x07, 0x1e, 0xa7, 0x1d, 0x6b, 0x95, 0x19, 0x21, 
+  0x04, 0xb7, 0x29, 0x05, 0x04, 0x34, 0x78, 0x6b, 0x09, 0x34, 0xd7, 0xf3, 0x58, 0x4f, 0x07, 0xff, 
+  0xe8, 0xbb, 0xc4, 0x6f, 0xcf, 0x0d, 0x93, 0x30, 0x0c, 0xfe, 0x74, 0x79, 0x8c, 0x7c, 0xe9, 0x03, 
+  0xbe, 0xb7, 0x77, 0x1b, 0x1d, 0xab, 0x9b, 0x00, 0xf8, 0xf0, 0xe3, 0xcf, 0xbe, 0xbc, 0x01, 0x5a, 
+  0x1f, 0xde, 0x79, 0xe0, 0x7f, 0xea, 0x28, 0x1e, 0xc7, 0x59, 0x65, 0x66, 0x32, 0x9a, 0xe0, 0xdf, 
+  0x67, 0x2f, 0xf1, 0x87, 0xb3, 0x43, 0x5c, 0xce, 0x16, 0xb1, 0x0a, 0xc1, 0x0e, 0xaf, 0x8b, 0x5f, 
+  0xbe, 0xb4, 0x93, 0xcd, 0x3d, 0x9d, 0xd4, 0xba, 0x9d, 0x98, 0x34, 0xed, 0xff, 0xee, 0xc2, 0x42, 
+  0x08, 0x2c, 0x66, 0x13, 0x1e, 0xa7, 0x83, 0xce, 0xd5, 0x3e, 0xba, 0xdd, 0x56, 0x82, 0xd7, 0xc2, 
+  0x44, 0x4b, 0x06, 0x57, 0x13, 0xb3, 0x8c, 0x5e, 0x1d, 0x67, 0x22, 0x1c, 0xe1, 0xd4, 0xc0, 0x30, 
+  0x47, 0xfa, 0x87, 0x08, 0x65, 0x0b, 0x95, 0x6b, 0xdc, 0xad, 0x2a, 0xb4, 0xd9, 0xab, 0x50, 0x04, 
+  0x4c, 0x64, 0x0a, 0x84, 0x0a, 0x25, 0x34, 0x60, 0x97, 0xcf, 0xcd, 0x8f, 0xf7, 0x3d, 0xc5, 0xda, 
+  0x80, 0x1f, 0x93, 0x69, 0x61, 0xd2, 0xe4, 0x5c, 0x87, 0xbc, 0x55, 0xa0, 0x8a, 0x10, 0x28, 0x8a, 
+  0x72, 0xc7, 0x36, 0x3b, 0x9b, 0xc9, 0xf2, 0xc1, 0x85, 0x4f, 0x39, 0xf0, 0x66, 0x1f, 0x97, 0x73, 
+  0x45, 0x54, 0xc0, 0xab, 0xa9, 0x14, 0xa5, 0x24, 0xa5, 0x1b, 0x18, 0xf7, 0x23, 0x95, 0x84, 0x6e, 
+  0x70, 0x3e, 0x99, 0x59, 0xd0, 0x3d, 0x9f, 0xf5, 0xba, 0x78, 0xe5, 0x85, 0x27, 0xe8, 0x6a, 0x5d, 
+  0x35, 0xaf, 0xff, 0x5b, 0x84, 0xf3, 0x85, 0x22, 0xf1, 0x64, 0x9a, 0xeb, 0x13, 0x11, 0x22, 0x89, 
+  0x14, 0x26, 0x55, 0xc5, 0x57, 0xe7, 0xc6, 0xdf, 0xe0, 0xc5, 0x5e, 0x6d, 0xc5, 0x3c, 0xf7, 0x91, 
+  0x02, 0xb0, 0x57, 0x5b, 0xd9, 0xb6, 0xb1, 0x8b, 0x57, 0xd2, 0x59, 0xbe, 0x71, 0xec, 0x1c, 0x6e, 
+  0x45, 0x30, 0x55, 0xd2, 0xef, 0xb9, 0xf3, 0x2e, 0xca, 0x22, 0xe4, 0x75, 0x83, 0x17, 0x36, 0x75, 
+  0xd0, 0xd1, 0xd2, 0xb8, 0x80, 0xb4, 0xae, 0x1b, 0x4c, 0x46, 0xe3, 0xbc, 0x7d, 0xf6, 0x12, 0xaf, 
+  0xf7, 0x0f, 0x33, 0x99, 0x2b, 0x50, 0x92, 0x65, 0x82, 0x26, 0x45, 0xd0, 0xe9, 0xb6, 0xf1, 0xad, 
+  0x27, 0x7b, 0xd9, 0xda, 0xdb, 0x89, 0xcb, 0x61, 0x9b, 0xef, 0xb2, 0x0e, 0x5b, 0x35, 0xed, 0x7e, 
+  0x1f, 0xbb, 0x3c, 0x36, 0xfa, 0x12, 0x19, 0x2c, 0x8b, 0x70, 0x0f, 0x8b, 0xf3, 0x36, 0x12, 0xaa, 
+  0x2c, 0x26, 0x34, 0x4d, 0x43, 0xcc, 0xa5, 0x5c, 0xd7, 0x75, 0xae, 0x84, 0xc2, 0xbc, 0xfa, 0xc6, 
+  0x7b, 0x1c, 0x1d, 0x8d, 0x90, 0x97, 0x12, 0xe3, 0x0b, 0x86, 0x4c, 0x00, 0x13, 0x91, 0x24, 0x17, 
+  0xdf, 0x38, 0xcd, 0xfe, 0xd0, 0x24, 0x2f, 0xef, 0xde, 0x8a, 0xb7, 0xd6, 0x83, 0xa2, 0x94, 0xed, 
+  0x41, 0xae, 0x50, 0x24, 0x53, 0xfa, 0xf2, 0x4e, 0xb9, 0xa8, 0xe2, 0xbc, 0xc3, 0x68, 0x01, 0xeb, 
+  0x6c, 0x66, 0x56, 0xd7, 0xd7, 0x50, 0x6d, 0xad, 0xa2, 0x58, 0x2c, 0x31, 0x12, 0x0a, 0xf3, 0xbb, 
+  0xc3, 0xef, 0x72, 0x34, 0x34, 0x45, 0x5e, 0x42, 0xc2, 0x90, 0x58, 0x85, 0xc0, 0x6f, 0xd6, 0xc8, 
+  0x1b, 0x92, 0xa8, 0x21, 0x31, 0x0b, 0x41, 0xce, 0x90, 0x04, 0xc3, 0xd3, 0x90, 0x4a, 0xd1, 0x58, 
+  0xe7, 0xa2, 0x54, 0x32, 0x18, 0x8f, 0xc4, 0x78, 0xe7, 0xa3, 0x4f, 0x39, 0x74, 0x25, 0x8c, 0x6d, 
+  0x91, 0x66, 0x6d, 0x51, 0x11, 0x77, 0xab, 0x0a, 0xaf, 0x0e, 0x5c, 0x45, 0x53, 0x15, 0x7a, 0xd7, 
+  0x34, 0x53, 0x2c, 0x96, 0x38, 0x72, 0xe6, 0x13, 0x4e, 0x84, 0xe3, 0x14, 0x24, 0xd4, 0xaa, 0x0a, 
+  0x2f, 0x05, 0x56, 0xb0, 0xb9, 0xa3, 0x19, 0x8f, 0xc3, 0xc6, 0x4c, 0x26, 0xc7, 0xc0, 0xc8, 0x38, 
+  0xc7, 0xaf, 0x84, 0x19, 0x2b, 0xea, 0x4c, 0xeb, 0x06, 0xaf, 0x5d, 0x18, 0x61, 0x70, 0x3c, 0xca, 
+  0x43, 0x8d, 0x75, 0x5c, 0x8b, 0xc4, 0x39, 0x74, 0x7d, 0x0a, 0x8f, 0xba, 0xd8, 0x78, 0x2f, 0xd2, 
+  0x8f, 0xdf, 0x42, 0xdc, 0x90, 0xa0, 0x1b, 0x20, 0xc0, 0xac, 0x2a, 0xd8, 0x84, 0xc0, 0xa9, 0x28, 
+  0x7c, 0xad, 0xa3, 0x81, 0xef, 0x3c, 0xb3, 0x85, 0x36, 0x7f, 0x23, 0x66, 0x93, 0x89, 0x92, 0x5e, 
+  0x22, 0x14, 0x9e, 0xe2, 0x6f, 0x27, 0xfa, 0xf9, 0xcb, 0xa5, 0xab, 0xdc, 0x2c, 0xea, 0xc8, 0xb9, 
+  0x22, 0xcf, 0xc9, 0xb2, 0x17, 0xb2, 0x8b, 0xca, 0x6c, 0x71, 0x45, 0x13, 0x90, 0x47, 0x11, 0xa0, 
+  0x2c, 0x34, 0x9f, 0x5d, 0x2e, 0x2b, 0xcf, 0x3d, 0xb6, 0x9e, 0xce, 0x80, 0xbf, 0x6c, 0x6f, 0xa5, 
+  0x81, 0xa2, 0x28, 0x04, 0x9a, 0xea, 0x79, 0x6e, 0xfb, 0x06, 0x06, 0x42, 0x11, 0x6e, 0x46, 0x92, 
+  0x08, 0xc0, 0x2a, 0x04, 0xd6, 0x4a, 0x47, 0x9f, 0x39, 0x28, 0x2c, 0x11, 0xea, 0x1d, 0x56, 0xda, 
+  0x57, 0x35, 0xdc, 0x71, 0xde, 0x90, 0x92, 0x56, 0x7f, 0x3d, 0x5e, 0x47, 0xd5, 0x92, 0xce, 0x9d, 
+  0x4b, 0x46, 0x5c, 0x15, 0x73, 0x03, 0xc3, 0xdd, 0xd2, 0xaa, 0x6a, 0x77, 0x0c, 0x1e, 0x0f, 0x0c, 
+  0xf1, 0x44, 0x36, 0xcf, 0x44, 0x24, 0x76, 0xd7, 0x6b, 0x37, 0xa3, 0xd3, 0xa4, 0x72, 0x85, 0x07, 
+  0x93, 0xf8, 0xe0, 0xf4, 0x2c, 0x6f, 0xf7, 0x07, 0x49, 0x24, 0xd3, 0xf3, 0xd3, 0x8d, 0x94, 0x92, 
+  0x4c, 0x2e, 0xcf, 0x89, 0x73, 0x1f, 0x13, 0x8c, 0xce, 0x2c, 0x29, 0x71, 0x6d, 0xa9, 0x1e, 0x34, 
+  0x55, 0xd2, 0x79, 0xfd, 0xc2, 0x08, 0xf9, 0x62, 0x89, 0x67, 0x36, 0x77, 0x53, 0x5f, 0xeb, 0x21, 
+  0x9e, 0x4a, 0xf3, 0xce, 0x47, 0x9f, 0xf0, 0xf7, 0x81, 0x2b, 0x84, 0x72, 0xc5, 0x25, 0x25, 0x5e, 
+  0xd1, 0x76, 0xf8, 0x20, 0x40, 0x71, 0x5a, 0x2d, 0xcb, 0x8e, 0x74, 0x73, 0x8d, 0x13, 0x65, 0xdb, 
+  0x1a, 0xff, 0xb2, 0x23, 0xde, 0xdd, 0xb4, 0x12, 0xe5, 0xe0, 0xbe, 0x1d, 0x2c, 0xa7, 0xa8, 0x3b, 
+  0xad, 0x16, 0x0e, 0xee, 0xdb, 0x81, 0xb8, 0xf5, 0x63, 0xff, 0xa7, 0x87, 0x4f, 0x32, 0x38, 0x36, 
+  0xc9, 0x8d, 0xe9, 0xd4, 0x03, 0x2b, 0x8f, 0xee, 0xa6, 0x95, 0x1c, 0xdc, 0x57, 0xfe, 0xb1, 0xff, 
+  0x5f, 0x69, 0xb0, 0xe0, 0x80, 0x00, 0x36, 0xb9, 0x82, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 
+  0x44, 0xae, 0x42, 0x60, 0x82, 0x00 };
+static const char CONTENT_WIFI_PNG_ETAG[] PROGMEM = "06db72259e77f25b74b91740648bd39e6982ef5341b3eaa2cf1033b4d4cda2ea";
diff --git a/src/lcd_static/lcd_gui_static_files.h b/src/lcd_static/lcd_gui_static_files.h
index ab0e7b14..d3d90848 100644
--- a/src/lcd_static/lcd_gui_static_files.h
+++ b/src/lcd_static/lcd_gui_static_files.h
@@ -1,3 +1,6 @@
+#include "lcd_gui.access_point_png.h"
+#include "lcd_gui.access_point_connected_png.h"
+#include "lcd_gui.blank_png.h"
 #include "lcd_gui.button_bar_png.h"
 #include "lcd_gui.car_connected_png.h"
 #include "lcd_gui.car_disconnected_png.h"
@@ -6,10 +9,15 @@
 #include "lcd_gui.disabled_png.h"
 #include "lcd_gui.error_png.h"
 #include "lcd_gui.logo_png.h"
+#include "lcd_gui.no_wifi_png.h"
 #include "lcd_gui.not_connected_png.h"
 #include "lcd_gui.sleeping_png.h"
 #include "lcd_gui.start_png.h"
+#include "lcd_gui.wifi_png.h"
 StaticFile lcd_gui_static_files[] = {
+  { "/access_point.png", CONTENT_ACCESS_POINT_PNG, sizeof(CONTENT_ACCESS_POINT_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_ACCESS_POINT_PNG_ETAG, false },
+  { "/access_point_connected.png", CONTENT_ACCESS_POINT_CONNECTED_PNG, sizeof(CONTENT_ACCESS_POINT_CONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_ACCESS_POINT_CONNECTED_PNG_ETAG, false },
+  { "/blank.png", CONTENT_BLANK_PNG, sizeof(CONTENT_BLANK_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_BLANK_PNG_ETAG, false },
   { "/button_bar.png", CONTENT_BUTTON_BAR_PNG, sizeof(CONTENT_BUTTON_BAR_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_BUTTON_BAR_PNG_ETAG, false },
   { "/car_connected.png", CONTENT_CAR_CONNECTED_PNG, sizeof(CONTENT_CAR_CONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_CAR_CONNECTED_PNG_ETAG, false },
   { "/car_disconnected.png", CONTENT_CAR_DISCONNECTED_PNG, sizeof(CONTENT_CAR_DISCONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_CAR_DISCONNECTED_PNG_ETAG, false },
@@ -18,7 +26,9 @@ StaticFile lcd_gui_static_files[] = {
   { "/disabled.png", CONTENT_DISABLED_PNG, sizeof(CONTENT_DISABLED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_DISABLED_PNG_ETAG, false },
   { "/error.png", CONTENT_ERROR_PNG, sizeof(CONTENT_ERROR_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_ERROR_PNG_ETAG, false },
   { "/logo.png", CONTENT_LOGO_PNG, sizeof(CONTENT_LOGO_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_LOGO_PNG_ETAG, false },
+  { "/no_wifi.png", CONTENT_NO_WIFI_PNG, sizeof(CONTENT_NO_WIFI_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_NO_WIFI_PNG_ETAG, false },
   { "/not_connected.png", CONTENT_NOT_CONNECTED_PNG, sizeof(CONTENT_NOT_CONNECTED_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_NOT_CONNECTED_PNG_ETAG, false },
   { "/sleeping.png", CONTENT_SLEEPING_PNG, sizeof(CONTENT_SLEEPING_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_SLEEPING_PNG_ETAG, false },
   { "/start.png", CONTENT_START_PNG, sizeof(CONTENT_START_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_START_PNG_ETAG, false },
+  { "/wifi.png", CONTENT_WIFI_PNG, sizeof(CONTENT_WIFI_PNG) - 1, _CONTENT_TYPE_PNG, CONTENT_WIFI_PNG_ETAG, false },
 };
diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 209a02ca..1038c009 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -18,8 +18,8 @@
 #include "embedded_files.h"
 //#include "fonts/DejaVu_Sans_72.h"
 
-#define TFT_BACKLIGHT_TIMEOUT_MS 600000 // 5 mins
-#define TFT_BACKLIGHT_CHARGING_THRESHOLD 0.1  //stay awake if car is drawing more than this many amps
+//#define TFT_BACKLIGHT_TIMEOUT_MS 600000  //timeout backlight after 10 minutes
+//#define TFT_BACKLIGHT_CHARGING_THRESHOLD 0.1  //stay awake if car is drawing more than this many amps
 
 #define TFT_OPENEVSE_BACK       0x2413
 #define TFT_OPENEVSE_GREEN      0x3E92
@@ -205,8 +205,11 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
 #endif
 
     pinMode(LCD_BACKLIGHT_PIN, OUTPUT);
-    //digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS    
     wakeBacklight();
+#else
+    digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
+#endif //TFT_BACKLIGHT_TIMEOUT_MS 
     _initialise = false;
   }
 
@@ -353,7 +356,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       }
       if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_MONITOR)) {
         snprintf(buffer, sizeof(buffer), "%.0fC", _evse->getTemperature(EVSE_MONITOR_TEMP_MONITOR));
-        render_right_text_box(buffer, WHITE_AREA_X, 230, 45, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
+        render_right_text_box(buffer, WHITE_AREA_X, 228, 45, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       }
       snprintf(buffer, sizeof(buffer), "%.1f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
       get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));
@@ -400,6 +403,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
   _tft.endWrite();
 #endif
 
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
   uint8_t evse_state = _evse->getEvseState();
   bool vehicle_state = _evse->isVehicleConnected();
   if (evse_state != _previous_evse_state || vehicle_state != _previous_vehicle_state) {  //wake backlight on state change
@@ -440,6 +444,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       timeoutBacklight();
     }
   }
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
 
   DBUGVAR(nextUpdate);
   return nextUpdate;
@@ -574,7 +579,9 @@ unsigned long LcdTask::displayNextMessage()
     }
 
     // Display the message
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
     wakeBacklight();
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
     showText(msg->getX(), msg->getY(), msg->getMsg(), msg->getClear());
 
     _nextMessageTime = millis() + msg->getTime();
@@ -631,6 +638,7 @@ String LcdTask::getLine(int line)
   return String(start, len);
 }
 
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
 void LcdTask::wakeBacklight() {
   digitalWrite(LCD_BACKLIGHT_PIN, HIGH);
   _last_backlight_wakeup = millis();
@@ -641,6 +649,7 @@ void LcdTask::timeoutBacklight() {
     digitalWrite(LCD_BACKLIGHT_PIN, LOW);
   }
 }
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
 
 LcdTask lcd;
 
diff --git a/src/lcd_tft.h b/src/lcd_tft.h
index 83b48696..4eba2511 100644
--- a/src/lcd_tft.h
+++ b/src/lcd_tft.h
@@ -95,9 +95,11 @@ class LcdTask : public MicroTasks::Task
     EvseManager *_evse;
     Scheduler *_scheduler;
     ManualOverride *_manual;
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
     long _last_backlight_wakeup = 0;
     uint8_t _previous_evse_state;
     bool _previous_vehicle_state;
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
     bool wifi_client;
     bool wifi_connected;
 
@@ -113,8 +115,10 @@ class LcdTask : public MicroTasks::Task
 
     String getLine(int line);
 
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
     void wakeBacklight();
     void timeoutBacklight();
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
 
   protected:
     void setup();

From 52e6cc005fa51da5991f633079c5e5b4eb5c05d8 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Fri, 27 Sep 2024 21:44:46 +0100
Subject: [PATCH 05/12] Revert accidentally changed file

---
 src/LedManagerTask.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/LedManagerTask.cpp b/src/LedManagerTask.cpp
index 303e7348..9003fb95 100644
--- a/src/LedManagerTask.cpp
+++ b/src/LedManagerTask.cpp
@@ -190,18 +190,11 @@ void LedManagerTask::setup()
 #elif defined(NEO_PIXEL_PIN) && defined(NEO_PIXEL_LENGTH) && defined(ENABLE_WS2812FX)
   DEBUG.printf("Initialising NeoPixels WS2812FX MODE...\n");
   ws2812fx.init();
-  //ws2812fx.setBrightness(brightness);
+  ws2812fx.setBrightness(brightness);
   ws2812fx.setSpeed(DEFAULT_FX_SPEED);
   ws2812fx.setColor(BLACK);
   ws2812fx.setMode(FX_MODE_STATIC);
   //ws2812fx.setBrightness(this->brightness);
-  if (this->brightness == 0){
-    ws2812fx.setBrightness(255);
-  }
-  else {
-    ws2812fx.setBrightness(this->brightness-1);
-  }
-
   DBUGF("Brightness: %d ", this->brightness);
   DBUGF("Brightness: %d ", brightness);
 

From 06f6ce7bb0689e3b80f340043a73e5454eb0724f Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Fri, 27 Sep 2024 22:16:57 +0100
Subject: [PATCH 06/12] Add missing break statement, make charging threshold
 optional

---
 src/lcd_tft.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 1038c009..54872a25 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -163,6 +163,11 @@ void LcdTask::display(const char *msg, int x, int y, int time, uint32_t flags)
 
 void LcdTask::setWifiMode(bool client, bool connected)
 {
+#ifdef TFT_BACKLIGHT_TIMEOUT_MS
+  if (client != wifi_client || connected != wifi_connected) {
+    wakeBacklight();
+  }
+#endif //TFT_BACKLIGHT_TIMEOUT_MS
   wifi_client = client;
   wifi_connected = connected;
 }
@@ -432,9 +437,14 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
               timeout = true;
               break;
             case OPENEVSE_STATE_CHARGING:
+#ifdef TFT_BACKLIGHT_CHARGING_THRESHOLD
               if (_evse->getAmps() >= TFT_BACKLIGHT_CHARGING_THRESHOLD) {
                 timeout = false;
               }
+#else
+              timeout = false;
+#endif //TFT_BACKLIGHT_CHARGING_THRESHOLD
+              break;
             default:
               timeout = true;
               break;

From 93e599e9081873697d2888295779e2aec8fdd979 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Sat, 28 Sep 2024 10:53:52 +0100
Subject: [PATCH 07/12] Fix non-TFT build

---
 src/net_manager.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/net_manager.cpp b/src/net_manager.cpp
index e7f87df0..4f387529 100644
--- a/src/net_manager.cpp
+++ b/src/net_manager.cpp
@@ -135,8 +135,9 @@ void NetManagerTask::wifiStartAccessPoint()
   _lcd.display(String(F("Pass: ")) + _softAP_password, 0, 1, 15 * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, false);
+#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(false, false);
-
+#endif //ENABLE_SCREEN_LCD_TFT
   _apClients = 0;
   _state = NetState::AccessPointConnecting;
 }
@@ -156,7 +157,9 @@ void NetManagerTask::wifiStartClient()
   wifiClientConnect();
 
   _led.setWifiMode(true, false);
+#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(true, false);
+#endif //ENABLE_SCREEN_LCD_TFT
   _state = NetState::StationClientConnecting;
 }
 
@@ -208,7 +211,9 @@ void NetManagerTask::haveNetworkConnection(IPAddress myAddress)
   Mongoose.ipConfigChanged();
 
   _led.setWifiMode(true, true);
+#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(true, true);
+#endif ENABLE_SCREEN_LCD_TFT
   _time.setHost(sntp_hostname.c_str());
 
   _apAutoApStopTime = millis() + ACCESS_POINT_AUTO_STOP_TIMEOUT;
@@ -285,8 +290,9 @@ void NetManagerTask::wifiOnAPModeStationConnected(const WiFiEventSoftAPModeStati
   _lcd.display(_ipaddress, 0, 1, (0 == _apClients ? 15 : 5) * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, true);
+#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(false, true);
-
+#endif //ENABLE_SCREEN_LCD_TFT
   _apClients++;
 }
 
@@ -296,7 +302,9 @@ void NetManagerTask::wifiOnAPModeStationDisconnected(const WiFiEventSoftAPModeSt
 
   if(0 == _apClients && NetState::AccessPointConnecting == _state) {
     _led.setWifiMode(false, false);
+#ifdef ENABLE_SCREEN_LCD_TFT
     _lcd.setWifiMode(false, false);
+#endif ENABLE_SCREEN_LCD_TFT
   }
 }
 

From f1a541b8ae83f822e5bd89a8f4097601c7b5e7c3 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Sun, 29 Sep 2024 13:38:28 +0100
Subject: [PATCH 08/12] Fix power display refresh

---
 src/lcd_tft.cpp     | 12 +++++++++++-
 src/lcd_tft.h       |  1 +
 src/net_manager.cpp |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 54872a25..659d4ace 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -365,7 +365,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       }
       snprintf(buffer, sizeof(buffer), "%.1f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
       get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));
-      render_info_box(buffer2, buffer, 66, 175, INFO_BOX_WIDTH, INFO_BOX_HEIGHT, _full_update);
+      render_data_box(buffer2, buffer, 66, 175, INFO_BOX_WIDTH, INFO_BOX_HEIGHT, _full_update);
 
       String line = getLine(0);
       if(line.length() == 0) {
@@ -481,6 +481,16 @@ void LcdTask::get_scaled_number_value(double value, int precision, const char *u
   snprintf(buffer, size, "%.*f %s%s", precision, value, mod[index], unit);
 }
 
+void LcdTask::render_data_box(const char *title, const char *text, int16_t x, int16_t y, int16_t width, int16_t height, bool full_update)
+{
+  if(full_update)
+  {
+    _screen.fillSmoothRoundRect(x, y, width, height, 6, TFT_OPENEVSE_INFO_BACK, TFT_WHITE);
+  }
+  render_centered_text_box(title, x, y+24, width, &FreeSans9pt7b, TFT_WHITE, TFT_OPENEVSE_INFO_BACK, !full_update);
+  render_centered_text_box(text, x, y+(height-4), width, &FreeSans9pt7b, TFT_WHITE, TFT_OPENEVSE_INFO_BACK, !full_update);
+}
+
 void LcdTask::render_info_box(const char *title, const char *text, int16_t x, int16_t y, int16_t width, int16_t height, bool full_update)
 {
   if(full_update)
diff --git a/src/lcd_tft.h b/src/lcd_tft.h
index 4eba2511..bad21416 100644
--- a/src/lcd_tft.h
+++ b/src/lcd_tft.h
@@ -129,6 +129,7 @@ class LcdTask : public MicroTasks::Task
     void render_centered_text_box(const char *text, int16_t x, int16_t y, int16_t width, const GFXfont *font, uint16_t text_colour, uint16_t back_colour, bool fill_back, uint8_t size = 1);
     void render_right_text_box(const char *text, int16_t x, int16_t y, int16_t width, const GFXfont *font, uint16_t text_colour, uint16_t back_colour, bool fill_back, uint8_t size = 1);
     void render_left_text_box(const char *text, int16_t x, int16_t y, int16_t width, const GFXfont *font, uint16_t text_colour, uint16_t back_colour, bool fill_back, uint8_t size = 1);
+    void render_data_box(const char *title, const char *text, int16_t x, int16_t y, int16_t width, int16_t height, bool full_update = true);
     void render_info_box(const char *title, const char *text, int16_t x, int16_t y, int16_t width, int16_t height, bool full_update = true);
     void load_font(const char *filename);
 
diff --git a/src/net_manager.cpp b/src/net_manager.cpp
index 4f387529..c93e05ea 100644
--- a/src/net_manager.cpp
+++ b/src/net_manager.cpp
@@ -213,7 +213,7 @@ void NetManagerTask::haveNetworkConnection(IPAddress myAddress)
   _led.setWifiMode(true, true);
 #ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(true, true);
-#endif ENABLE_SCREEN_LCD_TFT
+#endif //ENABLE_SCREEN_LCD_TFT
   _time.setHost(sntp_hostname.c_str());
 
   _apAutoApStopTime = millis() + ACCESS_POINT_AUTO_STOP_TIMEOUT;
@@ -304,7 +304,7 @@ void NetManagerTask::wifiOnAPModeStationDisconnected(const WiFiEventSoftAPModeSt
     _led.setWifiMode(false, false);
 #ifdef ENABLE_SCREEN_LCD_TFT
     _lcd.setWifiMode(false, false);
-#endif ENABLE_SCREEN_LCD_TFT
+#endif //ENABLE_SCREEN_LCD_TFT
   }
 }
 

From 0202369f0daff4aab0dac4b71a725703676d8548 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Tue, 1 Oct 2024 18:17:48 +0100
Subject: [PATCH 09/12] Reset backlight timer when charging

---
 src/lcd_tft.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 659d4ace..6beaa420 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -439,6 +439,9 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
             case OPENEVSE_STATE_CHARGING:
 #ifdef TFT_BACKLIGHT_CHARGING_THRESHOLD
               if (_evse->getAmps() >= TFT_BACKLIGHT_CHARGING_THRESHOLD) {
+                //Reset the timer here, so we don't timeout as soon as charging stops.
+                //This will also wake the backlight if the vehicle starts drawing current again.
+                wakeBacklight();  
                 timeout = false;
               }
 #else

From 202c4d1b7b48f8d93f5faf2b840eae9e1ce825ef Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Sat, 5 Oct 2024 20:10:45 +0100
Subject: [PATCH 10/12] Add RSSI/connected stations display

---
 src/lcd_tft.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index 6beaa420..dd1e6f88 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -8,6 +8,7 @@
 #define LCD_BACKLIGHT_PIN TFT_BL
 #endif
 
+#include <WiFi.h>
 #include "emonesp.h"
 #include "lcd.h"
 #include "RapiSender.h"
@@ -335,33 +336,37 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
           break;
       }
 
+      char buffer[32];
+      char buffer2[10];
+
       if (wifi_client) {
         if (wifi_connected) {
           wifi_icon = "/wifi.png";
         }
+        snprintf(buffer, sizeof(buffer), "%ddB", WiFi.RSSI());
+        render_right_text_box(buffer, WHITE_AREA_X, 200, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       } else {
         if (wifi_connected) {
           wifi_icon = "/access_point_connected.png";
         } else {
           wifi_icon = "/access_point.png";
         }
+        snprintf(buffer, sizeof(buffer), "%d", WiFi.softAPgetStationNum());
+        render_right_text_box(buffer, WHITE_AREA_X, 200, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       }
     
       render_image(status_icon.c_str(), 16, 52);
       render_image(car_icon.c_str(), 16, 92);
       render_image(wifi_icon.c_str(), 16, 132);
 
-      char buffer[32];
-      char buffer2[10];
-
       snprintf(buffer, sizeof(buffer), "%d", _evse->getChargeCurrent());
       render_right_text_box(buffer, 66, 175, 154, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, !_full_update, 2);
       if(_full_update) {
         render_left_text_box("A", 224, 165, 34, &FreeSans24pt7b, TFT_BLACK, TFT_WHITE, false, 1);
       }
       if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_MONITOR)) {
-        snprintf(buffer, sizeof(buffer), "%.0fC", _evse->getTemperature(EVSE_MONITOR_TEMP_MONITOR));
-        render_right_text_box(buffer, WHITE_AREA_X, 228, 45, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
+        snprintf(buffer, sizeof(buffer), "%.1fC", _evse->getTemperature(EVSE_MONITOR_TEMP_MONITOR));
+        render_right_text_box(buffer, WHITE_AREA_X, 228, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       }
       snprintf(buffer, sizeof(buffer), "%.1f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
       get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));

From bde446abc55adc6d4828530a9d5e1388693b9ccf Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Sat, 5 Oct 2024 21:21:13 +0100
Subject: [PATCH 11/12] Move clock / RSSI / temp to top of screen

Makes better use of these unused pixels.
Display time with seconds, refresh display on the second.
---
 src/lcd_tft.cpp | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/lcd_tft.cpp b/src/lcd_tft.cpp
index dd1e6f88..b722b52d 100644
--- a/src/lcd_tft.cpp
+++ b/src/lcd_tft.cpp
@@ -336,24 +336,23 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
           break;
       }
 
-      char buffer[32];
+      char buffer[32] = "";
       char buffer2[10];
 
       if (wifi_client) {
         if (wifi_connected) {
           wifi_icon = "/wifi.png";
+          snprintf(buffer, sizeof(buffer), "%ddB", WiFi.RSSI());
         }
-        snprintf(buffer, sizeof(buffer), "%ddB", WiFi.RSSI());
-        render_right_text_box(buffer, WHITE_AREA_X, 200, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       } else {
         if (wifi_connected) {
           wifi_icon = "/access_point_connected.png";
+          snprintf(buffer, sizeof(buffer), "%d", WiFi.softAPgetStationNum());
         } else {
           wifi_icon = "/access_point.png";
         }
-        snprintf(buffer, sizeof(buffer), "%d", WiFi.softAPgetStationNum());
-        render_right_text_box(buffer, WHITE_AREA_X, 200, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
       }
+      render_right_text_box(buffer, 350, 30, 50, &FreeSans9pt7b, TFT_WHITE, TFT_OPENEVSE_BACK, false, 1);
     
       render_image(status_icon.c_str(), 16, 52);
       render_image(car_icon.c_str(), 16, 92);
@@ -366,7 +365,7 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       }
       if (_evse->isTemperatureValid(EVSE_MONITOR_TEMP_MONITOR)) {
         snprintf(buffer, sizeof(buffer), "%.1fC", _evse->getTemperature(EVSE_MONITOR_TEMP_MONITOR));
-        render_right_text_box(buffer, WHITE_AREA_X, 228, 51, &FreeSans9pt7b, TFT_BLACK, TFT_WHITE, _full_update, 1);
+        render_right_text_box(buffer, 415, 30, 50, &FreeSans9pt7b, TFT_WHITE, TFT_OPENEVSE_BACK, false, 1);
       }
       snprintf(buffer, sizeof(buffer), "%.1f V  %.2f A", _evse->getVoltage(), _evse->getAmps());
       get_scaled_number_value(_evse->getPower(), 2, "W", buffer2, sizeof(buffer2));
@@ -379,15 +378,6 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       render_centered_text_box(line.c_str(), INFO_BOX_X, 74, INFO_BOX_WIDTH, &FreeSans9pt7b, TFT_OPENEVSE_TEXT, TFT_WHITE, !_full_update);
 
       line = getLine(1);
-      if(line.length() == 0)
-      {
-        timeval local_time;
-        gettimeofday(&local_time, NULL);
-        struct tm timeinfo;
-        localtime_r(&local_time.tv_sec, &timeinfo);
-        strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M", &timeinfo);
-        line = buffer;
-      }
       render_centered_text_box(line.c_str(), INFO_BOX_X, 96, INFO_BOX_WIDTH, &FreeSans9pt7b, TFT_OPENEVSE_TEXT, TFT_WHITE, !_full_update);
 
       uint32_t elapsed = _evse->getSessionElapsed();
@@ -400,7 +390,16 @@ unsigned long LcdTask::loop(MicroTasks::WakeReason reason)
       get_scaled_number_value(_evse->getSessionEnergy(), 0, "Wh", buffer, sizeof(buffer));
       render_info_box("DELIVERED", buffer, INFO_BOX_X, 175, INFO_BOX_WIDTH, INFO_BOX_HEIGHT, _full_update);
 
-      nextUpdate = 1000;
+      timeval local_time;
+      gettimeofday(&local_time, NULL);
+      struct tm timeinfo;
+      localtime_r(&local_time.tv_sec, &timeinfo);
+      strftime(buffer, sizeof(buffer), "%Y-%m-%d  %H:%M:%S", &timeinfo);
+      render_left_text_box(buffer, 12, 30, 175, &FreeSans9pt7b, TFT_WHITE, TFT_OPENEVSE_BACK, false, 1);
+
+      //sleep until next whole second so clock doesn't skip
+      gettimeofday(&local_time, NULL);
+      nextUpdate = 1000 - local_time.tv_usec/1000;
       _full_update = false;
     } break;
 

From 4054d7ff1ccfcb5771ee36cfbc98feebef42de45 Mon Sep 17 00:00:00 2001
From: kimble4 <kim@ductilebiscuit.net>
Date: Tue, 8 Oct 2024 21:56:23 +0100
Subject: [PATCH 12/12] Empty method for non-TFT LCD

---
 src/lcd.cpp         |  5 +++++
 src/lcd.h           |  3 +++
 src/net_manager.cpp | 10 ----------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/lcd.cpp b/src/lcd.cpp
index 4374ab9a..bb7e93e7 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -735,6 +735,11 @@ void LcdTask::onButton(int long_press)
   }
 }
 
+void LcdTask::setWifiMode(bool client, bool connected)
+{
+//only used by the TFT display
+}
+
 LcdTask lcd;
 
 #endif // ENABLE_SCREEN_LCD_TFT
diff --git a/src/lcd.h b/src/lcd.h
index dc6819ef..a9246ec2 100644
--- a/src/lcd.h
+++ b/src/lcd.h
@@ -129,6 +129,7 @@ class LcdTask : public MicroTasks::Task
     void setInfoLine(LcdInfoLine info);
 
     void onButton(int event);
+    
 
     LcdInfoLine getNextInfoLine(LcdInfoLine info);
 
@@ -154,6 +155,8 @@ class LcdTask : public MicroTasks::Task
     void display(const __FlashStringHelper *msg, int x, int y, int time, uint32_t flags);
     void display(String &msg, int x, int y, int time, uint32_t flags);
     void display(const char *msg, int x, int y, int time, uint32_t flags);
+    
+    void setWifiMode(bool client, bool connected);
 };
 
 #endif // ENABLE_SCREEN_LCD_TFT
diff --git a/src/net_manager.cpp b/src/net_manager.cpp
index c93e05ea..68a41284 100644
--- a/src/net_manager.cpp
+++ b/src/net_manager.cpp
@@ -135,9 +135,7 @@ void NetManagerTask::wifiStartAccessPoint()
   _lcd.display(String(F("Pass: ")) + _softAP_password, 0, 1, 15 * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, false);
-#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(false, false);
-#endif //ENABLE_SCREEN_LCD_TFT
   _apClients = 0;
   _state = NetState::AccessPointConnecting;
 }
@@ -157,9 +155,7 @@ void NetManagerTask::wifiStartClient()
   wifiClientConnect();
 
   _led.setWifiMode(true, false);
-#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(true, false);
-#endif //ENABLE_SCREEN_LCD_TFT
   _state = NetState::StationClientConnecting;
 }
 
@@ -211,9 +207,7 @@ void NetManagerTask::haveNetworkConnection(IPAddress myAddress)
   Mongoose.ipConfigChanged();
 
   _led.setWifiMode(true, true);
-#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(true, true);
-#endif //ENABLE_SCREEN_LCD_TFT
   _time.setHost(sntp_hostname.c_str());
 
   _apAutoApStopTime = millis() + ACCESS_POINT_AUTO_STOP_TIMEOUT;
@@ -290,9 +284,7 @@ void NetManagerTask::wifiOnAPModeStationConnected(const WiFiEventSoftAPModeStati
   _lcd.display(_ipaddress, 0, 1, (0 == _apClients ? 15 : 5) * 1000, LCD_CLEAR_LINE);
 
   _led.setWifiMode(false, true);
-#ifdef ENABLE_SCREEN_LCD_TFT
   _lcd.setWifiMode(false, true);
-#endif //ENABLE_SCREEN_LCD_TFT
   _apClients++;
 }
 
@@ -302,9 +294,7 @@ void NetManagerTask::wifiOnAPModeStationDisconnected(const WiFiEventSoftAPModeSt
 
   if(0 == _apClients && NetState::AccessPointConnecting == _state) {
     _led.setWifiMode(false, false);
-#ifdef ENABLE_SCREEN_LCD_TFT
     _lcd.setWifiMode(false, false);
-#endif //ENABLE_SCREEN_LCD_TFT
   }
 }