Refactor Domoticz Commands

Refactor Domoticz Commands

sonoff/xdrv_07_domoticz.ino

@@ -23,8 +23,11 @@
 
 const char DOMOTICZ_MESSAGE[] PROGMEM = "{\"idx\":%d,\"nvalue\":%d,\"svalue\":\"%s\",\"Battery\":%d,\"RSSI\":%d}";
 
-enum DomoticzCommands { CMND_IDX, CMND_KEYIDX, CMND_SWITCHIDX, CMND_SENSORIDX, CMND_UPDATETIMER };
+const char kDomoticzCommands[] PROGMEM =
-const char kDomoticzCommands[] PROGMEM = D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
+  D_CMND_IDX "|" D_CMND_KEYIDX "|" D_CMND_SWITCHIDX "|" D_CMND_SENSORIDX "|" D_CMND_UPDATETIMER ;
+
+void (* const DomoticzCommand[])(void) PROGMEM = {
+  &CmndDomoticzIdx, &CmndDomoticzKeyIdx, &CmndDomoticzSwitchIdx, &CmndDomoticzSensorIdx, &CmndDomoticzUpdateTimer };
 
 //enum DomoticzSensors {DZ_TEMP, DZ_TEMP_HUM, DZ_TEMP_HUM_BARO, DZ_POWER_ENERGY, DZ_ILLUMINANCE, DZ_COUNT, DZ_VOLTAGE, DZ_CURRENT, DZ_AIRQUALITY, DZ_MAX_SENSORS};
 
@@ -36,7 +39,6 @@ const char kDomoticzSensors[] PROGMEM =
   D_DOMOTICZ_TEMP "|" D_DOMOTICZ_TEMP_HUM "|" D_DOMOTICZ_TEMP_HUM_BARO "|" D_DOMOTICZ_POWER_ENERGY "|" D_DOMOTICZ_ILLUMINANCE "|" D_DOMOTICZ_COUNT "|" D_DOMOTICZ_VOLTAGE "|" D_DOMOTICZ_CURRENT "|" D_DOMOTICZ_AIRQUALITY ;
 
 const char S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE[] PROGMEM = "{\"" D_CMND_DOMOTICZ "%s%d\":%d}";
-const char S_JSON_DOMOTICZ_COMMAND_INDEX_LVALUE[] PROGMEM = "{\"" D_CMND_DOMOTICZ "%s%d\":%lu}";
 
 char domoticz_in_topic[] = DOMOTICZ_IN_TOPIC;
 char domoticz_out_topic[] = DOMOTICZ_OUT_TOPIC;
@@ -291,58 +293,7 @@ bool DomoticzMqttData(void)
   return false;  // Process unchanged or new data
 }
 
-/*********************************************************************************************\
+/*********************************************************************************************/
- * Commands
-\*********************************************************************************************/
-
-bool DomoticzCommand(void)
-{
-  char command [CMDSZ];
-  bool serviced = true;
-  uint8_t dmtcz_len = strlen(D_CMND_DOMOTICZ);  // Prep for string length change
-
-  if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_DOMOTICZ), dmtcz_len)) {  // Prefix
-    int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic +dmtcz_len, kDomoticzCommands);
-    if (-1 == command_code) {
-      serviced = false;  // Unknown command
-    }
-    else if ((CMND_IDX == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-      if (XdrvMailbox.payload >= 0) {
-        Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-        restart_flag = 2;
-      }
-      Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_LVALUE, command, XdrvMailbox.index, Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
-    }
-    else if ((CMND_KEYIDX == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-      if (XdrvMailbox.payload >= 0) {
-        Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      }
-      Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_LVALUE, command, XdrvMailbox.index, Settings.domoticz_key_idx[XdrvMailbox.index -1]);
-    }
-    else if ((CMND_SWITCHIDX == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
-      if (XdrvMailbox.payload >= 0) {
-        Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      }
-      Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, command, XdrvMailbox.index, Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
-    }
-    else if ((CMND_SENSORIDX == command_code) && (XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
-      if (XdrvMailbox.payload >= 0) {
-        Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
-      }
-      Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, command, XdrvMailbox.index, Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
-    }
-    else if (CMND_UPDATETIMER == command_code) {
-      if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
-        Settings.domoticz_update_timer = XdrvMailbox.payload;
-      }
-      Response_P(PSTR("{\"" D_CMND_DOMOTICZ "%s\":%d}"), command, Settings.domoticz_update_timer);
-    }
-    else serviced = false;  // Unknown command
-  }
-  else serviced = false;  // Unknown command
-
-  return serviced;
-}
 
 bool DomoticzSendKey(uint8_t key, uint8_t device, uint8_t state, uint8_t svalflg)
 {
@@ -428,6 +379,59 @@ void DomoticzSensorPowerEnergy(int power, char *energy)
   DomoticzSensor(DZ_POWER_ENERGY, data);
 }
 
+/*********************************************************************************************\
+ * Commands
+\*********************************************************************************************/
+
+void CmndDomoticzIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_relay_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+      restart_flag = 2;
+    }
+    Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, Settings.domoticz_relay_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzKeyIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_key_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, Settings.domoticz_key_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSwitchIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= MAX_DOMOTICZ_IDX)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_switch_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, Settings.domoticz_switch_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzSensorIdx(void)
+{
+  if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= DZ_MAX_SENSORS)) {
+    if (XdrvMailbox.payload >= 0) {
+      Settings.domoticz_sensor_idx[XdrvMailbox.index -1] = XdrvMailbox.payload;
+    }
+    Response_P(S_JSON_DOMOTICZ_COMMAND_INDEX_NVALUE, XdrvMailbox.command, XdrvMailbox.index, Settings.domoticz_sensor_idx[XdrvMailbox.index -1]);
+  }
+}
+
+void CmndDomoticzUpdateTimer(void)
+{
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload < 3601)) {
+    Settings.domoticz_update_timer = XdrvMailbox.payload;
+  }
+  Response_P(PSTR("{\"" D_CMND_DOMOTICZ "%s\":%d}"), XdrvMailbox.command, Settings.domoticz_update_timer);
+}
+
 /*********************************************************************************************\
  * Presentation
 \*********************************************************************************************/
@@ -556,9 +560,6 @@ bool Xdrv07(uint8_t function)
         WebServer->on("/" WEB_HANDLE_DOMOTICZ, HandleDomoticzConfiguration);
         break;
 #endif  // USE_WEBSERVER
-      case FUNC_COMMAND:
-        result = DomoticzCommand();
-        break;
       case FUNC_MQTT_SUBSCRIBE:
         DomoticzMqttSubscribe();
         break;
@@ -568,6 +569,12 @@ bool Xdrv07(uint8_t function)
       case FUNC_SHOW_SENSOR:
 //        DomoticzSendSensor();
         break;
+      case FUNC_COMMAND:
+        if (!strncasecmp_P(XdrvMailbox.topic, PSTR(D_CMND_DOMOTICZ), strlen(D_CMND_DOMOTICZ))) {  // Prefix
+          XdrvMailbox.topic += strlen(D_CMND_DOMOTICZ);
+          result = DecodeCommand(kDomoticzCommands, DomoticzCommand);
+        }
+        break;
     }
   }
   return result;