From edb0cf8f699c6e2a9f07cb2020ee0fac042ec8d7 Mon Sep 17 00:00:00 2001 From: netpok Date: Fri, 1 Feb 2019 14:54:35 +0100 Subject: [PATCH 1/4] Add WAGA life CHCZ02MB device --- sonoff/sonoff_template.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 99f4d1458..08d731b5e 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -293,6 +293,7 @@ enum SupportedModules { ZX2820, MI_DESK_LAMP, SP10, + WAGA, MAXMODULE }; /********************************************************************************************/ @@ -574,6 +575,7 @@ const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = { DIGOO, KA10, SP10, + WAGA, NEO_COOLCAM, // Socket Relay Devices OBI, OBI2, @@ -1814,6 +1816,26 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_LED1, // GPIO13 Blue LED - Link status GPIO_REL1, // GPIO14 Relay 1 and red LED 0, 0, 0 + }, + { "WAGA CHCZ02MB", // WAGA life CHCZ02MB (HJL-01 Energy Monitoring) + // https://www.ebay.com/itm/332595697006 + GPIO_LED1, // GPIO00 Red LED + 0, // GPIO01 Serial TX + 0, // GPIO02 + GPIO_NRG_SEL_INV, // GPIO03 HJL-01 Sel output (1 = Voltage) + 0, // GPIO04 + GPIO_HJL_CF, // GPIO05 HJL-01 CF power + // GPIO06 (SD_CLK Flash) + // GPIO07 (SD_DATA0 Flash QIO/DIO/DOUT) + // GPIO08 (SD_DATA1 Flash QIO/DIO/DOUT) + 0, // GPIO09 (SD_DATA2 Flash QIO or ESP8285) + 0, // GPIO10 (SD_DATA3 Flash QIO or ESP8285) + // GPIO11 (SD_CMD Flash) + GPIO_REL1, // GPIO12 Relay + GPIO_KEY1, // GPIO13 Button + GPIO_NRG_CF1, // GPIO14 HJL-01 CF1 voltage / current + GPIO_LED2, // GPIO15 Blue LED - Link status + 0, 0 } }; From 1bb22c06a6c15198a6f3ff6fa442e1eef2b8f107 Mon Sep 17 00:00:00 2001 From: netpok Date: Fri, 1 Feb 2019 14:55:33 +0100 Subject: [PATCH 2/4] Update SP10 descriptions --- sonoff/sonoff_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 08d731b5e..598d03e80 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -1798,7 +1798,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_ROT_B, // GPIO13 Rotary switch B pin 0, 0, 0, 0 }, - { "SP10", // Tuya SP10 (ESP8285 - BL0937 Energy Monitoring) + { "SP10", // Tuya SP10 (BL0937 Energy Monitoring) // https://www.aliexpress.com/item/Smart-Mini-WiFi-Plug-Outlet-Switch-Work-With-ForEcho-Alexa-Google-Home-Remote-EU-Smart-Socket/32963670423.html 0, // GPIO00 GPIO_PWM1, // GPIO01 Nightlight @@ -1814,7 +1814,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { // GPIO11 (SD_CMD Flash) GPIO_NRG_SEL_INV, // GPIO12 BL0937 Sel output (1 = Voltage) GPIO_LED1, // GPIO13 Blue LED - Link status - GPIO_REL1, // GPIO14 Relay 1 and red LED + GPIO_REL1, // GPIO14 Relay and red LED 0, 0, 0 }, { "WAGA CHCZ02MB", // WAGA life CHCZ02MB (HJL-01 Energy Monitoring) From b927237aad9e6a828f77f934b7dc18d7c93a3451 Mon Sep 17 00:00:00 2001 From: netpok Date: Fri, 1 Feb 2019 15:01:45 +0100 Subject: [PATCH 3/4] Fix LED numbering --- sonoff/sonoff_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index 598d03e80..fa7d7d546 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -1819,7 +1819,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { }, { "WAGA CHCZ02MB", // WAGA life CHCZ02MB (HJL-01 Energy Monitoring) // https://www.ebay.com/itm/332595697006 - GPIO_LED1, // GPIO00 Red LED + GPIO_LED2, // GPIO00 Red LED 0, // GPIO01 Serial TX 0, // GPIO02 GPIO_NRG_SEL_INV, // GPIO03 HJL-01 Sel output (1 = Voltage) @@ -1834,7 +1834,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_REL1, // GPIO12 Relay GPIO_KEY1, // GPIO13 Button GPIO_NRG_CF1, // GPIO14 HJL-01 CF1 voltage / current - GPIO_LED2, // GPIO15 Blue LED - Link status + GPIO_LED1, // GPIO15 Blue LED - Link status 0, 0 } }; From 4dc1d2f26004554a94df60b72f4a5b0aaa394b6f Mon Sep 17 00:00:00 2001 From: netpok Date: Sat, 2 Feb 2019 01:10:35 +0100 Subject: [PATCH 4/4] Fix led polarity --- sonoff/sonoff_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonoff/sonoff_template.h b/sonoff/sonoff_template.h index fa7d7d546..1fbf50bf1 100644 --- a/sonoff/sonoff_template.h +++ b/sonoff/sonoff_template.h @@ -1819,7 +1819,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { }, { "WAGA CHCZ02MB", // WAGA life CHCZ02MB (HJL-01 Energy Monitoring) // https://www.ebay.com/itm/332595697006 - GPIO_LED2, // GPIO00 Red LED + GPIO_LED2_INV, // GPIO00 Red LED 0, // GPIO01 Serial TX 0, // GPIO02 GPIO_NRG_SEL_INV, // GPIO03 HJL-01 Sel output (1 = Voltage) @@ -1834,7 +1834,7 @@ const mytmplt kModules[MAXMODULE] PROGMEM = { GPIO_REL1, // GPIO12 Relay GPIO_KEY1, // GPIO13 Button GPIO_NRG_CF1, // GPIO14 HJL-01 CF1 voltage / current - GPIO_LED1, // GPIO15 Blue LED - Link status + GPIO_LED1_INV, // GPIO15 Blue LED - Link status 0, 0 } };