Trigger an event when the charge session is complete

Author: jeremypoulter

src/evse_monitor.cpp

@@ -70,6 +70,9 @@
         EVSE_MONITOR_ENERGY_BOOT_READY \
 )
 
+#define EVSE_MONITOR_SESSION_COMPLETE_MASK      OPENEVSE_VFLAG_EV_CONNECTED
+#define EVSE_MONITOR_SESSION_COMPLETE_TRIGGER   0
+
 EvseMonitor::EvseStateEvent::EvseStateEvent() :
   MicroTasks::Event(),
   _evse_state(OPENEVSE_STATE_STARTING)
@@ -101,14 +104,42 @@ EvseMonitor::DataReady::DataReady(uint32_t ready) :
 {
 }
 
-void EvseMonitor::DataReady::ready(uint32_t data)
+bool EvseMonitor::DataReady::ready(uint32_t data)
 {
   _state |= data;
   if(_ready == (_state & _ready))
   {
     Trigger();
     _state = 0;
+    return true;
+  }
+
+  return false;
+}
+
+EvseMonitor::StateChangeEvent::StateChangeEvent(uint32_t mask, uint32_t trigger) :
+  MicroTasks::Event(),
+  _state(0),
+  _mask(mask),
+  _trigger(trigger)
+{
+}
+
+bool EvseMonitor::StateChangeEvent::update(uint32_t data)
+{
+  // Only interested in the mask bits changing
+  data &= _mask;
+  if(_state != data)
+  {
+    _state = data;
+    if(_trigger == _state)
+    {
+      Trigger();
+      return true;
+    }
   }
+
+  return false;
 }
 
 EvseMonitor::EvseMonitor(OpenEVSEClass &openevse) :
@@ -131,6 +162,7 @@ EvseMonitor::EvseMonitor(OpenEVSEClass &openevse) :
   _max_hardware_current(0),
   _data_ready(EVSE_MONITOR_DATA_READY),
   _boot_ready(EVSE_MONITOR_BOOT_READY),
+  _session_complete(EVSE_MONITOR_SESSION_COMPLETE_MASK, EVSE_MONITOR_SESSION_COMPLETE_TRIGGER),
   _count(0),
   _heartbeat(false)
 #ifdef ENABLE_MCP9808
@@ -226,6 +258,7 @@ void EvseMonitor::evseStateChanged()
   if(!isCharging()) {
     _amp = 0;
   }
+  _session_complete.update(getFlags());
 }
 
 unsigned long EvseMonitor::loop(MicroTasks::WakeReason reason)

src/evse_monitor.h

@@ -68,7 +68,19 @@ class EvseMonitor : public MicroTasks::Task
       public:
         DataReady(uint32_t ready);
 
-        void ready(uint32_t data);
+        bool ready(uint32_t data);
+    };
+
+    class StateChangeEvent : public MicroTasks::Event
+    {
+      private:
+        uint32_t _state;
+        uint32_t _mask;
+        uint32_t _trigger;
+      public:
+        StateChangeEvent(uint32_t mask, uint32_t trigger);
+
+        bool update(uint32_t state);
     };
 
     class Tempurature
@@ -127,6 +139,7 @@ class EvseMonitor : public MicroTasks::Task
 
     DataReady _data_ready;
     DataReady _boot_ready;
+    StateChangeEvent _session_complete;
 
     uint32_t _count;
     bool _heartbeat;
@@ -280,6 +293,9 @@ class EvseMonitor : public MicroTasks::Task
     void onBootReady(MicroTasks::EventListener *listner) {
       _boot_ready.Register(listner);
     }
+    void onSessionComplete(MicroTasks::EventListener *listner) {
+      _session_complete.Register(listner);
+    }
 };
 
 #endif // _OPENEVSE_EVSE_MONITOR_H