Merge pull request #111 from OpenEVSE/disable_to_pause

Use the disable state to pause charge

Author: glynhudson

gui

@@ -129,6 +129,7 @@ ConfigOpt *opts[] =
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_SNTP, CONFIG_SERVICE_SNTP, "sntp_enabled", "se"),
   new ConfigOptVirtualBool(flagsOpt,CONFIG_SERVICE_TESLA,CONFIG_SERVICE_TESLA, "tesla_enabled", "te"),
   new ConfigOptVirtualBool(flagsOpt, CONFIG_SERVICE_DIVERT, CONFIG_SERVICE_DIVERT, "divert_enabled", "de"),
+  new ConfigOptVirtualBool(flagsOpt, CONFIG_PAUSE_USES_DISABLED, CONFIG_PAUSE_USES_DISABLED, "pause_uses_disabled", "pd"),
   new ConfigOptVirtualMqttProtocol(flagsOpt, "mqtt_protocol", "mprt"),
   new ConfigOptVirtualChargeMode(flagsOpt, "charge_mode", "chmd")
 };

src/app_config.cpp

@@ -53,15 +53,16 @@ extern uint32_t divert_min_charge_time;
 // 24-bits of Flags
 extern uint32_t flags;
 
-#define CONFIG_SERVICE_EMONCMS  (1 << 0)
-#define CONFIG_SERVICE_MQTT     (1 << 1)
-#define CONFIG_SERVICE_OHM      (1 << 2)
-#define CONFIG_SERVICE_SNTP     (1 << 3)
-#define CONFIG_MQTT_PROTOCOL    (7 << 4) // Maybe leave a bit of space after for additional protocols
-#define CONFIG_MQTT_ALLOW_ANY_CERT (1 << 7)
-#define CONFIG_SERVICE_TESLA    (1 << 8)
-#define CONFIG_SERVICE_DIVERT   (1 << 9)
-#define CONFIG_CHARGE_MODE      (7 << 10) // 3 bits for mode
+#define CONFIG_SERVICE_EMONCMS      (1 << 0)
+#define CONFIG_SERVICE_MQTT         (1 << 1)
+#define CONFIG_SERVICE_OHM          (1 << 2)
+#define CONFIG_SERVICE_SNTP         (1 << 3)
+#define CONFIG_MQTT_PROTOCOL        (7 << 4) // Maybe leave a bit of space after for additional protocols
+#define CONFIG_MQTT_ALLOW_ANY_CERT  (1 << 7)
+#define CONFIG_SERVICE_TESLA        (1 << 8)
+#define CONFIG_SERVICE_DIVERT       (1 << 9)
+#define CONFIG_CHARGE_MODE          (7 << 10) // 3 bits for mode
+#define CONFIG_PAUSE_USES_DISABLED   (1 << 13)
 
 inline bool config_emoncms_enabled() {
   return CONFIG_SERVICE_EMONCMS == (flags & CONFIG_SERVICE_EMONCMS);
@@ -99,6 +100,10 @@ inline uint8_t config_charge_mode() {
   return (flags & CONFIG_CHARGE_MODE) >> 10;
 }
 
+inline bool config_pause_uses_disabled() {
+  return CONFIG_PAUSE_USES_DISABLED == (flags & CONFIG_PAUSE_USES_DISABLED);
+}
+
 // Ohm Connect Settings
 extern String ohm;
 

src/app_config.h

@@ -87,7 +87,7 @@ void divertmode_update(byte newmode)
         }
         if(OPENEVSE_STATE_SLEEPING != state)
         {
-          if(0 == rapiSender.sendCmdSync(F("$FS")))
+          if(0 == rapiSender.sendCmdSync(config_pause_uses_disabled() ? F("$FD") : F("$FS"))) 
           {
             DBUGLN(F("Divert activated, entered sleep mode"));
             divert_active = false;
@@ -264,7 +264,7 @@ void divert_update_state()
       {
         if(divert_active && divertmode_get_time() >= min_charge_end) 
         {
-          if(0 == rapiSender.sendCmdSync(F("$FS"))) 
+          if(0 == rapiSender.sendCmdSync(config_pause_uses_disabled() ? F("$FD") : F("$FS"))) 
           {
             DBUGLN(F("Charge Stopped"));
             event["divert_active"] = divert_active = false;

src/divert.cpp

@@ -92,15 +92,6 @@ Content-Type: application/json
 POST {{baseUrl}}/config HTTP/1.1
 Content-Type: application/json
 
-{
-  "emoncms_enabled": false
-}
-
-###
-
-POST {{baseUrl}}/config HTTP/1.1
-Content-Type: application/json
-
 {
   "mqtt_enabled": true,
   "mqtt_protocol": "mqtt",
@@ -144,6 +135,24 @@ Content-Type: application/json
 
 ###
 
+POST {{baseUrl}}/config HTTP/1.1
+Content-Type: application/json
+
+{
+  "pause_uses_disabled": true
+}
+
+###
+
+POST {{baseUrl}}/config HTTP/1.1
+Content-Type: application/json
+
+{
+  "pause_uses_disabled": false
+}
+
+###
+
 GET {{baseUrl}}/home.js HTTP/1.1
 
 ###