Merge pull request #9769 from effelle/tuyamcu_dev

TuyaMCU Update 1/3
arendst · Nov 8, 2020 · 32d6e61 · 32d6e61
2 parents c01a804 + 345f27b
commit 32d6e61
Show file tree

Hide file tree

Showing 3 changed files with 208 additions and 115 deletions.
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
@@ -379,11 +379,12 @@ enum TuyaSupportedFunctions { TUYA_MCU_FUNC_NONE,
                               TUYA_MCU_FUNC_REL1_INV = 41, TUYA_MCU_FUNC_REL2_INV, TUYA_MCU_FUNC_REL3_INV, TUYA_MCU_FUNC_REL4_INV, TUYA_MCU_FUNC_REL5_INV,
                                 TUYA_MCU_FUNC_REL6_INV, TUYA_MCU_FUNC_REL7_INV, TUYA_MCU_FUNC_REL8_INV,
                               TUYA_MCU_FUNC_LOWPOWER_MODE = 51,
-                              TUYA_MCU_FUNC_FAN3 = 61, TUYA_MCU_FUNC_FAN4, TUYA_MCU_FUNC_FAN5, TUYA_MCU_FUNC_FAN6,
+                              TUYA_MCU_FUNC_ENUM1 = 61, TUYA_MCU_FUNC_ENUM2, TUYA_MCU_FUNC_ENUM3, TUYA_MCU_FUNC_ENUM4,
                               TUYA_MCU_FUNC_MOTOR_DIR = 97,
                               TUYA_MCU_FUNC_ERROR = 98,
                               TUYA_MCU_FUNC_DUMMY = 99,
                               TUYA_MCU_FUNC_LAST = 255
+                              // IDs from 230 to 234 are reserved for internal use
 };
 
 #endif  // _TASMOTA_H_
diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino
@@ -1485,26 +1485,13 @@ void HandleRoot(void)
   }
 #ifdef USE_TUYA_MCU
   if (IsModuleTuya()) {
-    uint8_t modeset = 0;
     if (AsModuleTuyaMS()) {
       WSContentSend_P(HTTP_TABLE100);
       WSContentSend_P(PSTR("<tr><div></div>"));
       snprintf_P(stemp, sizeof(stemp), PSTR("" D_JSON_IRHVAC_MODE ""));
       WSContentSend_P(HTTP_DEVICE_CONTROL, 26, TasmotaGlobal.devices_present + 1,
         (strlen(SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present))) ? SettingsText(SET_BUTTON1 + TasmotaGlobal.devices_present) : stemp, "");
       WSContentSend_P(PSTR("</tr></table>"));
-      modeset = 1;
-    }
-    if (IsTuyaFanCtrl()) {
-      uint8_t device = TasmotaGlobal.devices_present + modeset;
-      WSContentSend_P(HTTP_TABLE100);
-      WSContentSend_P(PSTR("<tr><div></div>"));
-      for (uint32_t i = device + 1; i <= (TuyaFanSpeeds() + device) + 1; i++) {
-        snprintf_P(stemp, sizeof(stemp), PSTR("%d"), i - (device + 1));
-        WSContentSend_P(HTTP_DEVICE_CONTROL, 16, i,
-          (strlen(SettingsText(SET_BUTTON1 + i))) ? SettingsText(SET_BUTTON1 + i) : stemp, "");
-      }
-      WSContentSend_P(PSTR("</tr></table>"));
     }
   }
 #endif  // USE_TUYA_MCU
@@ -1580,29 +1567,15 @@ bool HandleRootStatusRefresh(void)
 #endif  // USE_SONOFF_IFAN
 #ifdef USE_TUYA_MCU
     if (IsModuleTuya()) {
-      uint8_t FuncIdx = 0;
-        if (device <= TasmotaGlobal.devices_present) {
-          ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
-        } else {
-          if (AsModuleTuyaMS() && device == TasmotaGlobal.devices_present + 1) {
-            uint8_t dpId = TuyaGetDpId(TUYA_MCU_FUNC_MODESET);
-            snprintf_P(svalue, sizeof(svalue), PSTR("Tuyasend4 %d,%d"), dpId, !TuyaModeSet());
-            ExecuteCommand(svalue, SRC_WEBGUI);
-          }
-          if (IsTuyaFanCtrl()) {
-            uint8_t dpId = 0;
-            for (uint32_t i = 0; i <= 3; i++) { // Tuya Function FAN3 to FAN6
-              if (TuyaGetDpId(TUYA_MCU_FUNC_FAN3 + i) != 0) {
-                dpId = TuyaGetDpId(TUYA_MCU_FUNC_FAN3 + i);
-              }
-            }
-            if ((AsModuleTuyaMS() && device != TasmotaGlobal.devices_present + 1) || !AsModuleTuyaMS()) {
-              if (AsModuleTuyaMS()) {FuncIdx = 1;}
-              snprintf_P(svalue, sizeof(svalue), PSTR("Tuyasend2 %d,%d"), dpId, (device - (TasmotaGlobal.devices_present + FuncIdx) - 1));
-              ExecuteCommand(svalue, SRC_WEBGUI);
-            }
-          }
+      if (device <= TasmotaGlobal.devices_present) {
+        ExecuteCommandPower(device, POWER_TOGGLE, SRC_IGNORE);
+      } else {
+        if (AsModuleTuyaMS() && device == TasmotaGlobal.devices_present + 1) {
+          uint8_t dpId = TuyaGetDpId(TUYA_MCU_FUNC_MODESET);
+          snprintf_P(svalue, sizeof(svalue), PSTR("Tuyasend4 %d,%d"), dpId, !TuyaModeSet());
+          ExecuteCommand(svalue, SRC_WEBGUI);
         }
+      }
     } else {
 #endif  // USE_TUYA_MCU
 #ifdef USE_SHUTTER
@@ -1707,14 +1680,9 @@ bool HandleRootStatusRefresh(void)
   }
 #ifdef USE_TUYA_MCU
   if (IsModuleTuya()) {
-    uint32_t fanspeed = TuyaFanState();
     uint32_t modeset = TuyaModeSet();
-    if (IsTuyaFanCtrl() && !AsModuleTuyaMS()) {
-      WSContentSend_P(PSTR("<div style='text-align:center;font-size:25px;'>" D_JSON_IRHVAC_FANSPEED ": %d</div>"), fanspeed);
-    } else if (!IsTuyaFanCtrl() && AsModuleTuyaMS()) {
+    if (AsModuleTuyaMS()) {
       WSContentSend_P(PSTR("<div style='text-align:center;font-size:25px;'>" D_JSON_IRHVAC_MODE ": %d</div>"), modeset);
-    } else if (IsTuyaFanCtrl() && AsModuleTuyaMS()) {
-      WSContentSend_P(PSTR("<div style='text-align:center;font-size:25px;'>" D_JSON_IRHVAC_MODE ": %d - " D_JSON_IRHVAC_FANSPEED ": %d</div>"), modeset, fanspeed);
     }
   }
 #endif  // USE_TUYA_MCU