diff --git a/README.md b/README.md index 3d1412f5..40165db7 100644 --- a/README.md +++ b/README.md @@ -223,8 +223,8 @@ Here is the list of supported hardware. For more information please refer to the |**Itead Sonoff Basic**|**Itead Sonoff Dual/Dual R2**|**Itead Sonoff TH10/TH16**| |![Electrodragon WiFi IOT](images/devices/electrodragon-wifi-iot.jpg)|![OpenEnergyMonitor WiFi MQTT Relay / Thermostat](images/devices/openenergymonitor-mqtt-relay.jpg)|| |**Electrodragon WiFi IOT**|**OpenEnergyMonitor WiFi MQTT Relay / Thermostat**|| -|![Itead S20](images/devices/itead-s20.jpg)|![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg)|![Neo Coolcam Wifi](images/devices/neo-coolcam-wifi.jpg)| -|**Itead S20**|**WorkChoice EcoPlug**|**Neo Coolcam WiFi**| +|![Itead S20](images/devices/itead-s20.jpg)|![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg)|![Neo Coolcam NAS WR01W](images/devices/neo-coolcam-wifi.jpg)| +|**Itead S20**|**WorkChoice EcoPlug**|**Neo Coolcam NAS WR01W**| |![Schuko Wifi Plug](images/devices/schuko-wifi-plug.jpg)|![KMC 70011](images/devices/kmc-70011.jpg)|![Xenon SM-PW702U](images/devices/xenon-sm-pw702u.jpg)| |**Schuko Wifi Plug**|**KMC 70011**|**Xenon SM-PW702U**| |![Maxcio W-US002S](images/devices/maxcio-w-us002s.jpg)|![HEYGO HY02](images/devices/heygo-hy02.jpg)|![YiDian XS-SSA05](images/devices/yidian-xs-ssa05.jpg)| diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index b62301d8..186060d9 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -82,7 +82,7 @@ //#define LUANI_HVIO //#define ALLNET_4DUINO_IOT_WLAN_RELAIS //#define TONBUX_MOSQUITO_KILLER -//#define NEO_COOLCAM_POWER_PLUG_WIFI +//#define NEO_COOLCAM_NAS_WR01W //#define ESTINK_WIFI_POWER_STRIP //#define PILOTAK_ESP_DIN_V1 //#define BLITZWOLF_BWSHP2 diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 067a02dc..dd268327 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -2164,15 +2164,16 @@ #define LED4_RELAY 1 // ----------------------------------------------------------------------------- -// NEO Coolcam Power Plug +// NEO Coolcam NAS-WR01W Wifi Smart Power Plug // https://es.aliexpress.com/item/-/32854589733.html?spm=a219c.12010608.0.0.6d084e68xX0y5N +// https://www.fasttech.com/product/9649426-neo-coolcam-nas-wr01w-wifi-smart-power-plug-eu // ----------------------------------------------------------------------------- -#elif defined(NEO_COOLCAM_POWER_PLUG_WIFI) +#elif defined(NEO_COOLCAM_NAS_WR01W) // Info #define MANUFACTURER "NEO_COOLCAM" - #define DEVICE "POWER_PLUG_WIFI" + #define DEVICE "NAS_WR01W" // Buttons #define BUTTON1_PIN 13 @@ -2278,33 +2279,33 @@ #elif defined(BLITZWOLF_BWSHP2) // Info - #define MANUFACTURER "BLITZWOLF" - #define DEVICE "BWSHP2" + #define MANUFACTURER "BLITZWOLF" + #define DEVICE "BWSHP2" // Buttons - #define BUTTON1_PIN 13 - #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH - #define BUTTON1_RELAY 1 + #define BUTTON1_PIN 13 + #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH + #define BUTTON1_RELAY 1 // Relays - #define RELAY1_PIN 15 - #define RELAY1_TYPE RELAY_TYPE_NORMAL + #define RELAY1_PIN 15 + #define RELAY1_TYPE RELAY_TYPE_NORMAL // LEDs - #define LED1_PIN 2 - #define LED1_PIN_INVERSE 1 - #define LED2_PIN 0 - #define LED2_PIN_INVERSE 1 - #define LED2_MODE LED_MODE_FINDME - #define LED2_RELAY 1 + #define LED1_PIN 2 + #define LED1_PIN_INVERSE 1 + #define LED2_PIN 0 + #define LED2_PIN_INVERSE 1 + #define LED2_MODE LED_MODE_FINDME + #define LED2_RELAY 1 // HJL01 / BL0937 #ifndef HLW8012_SUPPORT - #define HLW8012_SUPPORT 1 + #define HLW8012_SUPPORT 1 #endif - #define HLW8012_SEL_PIN 12 - #define HLW8012_CF1_PIN 14 - #define HLW8012_CF_PIN 5 + #define HLW8012_SEL_PIN 12 + #define HLW8012_CF1_PIN 14 + #define HLW8012_CF_PIN 5 #define HLW8012_SEL_CURRENT LOW #define HLW8012_CURRENT_RATIO 25740 @@ -2312,6 +2313,50 @@ #define HLW8012_POWER_RATIO 3414290 #define HLW8012_INTERRUPT_ON FALLING +// ----------------------------------------------------------------------------- +// VANZAVANZU Smart Outlet Socket (based on BL0937 or HJL-01) +// https://www.amazon.com/Smart-Plug-Wifi-Mini-VANZAVANZU/dp/B078PHD6S5 +// ----------------------------------------------------------------------------- + +#elif defined(VANZAVANZU_SMART_WIFI_PLUG_MINI) + + // Info + #define MANUFACTURER "VANZAVANZU" + #define DEVICE "SMART_WIFI_PLUG_MINI" + + // Buttons + #define BUTTON1_PIN 13 + #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH + #define BUTTON1_RELAY 1 + + // Relays + #define RELAY1_PIN 15 + #define RELAY1_TYPE RELAY_TYPE_NORMAL + + // LEDs + #define LED1_PIN 2 + #define LED1_PIN_INVERSE 1 + #define LED2_PIN 0 + #define LED2_PIN_INVERSE 1 + #define LED2_MODE LED_MODE_FINDME + #define LED2_RELAY 1 + + // Disable UART noise + #define DEBUG_SERIAL_SUPPORT 0 + + // HJL01 / BL0937 + #ifndef HLW8012_SUPPORT + #define HLW8012_SUPPORT 1 + #endif + #define HLW8012_SEL_PIN 3 + #define HLW8012_CF1_PIN 14 + #define HLW8012_CF_PIN 5 + + #define HLW8012_SEL_CURRENT LOW + #define HLW8012_CURRENT_RATIO 25740 + #define HLW8012_VOLTAGE_RATIO 313400 + #define HLW8012_POWER_RATIO 3414290 + #define HLW8012_INTERRUPT_ON FALLING // ----------------------------------------------------------------------------- // TEST boards (do not use!!) diff --git a/code/espurna/migrate.ino b/code/espurna/migrate.ino index cc4bfec4..806f2de9 100644 --- a/code/espurna/migrate.ino +++ b/code/espurna/migrate.ino @@ -953,7 +953,7 @@ void migrate() { setSetting("relayGPIO", 0, 5); setSetting("relayType", 0, RELAY_TYPE_NORMAL); - #elif defined(NEO_COOLCAM_POWER_PLUG_WIFI) + #elif defined(NEO_COOLCAM_NAS_WR01W) setSetting("board", 75); setSetting("ledGPIO", 0, 4); diff --git a/code/platformio.ini b/code/platformio.ini index a3018e64..1d48076e 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -2143,7 +2143,7 @@ board = esp01_1m board_build.flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_POWER_PLUG_WIFI +build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_NAS_WR01W monitor_speed = 115200 extra_scripts = ${common.extra_scripts} modules = ${common.modules} @@ -2155,7 +2155,7 @@ board = esp01_1m board_build.flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_POWER_PLUG_WIFI +build_flags = ${common.build_flags_4m1m} -DNEO_COOLCAM_NAS_WR01W upload_speed = 115200 upload_port = "${env.ESPURNA_IP}" upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266