From e749df75ad9f0862d171fb54342b3bb4ad793138 Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 18:27:17 +0000 Subject: [PATCH 1/9] Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller --- BUILDS.md | 1 + platformio.ini | 2 +- tasmota/language/bg-BG.h | 1 + tasmota/language/cs-CZ.h | 1 + tasmota/language/de-DE.h | 1 + tasmota/language/el-GR.h | 1 + tasmota/language/en-GB.h | 1 + tasmota/language/es-ES.h | 1 + tasmota/language/fr-FR.h | 1 + tasmota/language/he-HE.h | 1 + tasmota/language/hu-HU.h | 1 + tasmota/language/it-IT.h | 1 + tasmota/language/ko-KO.h | 1 + tasmota/language/nl-NL.h | 1 + tasmota/language/pl-PL.h | 1 + tasmota/language/pt-BR.h | 1 + tasmota/language/pt-PT.h | 1 + tasmota/language/ro-RO.h | 1 + tasmota/language/ru-RU.h | 1 + tasmota/language/sk-SK.h | 1 + tasmota/language/sv-SE.h | 1 + tasmota/language/tr-TR.h | 1 + tasmota/language/uk-UA.h | 1 + tasmota/language/zh-CN.h | 1 + tasmota/language/zh-TW.h | 1 + tasmota/my_user_config.h | 1 + tasmota/tasmota_post.h | 4 ++ tasmota/tasmota_template.h | 7 +- tasmota/xlgt_06_electriq_moodl.ino | 102 +++++++++++++++++++++++++++++ 29 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 tasmota/xlgt_06_electriq_moodl.ino diff --git a/BUILDS.md b/BUILDS.md index 18f25042b..f63d29bb8 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -53,6 +53,7 @@ | USE_SM16716 | - | - | x | x | x | - | x | | USE_SM2135 | - | - | x | x | x | - | x | | USE_SONOFF_L1 | - | - | x | x | x | - | x | +| USE_ELECTRIQ_MOODL | - | - | x | x | x | - | x | | | | | | | | | | | USE_ENERGY_SENSOR | - | x | x | x | x | - | - | | USE_PZEM004T | - | - | x | x | x | - | - | diff --git a/platformio.ini b/platformio.ini index 6b9459388..bb9038a9c 100755 --- a/platformio.ini +++ b/platformio.ini @@ -17,7 +17,7 @@ extra_configs = platformio_tasmota_env.ini ; *** Build/upload environment default_envs = ; *** Uncomment by deleting ";" in the line(s) below to select version(s) -; tasmota + tasmota ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; tasmota-minimal ; tasmota-lite diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 37e1468ab..0abed5232 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h index 6ea1707a7..6d7ac1978 100644 --- a/tasmota/language/cs-CZ.h +++ b/tasmota/language/cs-CZ.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h index 6bcd615f0..0d2a189db 100644 --- a/tasmota/language/de-DE.h +++ b/tasmota/language/de-DE.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h index 5b13e6342..097d1ecaa 100644 --- a/tasmota/language/el-GR.h +++ b/tasmota/language/el-GR.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h index c394c706d..fcb4618c5 100644 --- a/tasmota/language/en-GB.h +++ b/tasmota/language/en-GB.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index 1f7e33914..b40dd9d18 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h index 9aa4efba8..a2627d45e 100644 --- a/tasmota/language/fr-FR.h +++ b/tasmota/language/fr-FR.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h index 64d1b38b2..451aaf588 100644 --- a/tasmota/language/he-HE.h +++ b/tasmota/language/he-HE.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h index d4797a90a..6ed3a8b49 100644 --- a/tasmota/language/hu-HU.h +++ b/tasmota/language/hu-HU.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h index 7f41ad7fa..f63b5f5ca 100644 --- a/tasmota/language/it-IT.h +++ b/tasmota/language/it-IT.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h index fe1ca5b3b..8cbf27a4f 100644 --- a/tasmota/language/ko-KO.h +++ b/tasmota/language/ko-KO.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h index 474cc7150..9b79a5c98 100644 --- a/tasmota/language/nl-NL.h +++ b/tasmota/language/nl-NL.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h index 5652de045..dede4bd00 100644 --- a/tasmota/language/pl-PL.h +++ b/tasmota/language/pl-PL.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h index 858be76f0..351f85cce 100644 --- a/tasmota/language/pt-BR.h +++ b/tasmota/language/pt-BR.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h index 6bbfc0fa6..13144cfeb 100644 --- a/tasmota/language/pt-PT.h +++ b/tasmota/language/pt-PT.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h index 53c08426a..68fa70a26 100644 --- a/tasmota/language/ro-RO.h +++ b/tasmota/language/ro-RO.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h index 990c3d9d1..590fecd2e 100644 --- a/tasmota/language/ru-RU.h +++ b/tasmota/language/ru-RU.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h index d9eae653d..62d8d4786 100644 --- a/tasmota/language/sk-SK.h +++ b/tasmota/language/sk-SK.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h index 302dac80c..e48fe9c64 100644 --- a/tasmota/language/sv-SE.h +++ b/tasmota/language/sv-SE.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h index bb48f6d0e..4d37f99f1 100644 --- a/tasmota/language/tr-TR.h +++ b/tasmota/language/tr-TR.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h index 895269639..f447d4775 100644 --- a/tasmota/language/uk-UA.h +++ b/tasmota/language/uk-UA.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h index e1517e21e..68fdafbca 100644 --- a/tasmota/language/zh-CN.h +++ b/tasmota/language/zh-CN.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "安" diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h index f3c31c0b6..bc3a537fc 100644 --- a/tasmota/language/zh-TW.h +++ b/tasmota/language/zh-TW.h @@ -663,6 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" +#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" // Units #define D_UNIT_AMPERE "安" diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index dbc60bac3..49b2a5c16 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -431,6 +431,7 @@ #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM2135 // Add support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #define USE_SONOFF_L1 // Add support for Sonoff L1 led control +#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller // -- Counter input ------------------------------- #define USE_COUNTER // Enable inputs as counter (+0k8 code) diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index 1abd371ff..ed1091fbe 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -134,6 +134,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM2135 // Add support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #define USE_SONOFF_L1 // Add support for Sonoff L1 led control +#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #define USE_COUNTER // Enable counters #undef USE_ADC_VCC // Add Analog input on selected devices @@ -399,6 +400,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_ENERGY_SENSOR // Disable energy sensors (-14k code) #undef USE_PZEM004T // Disable PZEM004T energy sensor @@ -512,6 +514,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices @@ -632,6 +635,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index a45c456f8..15c1c1503 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -225,6 +225,7 @@ enum UserSelectablePins { GPIO_CC1101_GDO0, // CC1101 pin for RX GPIO_CC1101_GDO2, // CC1101 pin for RX GPIO_HRXL_RX, // Data from MaxBotix HRXL sonar range sensor + GPIO_ELECTRIC_MOODL_TX, // ElectriQ iQ-wifiMOODL Serial TX GPIO_SENSOR_END }; // Programmer selectable GPIO functionality @@ -310,7 +311,8 @@ const char kSensorNames[] PROGMEM = D_SENSOR_HM10_RX "|" D_SENSOR_HM10_TX "|" D_SENSOR_LE01MR_RX "|" D_SENSOR_LE01MR_TX "|" D_SENSOR_CC1101_GDO0 "|" D_SENSOR_CC1101_GDO2 "|" - D_SENSOR_HRXL_RX + D_SENSOR_HRXL_RX "|" + D_SENSOR_ELECTRIQ_MOODL ; const char kSensorNamesFixed[] PROGMEM = @@ -611,6 +613,9 @@ const uint8_t kGpioNiceList[] PROGMEM = { #ifdef USE_EXS_DIMMER GPIO_EXS_ENABLE, // EXS MCU Enable #endif +#ifdef USE_ELECTRIQ_MOODL + GPIO_ELECTRIC_MOODL_TX, +#endif #endif // USE_LIGHT #if defined(USE_IR_REMOTE) || defined(USE_IR_REMOTE_FULL) diff --git a/tasmota/xlgt_06_electriq_moodl.ino b/tasmota/xlgt_06_electriq_moodl.ino new file mode 100644 index 000000000..ed5c5e498 --- /dev/null +++ b/tasmota/xlgt_06_electriq_moodl.ino @@ -0,0 +1,102 @@ +/* + xlgt_06_moodlamp.ino - ElectriQ iQ-wifiMOODL LED support for Tasmota + + Copyright (C) 2019 Theo Arends + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifdef USE_LIGHT +#ifdef USE_ELECTRIQ_MOODL + +/*********************************************************************************************\ + * ElectriQ iQ-wifiMOODL + * This RGBW mood lamp uses the TYWE3S module to transmit via UART to an unmarked MCU which + * drives 8 MOSFETs. The MCU does not transmit; it ony receives commands from the TYWE3S. + * The MCU appears to use a modified/undocumented version of the TuyaMCU protocol. + * The main PCB has 2 daughter boards which hold the RGBW LEDs - an upper deck and a lower deck. + * The same RGBW data is transmitted to the upper and lower decks. + * *********************************************************************************************/ + +#define XLGT_06 6 + +/********************************************************************************************/ + +bool ElectriqMoodLSetChannels(void) +{ + uint8_t *col = (uint8_t*)XdrvMailbox.data; + uint8_t checksum = (uint8_t)(0x65 + 0xAA + 0x01 + 0x0A); + + Serial.write(0x65); // Fixed header + Serial.write(0xAA); + Serial.write(0x00); // Version + Serial.write(0x01); // Command + Serial.write(0x0A); // Payload length + + uint8_t payload[5]; + payload[0] = col[0]; + payload[1] = col[1]; + payload[2] = col[2]; + payload[3] = col[3]; + payload[4] = 0x0; // Unused + + // Send payload for the upper LED deck + for (uint32_t i = 0; i < 5; i++) { + Serial.write(payload[i]); + checksum += payload[i]; + } + + // Send payload for the lower LED deck + for (uint32_t i = 0; i < 5; i++) { + Serial.write(payload[i]); + checksum += payload[i]; + } + + Serial.write(checksum); + Serial.flush(); + + return true; +} + +void ElectriqMoodLModuleSelected(void) +{ + if (pin[GPIO_ELECTRIC_MOODL_TX] < 99) { + SetSerial(9600, TS_SERIAL_8N1); + light_type = LT_RGBW; + light_flg = XLGT_06; + AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DBG: ElectriQ Mood Lamp Found")); + } +} + +/*********************************************************************************************\ + * Interface +\*********************************************************************************************/ + +bool Xlgt06(uint8_t function) +{ + bool result = false; + + switch (function) { + case FUNC_SET_CHANNELS: + result = ElectriqMoodLSetChannels(); + break; + case FUNC_MODULE_INIT: + ElectriqMoodLModuleSelected(); + break; + } + return result; +} + +#endif // USE_ELECTRIQ_MOODL +#endif // USE_LIGHT \ No newline at end of file From 20cc9777f72c7283767af824e736696619007b5f Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 18:33:43 +0000 Subject: [PATCH 2/9] Revert platformio.ini --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index bb9038a9c..6b9459388 100755 --- a/platformio.ini +++ b/platformio.ini @@ -17,7 +17,7 @@ extra_configs = platformio_tasmota_env.ini ; *** Build/upload environment default_envs = ; *** Uncomment by deleting ";" in the line(s) below to select version(s) - tasmota +; tasmota ; tasmota-ircustom ; alternative to 'tasmota' with full IR protocols activated, you will need to disable some features to keep code not too big ; tasmota-minimal ; tasmota-lite From d7fc4442817bf41d1ba56db2f4ee80d2649352d6 Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 18:34:25 +0000 Subject: [PATCH 3/9] Correct copyright date to 2020 --- tasmota/xlgt_06_electriq_moodl.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/xlgt_06_electriq_moodl.ino b/tasmota/xlgt_06_electriq_moodl.ino index ed5c5e498..9de133e11 100644 --- a/tasmota/xlgt_06_electriq_moodl.ino +++ b/tasmota/xlgt_06_electriq_moodl.ino @@ -1,7 +1,7 @@ /* xlgt_06_moodlamp.ino - ElectriQ iQ-wifiMOODL LED support for Tasmota - Copyright (C) 2019 Theo Arends + Copyright (C) 2020 Theo Arends This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 4317f048aa053fe993f16a53b7d4f576496edc97 Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 21:28:40 +0000 Subject: [PATCH 4/9] Fix comment alignment --- tasmota/tasmota_post.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index ed1091fbe..2059d63b9 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -400,7 +400,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_ENERGY_SENSOR // Disable energy sensors (-14k code) #undef USE_PZEM004T // Disable PZEM004T energy sensor @@ -514,7 +514,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices @@ -635,7 +635,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices From 740e91dd273140a0c2bd0848d335cf185a43b3f3 Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 21:35:44 +0000 Subject: [PATCH 5/9] Fix typos --- tasmota/my_user_config.h | 2 +- tasmota/tasmota_post.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 49b2a5c16..568ece036 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -431,7 +431,7 @@ #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM2135 // Add support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #define USE_SONOFF_L1 // Add support for Sonoff L1 led control -#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller // -- Counter input ------------------------------- #define USE_COUNTER // Enable inputs as counter (+0k8 code) diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index 2059d63b9..aaa3e8a89 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -134,7 +134,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM2135 // Add support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #define USE_SONOFF_L1 // Add support for Sonoff L1 led control -#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller #define USE_COUNTER // Enable counters #undef USE_ADC_VCC // Add Analog input on selected devices @@ -400,7 +400,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller #undef USE_ENERGY_SENSOR // Disable energy sensors (-14k code) #undef USE_PZEM004T // Disable PZEM004T energy sensor @@ -514,7 +514,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices @@ -635,7 +635,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #undef USE_SM16716 // Disable support for SM16716 RGB LED controller (+0k7 code) #undef USE_SM2135 // Disable support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #undef USE_SONOFF_L1 // Disable support for Sonoff L1 led control -#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED contoller +#undef USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller #undef USE_COUNTER // Disable counters #define USE_ADC_VCC // Display Vcc in Power status. Disable for use as Analog input on selected devices From 0609858b399b8704df8576c73d32f971ebb8deb8 Mon Sep 17 00:00:00 2001 From: Ian King Date: Tue, 17 Mar 2020 21:45:42 +0000 Subject: [PATCH 6/9] Fix typo --- tasmota/xlgt_06_electriq_moodl.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasmota/xlgt_06_electriq_moodl.ino b/tasmota/xlgt_06_electriq_moodl.ino index 9de133e11..f90d3eefb 100644 --- a/tasmota/xlgt_06_electriq_moodl.ino +++ b/tasmota/xlgt_06_electriq_moodl.ino @@ -23,7 +23,7 @@ /*********************************************************************************************\ * ElectriQ iQ-wifiMOODL * This RGBW mood lamp uses the TYWE3S module to transmit via UART to an unmarked MCU which - * drives 8 MOSFETs. The MCU does not transmit; it ony receives commands from the TYWE3S. + * drives 8 MOSFETs. The MCU does not transmit; it only receives commands from the TYWE3S. * The MCU appears to use a modified/undocumented version of the TuyaMCU protocol. * The main PCB has 2 daughter boards which hold the RGBW LEDs - an upper deck and a lower deck. * The same RGBW data is transmitted to the upper and lower decks. From b250c599319e0938e77c1970ed9739a637c14372 Mon Sep 17 00:00:00 2001 From: Ian King Date: Wed, 18 Mar 2020 10:24:56 +0000 Subject: [PATCH 7/9] Keep sensor name short --- tasmota/language/bg-BG.h | 2 +- tasmota/language/cs-CZ.h | 2 +- tasmota/language/de-DE.h | 2 +- tasmota/language/el-GR.h | 2 +- tasmota/language/en-GB.h | 2 +- tasmota/language/es-ES.h | 2 +- tasmota/language/fr-FR.h | 2 +- tasmota/language/he-HE.h | 2 +- tasmota/language/hu-HU.h | 2 +- tasmota/language/it-IT.h | 2 +- tasmota/language/ko-KO.h | 2 +- tasmota/language/nl-NL.h | 2 +- tasmota/language/pl-PL.h | 2 +- tasmota/language/pt-BR.h | 2 +- tasmota/language/pt-PT.h | 2 +- tasmota/language/ro-RO.h | 2 +- tasmota/language/ru-RU.h | 2 +- tasmota/language/sk-SK.h | 2 +- tasmota/language/sv-SE.h | 2 +- tasmota/language/tr-TR.h | 2 +- tasmota/language/uk-UA.h | 2 +- tasmota/language/zh-CN.h | 2 +- tasmota/language/zh-TW.h | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tasmota/language/bg-BG.h b/tasmota/language/bg-BG.h index 0abed5232..f7760f302 100644 --- a/tasmota/language/bg-BG.h +++ b/tasmota/language/bg-BG.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/cs-CZ.h b/tasmota/language/cs-CZ.h index 6d7ac1978..72bb6c275 100644 --- a/tasmota/language/cs-CZ.h +++ b/tasmota/language/cs-CZ.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/de-DE.h b/tasmota/language/de-DE.h index 0d2a189db..12cb30769 100644 --- a/tasmota/language/de-DE.h +++ b/tasmota/language/de-DE.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/el-GR.h b/tasmota/language/el-GR.h index 097d1ecaa..8a8160956 100644 --- a/tasmota/language/el-GR.h +++ b/tasmota/language/el-GR.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/en-GB.h b/tasmota/language/en-GB.h index fcb4618c5..09b43c1be 100644 --- a/tasmota/language/en-GB.h +++ b/tasmota/language/en-GB.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/es-ES.h b/tasmota/language/es-ES.h index b40dd9d18..f70940a38 100644 --- a/tasmota/language/es-ES.h +++ b/tasmota/language/es-ES.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/fr-FR.h b/tasmota/language/fr-FR.h index a2627d45e..488386aea 100644 --- a/tasmota/language/fr-FR.h +++ b/tasmota/language/fr-FR.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/he-HE.h b/tasmota/language/he-HE.h index 451aaf588..70d474e8f 100644 --- a/tasmota/language/he-HE.h +++ b/tasmota/language/he-HE.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/hu-HU.h b/tasmota/language/hu-HU.h index 6ed3a8b49..cc47f6a5d 100644 --- a/tasmota/language/hu-HU.h +++ b/tasmota/language/hu-HU.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/it-IT.h b/tasmota/language/it-IT.h index f63b5f5ca..d9a4b9a6b 100644 --- a/tasmota/language/it-IT.h +++ b/tasmota/language/it-IT.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ko-KO.h b/tasmota/language/ko-KO.h index 8cbf27a4f..1767366db 100644 --- a/tasmota/language/ko-KO.h +++ b/tasmota/language/ko-KO.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/nl-NL.h b/tasmota/language/nl-NL.h index 9b79a5c98..246066035 100644 --- a/tasmota/language/nl-NL.h +++ b/tasmota/language/nl-NL.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pl-PL.h b/tasmota/language/pl-PL.h index dede4bd00..6f945183a 100644 --- a/tasmota/language/pl-PL.h +++ b/tasmota/language/pl-PL.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt-BR.h b/tasmota/language/pt-BR.h index 351f85cce..236652de2 100644 --- a/tasmota/language/pt-BR.h +++ b/tasmota/language/pt-BR.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/pt-PT.h b/tasmota/language/pt-PT.h index 13144cfeb..507e7fe8b 100644 --- a/tasmota/language/pt-PT.h +++ b/tasmota/language/pt-PT.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ro-RO.h b/tasmota/language/ro-RO.h index 68fa70a26..c3efc5758 100644 --- a/tasmota/language/ro-RO.h +++ b/tasmota/language/ro-RO.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/ru-RU.h b/tasmota/language/ru-RU.h index 590fecd2e..a104dca55 100644 --- a/tasmota/language/ru-RU.h +++ b/tasmota/language/ru-RU.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/sk-SK.h b/tasmota/language/sk-SK.h index 62d8d4786..706432e5b 100644 --- a/tasmota/language/sk-SK.h +++ b/tasmota/language/sk-SK.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/sv-SE.h b/tasmota/language/sv-SE.h index e48fe9c64..df64cf2e3 100644 --- a/tasmota/language/sv-SE.h +++ b/tasmota/language/sv-SE.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/tr-TR.h b/tasmota/language/tr-TR.h index 4d37f99f1..1366b9996 100644 --- a/tasmota/language/tr-TR.h +++ b/tasmota/language/tr-TR.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "A" diff --git a/tasmota/language/uk-UA.h b/tasmota/language/uk-UA.h index f447d4775..2e3c4c077 100644 --- a/tasmota/language/uk-UA.h +++ b/tasmota/language/uk-UA.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "А" diff --git a/tasmota/language/zh-CN.h b/tasmota/language/zh-CN.h index 68fdafbca..c59cb7a57 100644 --- a/tasmota/language/zh-CN.h +++ b/tasmota/language/zh-CN.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "安" diff --git a/tasmota/language/zh-TW.h b/tasmota/language/zh-TW.h index bc3a537fc..6ef104bec 100644 --- a/tasmota/language/zh-TW.h +++ b/tasmota/language/zh-TW.h @@ -663,7 +663,7 @@ #define D_SENSOR_CC1101_GDO0 "CC1101 GDO0" #define D_SENSOR_CC1101_GDO2 "CC1101 GDO2" #define D_SENSOR_HRXL_RX "HRXL Rx" -#define D_SENSOR_ELECTRIQ_MOODL "ElectriQ MOODL Tx" +#define D_SENSOR_ELECTRIQ_MOODL "MOODL Tx" // Units #define D_UNIT_AMPERE "安" From a9372fae06b775729943595e110e9311022a186c Mon Sep 17 00:00:00 2001 From: Ian King Date: Wed, 18 Mar 2020 10:30:52 +0000 Subject: [PATCH 8/9] Fix typo in GPIO define name --- tasmota/tasmota_template.h | 4 ++-- tasmota/xlgt_06_electriq_moodl.ino | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h index 15c1c1503..4715f682f 100644 --- a/tasmota/tasmota_template.h +++ b/tasmota/tasmota_template.h @@ -225,7 +225,7 @@ enum UserSelectablePins { GPIO_CC1101_GDO0, // CC1101 pin for RX GPIO_CC1101_GDO2, // CC1101 pin for RX GPIO_HRXL_RX, // Data from MaxBotix HRXL sonar range sensor - GPIO_ELECTRIC_MOODL_TX, // ElectriQ iQ-wifiMOODL Serial TX + GPIO_ELECTRIQ_MOODL_TX, // ElectriQ iQ-wifiMOODL Serial TX GPIO_SENSOR_END }; // Programmer selectable GPIO functionality @@ -614,7 +614,7 @@ const uint8_t kGpioNiceList[] PROGMEM = { GPIO_EXS_ENABLE, // EXS MCU Enable #endif #ifdef USE_ELECTRIQ_MOODL - GPIO_ELECTRIC_MOODL_TX, + GPIO_ELECTRIQ_MOODL_TX, #endif #endif // USE_LIGHT diff --git a/tasmota/xlgt_06_electriq_moodl.ino b/tasmota/xlgt_06_electriq_moodl.ino index f90d3eefb..0ece53dd6 100644 --- a/tasmota/xlgt_06_electriq_moodl.ino +++ b/tasmota/xlgt_06_electriq_moodl.ino @@ -71,7 +71,7 @@ bool ElectriqMoodLSetChannels(void) void ElectriqMoodLModuleSelected(void) { - if (pin[GPIO_ELECTRIC_MOODL_TX] < 99) { + if (pin[GPIO_ELECTRIQ_MOODL_TX] < 99) { SetSerial(9600, TS_SERIAL_8N1); light_type = LT_RGBW; light_flg = XLGT_06; From 7049c33b40a9dd3b3c7b71130056d1bc9a9b9afd Mon Sep 17 00:00:00 2001 From: Ian King Date: Wed, 18 Mar 2020 10:58:19 +0000 Subject: [PATCH 9/9] Disable ELECTRIQ_MOODL by default as it's a niche product --- BUILDS.md | 2 +- tasmota/tasmota_post.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILDS.md b/BUILDS.md index f63d29bb8..d1ac73db9 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -53,7 +53,7 @@ | USE_SM16716 | - | - | x | x | x | - | x | | USE_SM2135 | - | - | x | x | x | - | x | | USE_SONOFF_L1 | - | - | x | x | x | - | x | -| USE_ELECTRIQ_MOODL | - | - | x | x | x | - | x | +| USE_ELECTRIQ_MOODL | - | - | - | - | - | - | - | | | | | | | | | | | USE_ENERGY_SENSOR | - | x | x | x | x | - | - | | USE_PZEM004T | - | - | x | x | x | - | - | diff --git a/tasmota/tasmota_post.h b/tasmota/tasmota_post.h index aaa3e8a89..dfdf6f3f8 100644 --- a/tasmota/tasmota_post.h +++ b/tasmota/tasmota_post.h @@ -134,7 +134,7 @@ extern "C" void custom_crash_callback(struct rst_info * rst_info, uint32_t stack #define USE_SM16716 // Add support for SM16716 RGB LED controller (+0k7 code) #define USE_SM2135 // Add support for SM2135 RGBCW led control as used in Action LSC (+0k6 code) #define USE_SONOFF_L1 // Add support for Sonoff L1 led control -#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller +//#define USE_ELECTRIQ_MOODL // Add support for ElectriQ iQ-wifiMOODL RGBW LED controller #define USE_COUNTER // Enable counters #undef USE_ADC_VCC // Add Analog input on selected devices