added isBootLocked() using ECVF_BOOT_LOCK vflag

OpenEVSE · May 11, 2023 · 1c400ae · 1c400ae
1 parent 4aed330
commit 1c400ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/evse_man.h b/src/evse_man.h
@@ -297,6 +297,9 @@ class EvseManager : public MicroTasks::Task
     bool isVehicleConnected() {
       return _monitor.isVehicleConnected();
     }
+    bool isBootLocked() {
+      return _monitor.isBootLocked();
+    }
     bool isError() {
       return _monitor.isError();
     }

diff --git a/src/evse_monitor.h b/src/evse_monitor.h
@@ -60,6 +60,9 @@ class EvseMonitor : public MicroTasks::Task
         bool isVehicleConnected() {
           return OPENEVSE_VFLAG_EV_CONNECTED == (getFlags() & OPENEVSE_VFLAG_EV_CONNECTED);
         }
+        bool isBootLocked() {
+          return OPENEVSE_VFLAG_BOOT_LOCK == (getFlags() & OPENEVSE_VFLAG_BOOT_LOCK);
+        }
     };
 
     class DataReady : public MicroTasks::Event
@@ -232,6 +235,9 @@ class EvseMonitor : public MicroTasks::Task
     bool isVehicleConnected() {
       return _state.isVehicleConnected();
     }
+    bool isBootLocked() {
+      return _state.isBootLocked();
+    }
     double getAmps() {
       return _amp;
     }

diff --git a/src/main.cpp b/src/main.cpp
@@ -201,15 +201,9 @@ loop() {
         import_timers(&scheduler);
 
         // unlock openevse fw compiled with BOOTLOCK
-        static bool bootlocked = true;
-        if (bootlocked) {
-          DBUGLN("BOOTLOCK: get evse state:");
-          DBUGVAR(evse.getState());
-          if (evse.getState() != EvseState::None) {
-            evse.unlock();
-            DBUGLN("Unlock BOOTLOCK");
-            bootlocked = false;
-          }
+        if (evse.isBootLocked()) {
+          evse.unlock();
+          DBUGLN("Unlocked BOOTLOCK");
         }
       }