Changed the scheduler and divert to disable at the lowest priority to allow each other to override the disable as needed.

Author: jeremypoulter

src/divert.cpp

@@ -91,7 +91,7 @@ void divertmode_update(byte newmode)
         event["smoothed_available_current"] = smoothed_available_current = 0;
 
         EvseProperties props(EvseState::Disabled);
-        evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Divert, props);
+        evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Default, props);
       } break;
 
       default:
@@ -207,7 +207,7 @@ void divert_update_state()
         if(divert_active && divertmode_get_time() >= min_charge_end)
         {
           EvseProperties props(EvseState::Disabled);
-          evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Divert, props);
+          evse.claim(EvseClient_OpenEVSE_Divert, EvseManager_Priority_Default, props);
 
           if(previousState != evse.getState())
           {

src/scheduler.cpp

@@ -204,7 +204,9 @@ unsigned long Scheduler::loop(MicroTasks::WakeReason reason)
       DBUGF("Starting %s claim",
         currentEvent.getState().toString());
       EvseProperties properties(currentEvent.getState());
-      _evse->claim(EvseClient_OpenEVSE_Schedule, EvseManager_Priority_Timer, properties);
+      _evse->claim(EvseClient_OpenEVSE_Schedule,
+        EvseState::Active == currentEvent.getState() ? EvseManager_Priority_Timer : EvseManager_Priority_Default,
+        properties);
     } else {
       // No scheduled events, release any claims
       DBUGLN("releasing claims");