Event when the schedule (plan) changes

This is to allow clients to know when the schedule or schedule plan has updated and fetch a fresh copy

Author: jeremypoulter

src/scheduler.cpp

@@ -7,6 +7,7 @@
 #include "time_man.h"
 #include "emonesp.h"
 #include "app_config.h"
+#include "event.h"
 
 #include <algorithm>
 #include <vector>
@@ -159,7 +160,9 @@ Scheduler::Scheduler(EvseManager &evse) :
   _firstEvent(),
   _activeEvent(),
   _loading(false),
-  _timeChangeListener(this)
+  _timeChangeListener(this),
+  _version(0),
+  _plan_version(0)
 {
 
 }
@@ -224,6 +227,10 @@ unsigned long Scheduler::loop(MicroTasks::WakeReason reason)
     }
 
     _activeEvent = currentEvent;
+
+    StaticJsonDocument<128> doc;
+    doc["schedule_plan_version"] = ++_plan_version;
+    event_send(doc);
   }
 
   int currentDay;
@@ -349,6 +356,10 @@ void Scheduler::buildSchedule()
     #endif // ENABLE_DEBUG
   }
 
+  StaticJsonDocument<128> doc;
+  doc["schedule_version"] = ++_version;
+  event_send(doc);
+
   // wake the main task to see if we actually need to do something
   MicroTask.wakeTask(this);
 }
@@ -802,6 +813,10 @@ bool Scheduler::serializePlan(DynamicJsonDocument &doc)
     e = &e->getNext();
     object = root.createNestedObject("next_event");
     serializeEventInstance(object, e, true);
+  } else {
+    root["next_event_delay"] = false;
+    root["current_event"] = false;
+    root["next_event"] = false;
   }
 
   e = &_firstEvent;

src/scheduler.h

@@ -232,6 +232,9 @@ class Scheduler : public MicroTasks::Task
 
     MicroTasks::EventListener _timeChangeListener;
 
+    uint32_t _version;
+    uint32_t _plan_version;
+
     void buildSchedule();
     bool commit();
     EventInstance &getCurrentEvent();
@@ -283,6 +286,13 @@ class Scheduler : public MicroTasks::Task
 
     void notifyConfigChanged();
 
+    uint32_t getVersion() {
+      return _version;
+    };
+    uint32_t getPlanVersion() {
+      return _plan_version;
+    };
+
     static void getCurrentTime(int &day, int32_t &offset);
 };
 

src/web_server.cpp

@@ -624,7 +624,9 @@ handleStatus(MongooseHttpServerRequest *request) {
   doc["time"] = String(time);
   doc["offset"] = String(offset);
 
-  doc["config_version"] = String(config_version);
+  doc["config_version"] = config_version;
+  doc["schedule_version"] = scheduler.getVersion();
+  doc["schedule_plan_version"] = scheduler.getPlanVersion();
 
   doc["vehicle_state_update"] = (millis() - evse.getVehicleLastUpdated()) / 1000;
   if(teslaClient.getVehicleCnt() > 0) {