Merge pull request #3996 from Phelagor/CSL_Module-Support

Added support for CSL Aplic WDP303075
This commit is contained in:
Theo Arends 2018-10-06 22:25:43 +02:00 committed by GitHub
commit 7acd9a1277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions

View File

@ -235,6 +235,7 @@ enum SupportedModules {
ESP_SWITCH,
OBI,
TECKIN,
APLIC_WDP303075,
MAXMODULE };
/********************************************************************************************/
@ -409,7 +410,8 @@ const uint8_t kModuleNiceList[MAXMODULE] PROGMEM = {
AILIGHT, // Light Bulbs
PHILIPS,
WITTY, // Development Devices
WEMOS
WEMOS,
APLIC_WDP303075
};
// Default module settings
@ -1112,6 +1114,21 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
GPIO_LED1_INV, // GPIO13 Blue Led (0 = On, 1 = Off)
GPIO_REL1, // GPIO14 Relay (0 = Off, 1 = On)
0, 0, 0
},
{ "AplicWDP303075", // Aplic WDP 303075 (ESP8285 - HLW8012 Energy Monitoring)
// https://www.amazon.de/dp/B07CNWVNJ2
0, // GPIO00
0, // GPIO01
0, // GPIO02
GPIO_KEY1, // GPIO03 Button
GPIO_HLW_CF, // GPIO04 HLW8012 CF (power)
GPIO_HLW_CF1, // GPIO05 HLW8012 CF1 (current/voltage)
0, 0, 0, 0, 0, 0, // ?
GPIO_HLW_SEL, // GPIO12 HLW8012 CF Sel output (CF)
GPIO_LED1_INV, // GPIO13 LED
GPIO_REL1, // GPIO14 Relay SRU 5VDC SDA (0= Off, 1 = On )
0, // GPIO15
0, 0
}
};

View File

@ -33,6 +33,10 @@
#define HLW_IREF 4545 // 4.545A
#define HLW_SEL_VOLTAGE 1
// HLW8012 based (APLIC_WDP303075)
#define A_HLW_SEL_VOLTAGE 0
// HJL-01 based (BlitzWolf, Homecube, Gosund, Teckin)
#define HJL_PREF 1362
#define HJL_UREF 822
@ -182,6 +186,11 @@ void HlwSnsInit()
hlw_voltage_ratio = HJL_UREF;
hlw_current_ratio = HJL_IREF;
hlw_ui_flag = HJL_SEL_VOLTAGE;
} else if (APLIC_WDP303075 == Settings.module){
hlw_power_ratio = HLW_PREF;
hlw_voltage_ratio = HLW_UREF;
hlw_current_ratio = HLW_IREF;
hlw_ui_flag = A_HLW_SEL_VOLTAGE;
} else {
hlw_power_ratio = HLW_PREF;
hlw_voltage_ratio = HLW_UREF;