diff --git a/README.md b/README.md index 091de83e..d92902d9 100644 --- a/README.md +++ b/README.md @@ -82,20 +82,27 @@ Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collab * Support for [different **sensors**](Sensors) * Environment * **DHT11 / DHT12 / DHT22 / DHT21 / AM2301 / Itead's SI7021** - * **BMP280** and **BME280** temperature, humidity (BME280) and pressure sensor by Bosch + * **BMP180**, **BMP280** and **BME280** pressure, humidity (BME280) and temperature (BMP280 & BME280) sensor by Bosch * **TMP35** and **TMP36** analog temperature sensors + * **MAX6675** temperature sensor * **NTC** temperature sensors * **SI7021** temperature and humidity sensor * **SHT3X** temperature and humidity sensor over I2C (Wemos shield) * **AM2320** temperature and humidity sensor over I2C * **Dallas OneWire sensors** like the DS18B20 * **MHZ19** CO2 sensor + * **MICS2710** CO2 & NO2 sensor + * **MICS5525** CO & CO2 sensor * **SenseAir S8** CO2 sensor * **PMSX003/PMS5003T/ST** dust sensors + * **SDS011** dust sensor * **BH1750** luminosity sensor * **GUVAS12SD** UV sensor - * **GEIGER COUNTER** by RH Electronics + * **VEML6075** UV Sensor + * **EZO pH Circuit** + * **Geiger counter** by RH Electronics * **HC-SR04**, **SRF05**, **SRF06**, **DYP-ME007**, **JSN-SR04T** & **Parallax PING)))™** distance sensors + * **VL53L1X** distance sensor * Power monitoring * **HLW8012** using the [HLW8012 Library](https://bitbucket.org/xoseperez/hlw8012) (Sonoff POW) * **CSE7766** and **CSE7759B** power monitor chips @@ -220,70 +227,127 @@ For more information please refer to the [ESPurna Wiki](https://github.com/xosep Here is the list of supported hardware. For more information please refer to the [ESPurna Wiki Hardware page](https://github.com/xoseperez/espurna/wiki/Hardware). + +### Power monitoring devices + +|||| +|---|---|---| +|![BlitzWolf BW-SHP6](images/devices/blitzwolf-bw-shp6.jpg)|![BlitzWolf BW-SHP2](images/devices/blitzwolf-bw-shp2.jpg)|![Power meters based on V9261F](images/devices/generic-v9261f.jpg)| +|**Blitzwolf BW-SHP6**|**Blitzwolf BW-SHP2
(also by Coosa, Goosund, HomeCube, Teckin)**|**Power meters based on V9261F**| +|![Itead Sonoff POW](images/devices/itead-sonoff-pow.jpg)|![Itead Sonoff POW](images/devices/itead-sonoff-pow-r2.jpg)|![Itead Sonoff S31](images/devices/itead-sonoff-s31.jpg)| +|**Itead Sonoff POW**|**Itead Sonoff POW R2**|**Itead Sonoff S31**| +|![Smartlife Mini Smart Socket](images/devices/smartlife-mini-smart-socket.jpg)|![Teckin SP20](images/devices/teckin-sp20.jpg)|![Digoo NX SP202](images/devices/digoo-nx-sp202.jpg)| +|**Smartlife (NETVIP) Mini Smart Socket**|**Teckin SP20**|**Digoo NX SP202**| +|![Vanzavanzu Smart WiFi Plug Mini](images/devices/vanzavanzu-smart-wifi-plug-mini.jpg)||| +|**Vanzavanzu Smart WiFi Plug Mini**||| + +### Embedded switches + |||| |---|---|---| -|![Tinkerman Espurna H](images/devices/tinkerman-espurna-h.jpg)|![Tinkerman RFM69GW](images/devices/tinkerman-rfm69gw.jpg)|| -|**Tinkerman ESPurna H**|**Tinkerman RFM69GW**|| -|![Itead Sonoff RF Bridge](images/devices/itead-sonoff-rfbridge.jpg)|![Itead Sonoff RF](images/devices/itead-sonoff-rf.jpg)|![Itead Sonoff 4CH](images/devices/itead-sonoff-4ch.jpg)| -|**Itead Sonoff RF Bridge**|**Itead Sonoff RF**|**Itead Sonoff 4CH**| -|![Itead Sonoff 4CH Pro](images/devices/itead-sonoff-4ch-pro.jpg)||| -|**Itead Sonoff 4CH Pro**||| -|![Itead Sonoff S31](images/devices/itead-sonoff-s31.jpg)|![BlitzWolf BW-SPP2](images/devices/blitzwolf-bw-shp2.jpg)|![Power meters based on V9261F](images/devices/generic-v9261f.jpg)| -|**Itead Sonoff S31**|**Blitzwolf BW-SHP2
(also by Coosa, Goosund, HomeCube, Teckin)**|**Power meters based on V9261F**| -|![Itead Sonoff POW](images/devices/itead-sonoff-pow.jpg)|![Itead Sonoff POW](images/devices/itead-sonoff-pow-r2.jpg)|![Vanzavanzu Smart WiFi Plug Mini](images/devices/vanzavanzu-smart-wifi-plug-mini.jpg)| -|**Itead Sonoff POW**|**Itead Sonoff POW R2**|**Vanzavanzu Smart WiFi Plug Mini**| |![Itead Sonoff Basic](images/devices/itead-sonoff-basic.jpg)|![Itead Sonoff Dual/Dual R2](images/devices/itead-sonoff-dual.jpg)|![Itead Sonoff TH10/TH16](images/devices/itead-sonoff-th.jpg)| |**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)|![Itead S20](images/devices/itead-s26.jpg)|![Neo Coolcam NAS WR01W](images/devices/neo-coolcam-wifi.jpg)| +|![Itead Sonoff 4CH](images/devices/itead-sonoff-4ch.jpg)|![Itead Sonoff 4CH Pro](images/devices/itead-sonoff-4ch-pro.jpg)|| +|**Itead Sonoff 4CH**|**Itead Sonoff 4CH Pro**|| +|![Allterco Shelly1](images/devices/allterco-shelly1.jpg)|![Allterco Shelly2](images/devices/allterco-shelly2.jpg)|![Jan Goedeke Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.jpg)| +|**Alterco Shelly1**|**Alterco Shelly2**|**Jan Goedeke Wifi Relay (NO/NC)**| +|![EXS Wifi Relay v3.1](images/devices/exs-wifi-relay-v31.jpg)|![EXS Wifi Relay v5.0](images/devices/exs-wifi-relay-v50.jpg)|![Jorge García Wifi + Relays Board Kit](images/devices/jorgegarcia-wifi-relays.jpg)| +|**EXS Wifi Relay v3.1**|**EXS Wifi Relay v5.0**|**Jorge García Wifi + Relays Board Kit**| +|![Allnet ESP8266-UP-Relay](images/devices/allnet-esp8266-up-relay.jpg)|![Bruno Horta's OnOfre](images/devices/bh-onofre.jpg)|![Luani HVIO](images/devices/luani-hvio.jpg)| +|**Allnet ESP8266-UP-Relay**|**Bruno Horta's OnOfre**|**Luani HVIO**| + + +### Wall Sockets + +|||| +|---|---|---| +|![Itead S20](images/devices/itead-s20.jpg)|![Itead S26](images/devices/itead-s26.jpg)|![Neo Coolcam NAS WR01W](images/devices/neo-coolcam-wifi.jpg)| |**Itead S20**|**Itead S26**|**Neo Coolcam NAS WR01W**| -|![Schuko Wifi Plug](images/devices/schuko-wifi-plug.jpg)|![Schuko Wifi Plug V2](images/devices/schuko-wifi-plug-v2.jpg)| -|**Schuko Wifi Plug**|**Schuko Wifi Plug V2**| -|![KMC 70011](images/devices/kmc-70011.jpg)|![Xenon SM-PW702U](images/devices/xenon-sm-pw702u.jpg)|| -**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)| |**Maxcio W-US002S**|**HEYGO HY02**|**YiDian XS-SSA05**| |![WiOn 50055](images/devices/wion-50055.jpg)|![LINGAN SWA1](images/devices/lingan-swa1.jpg)|![HomeCube 16A](images/devices/homecube-16a.jpg)| |**WiOn 50055**|**LINGAN SWA1**|**HomeCube 16A**| |![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg)|![Bestek MRJ1011](images/devices/bestek-mrj1011.jpg)|![Tonbux XS-SSA01](images/devices/tonbux-xs-ssa01.jpg)| |**WorkChoice EcoPlug**|**Bestek MRJ1011**|**Tonbux XS-SSA01**| -|![Tonbux PowerStrip02](images/devices/tonbux-powerstrip02.jpg)|![ForNorm Power Strip](images/devices/fornorm-power-strip.jpg)|![Zhilde ZLD-EU55-W](images/devices/zhilde-zld-eu55-w.jpg)| -|**Tonbux PowerStrip02**|**Fornorm Power Strip**|**Zhilde ZLD-EU55-W**| +|![Schuko Wifi Plug](images/devices/schuko-wifi-plug.jpg)|![Schuko Wifi Plug V2](images/devices/schuko-wifi-plug-v2.jpg)|![KMC 70011](images/devices/kmc-70011.jpg)| +|**Schuko Wifi Plug**|**Schuko Wifi Plug V2**|**KMC 70011**| +|![Xenon SM-PW702U](images/devices/xenon-sm-pw702u.jpg)|![Orvibo B25](images/devices/orvibo-b25.jpg)|![Oukitel P1](images/devices/oukitel-p1.jpg)| +|**Xenon SM-PW702U**|**Orvibo B25**|**Oukitel P1**| +|![Tonbux XS-SSA06](images/devices/tonbux-xs-ssa06.jpg)|![Litesun LA-WF3](images/devices/litesun-la-wf3.jpg)|![Maxcio W DE-004](images/devices/maxcio-w-de004.jpg)| +|**Tonbux XS-SSA06**|**Litesun LA-WF3**|**Maxcio W DE-004**| +|![Hama WiFi Steckdose](images/devices/hama-wifi-steckdose.jpg)|![GBLife RGBW Socket](images/devices/gblife-rgbw-socket.jpg)|| +|**Hama WiFi Steckdose**|**GBLife RGBW Socket**|| + +### Wall switches + +|||| +|---|---|---| |![Itead Sonoff Touch](images/devices/itead-sonoff-touch.jpg)|![Itead Sonoff T1](images/devices/itead-sonoff-t1.jpg)|![YJZK switch](images/devices/yjzk-2gang-switch.jpg)| |**Itead Sonoff Touch**|**Itead Sonoff T1**|**YJZK 1/2/3-gangs switch**| +|![Gosund WS1 / KS-602S](images/devices/gosund-ws1.jpg)||| +|**Gosund WS1 / KS-602S**||| + +### Power strips + +|||| +|---|---|---| +|![Tonbux PowerStrip02](images/devices/tonbux-powerstrip02.jpg)|![ForNorm ZLD-34EU](images/devices/fornorm-power-strip.jpg)|![Zhilde ZLD-EU55-W](images/devices/zhilde-zld-eu55-w.jpg)| +|**Tonbux PowerStrip02**|**Fornorm Power Strip**|**Zhilde ZLD-EU55-W**| + +### Smart lights + +|||| +|---|---|---| |![Itead Slampher](images/devices/itead-slampher.jpg)|![Arilux E27](images/devices/arilux-e27.jpg)|![Itead Sonoff B1](images/devices/itead-sonoff-b1.jpg)| |**Itead Slampher**|**Arilux E27**|**Itead Sonoff B1**| |![AI-Thinker Wifi Light / Noduino OpenLight](images/devices/aithinker-ai-light.jpg)|![Authometion LYT8266](images/devices/authometion-lyt8266.jpg)|![AG-L4](images/devices/ag-l4.jpg)| |**AI-Thinker Wifi Light / Noduino OpenLight**|**Authometion LYT8266**|**AG-L4**| |![Lohas 9W](images/devices/lohas-9w.jpg)|![Xiaomi Smart Desk Lamp](images/devices/xiaomi-smart-desk-lamp.jpg)|![iWoole LED Table Lamp](images/devices/iwoole-led-table-lamp.jpg)| |**Lohas 9W**|**Xiaomi Smart Desk Lamp**|**iWoole LED Table Lamp**| -|![Itead Sonoff LED](images/devices/itead-sonoff-led.jpg)|![Itead BN-SZ01](images/devices/itead-bn-sz01.jpg)|![InterMitTech QuinLED 2.6](images/devices/intermittech-quinled-2.6.jpg)| -|**Itead Sonoff LED**|**Itead BN-SZ01**|**InterMitTech QuinLED 2.6**| +|![Itead Sonoff LED](images/devices/itead-sonoff-led.jpg)|![Itead BN-SZ01](images/devices/itead-bn-sz01.jpg)|![Lombox LUX Nova 2](images/devices/lombex-lux-nova2.jpg)| +|**Itead Sonoff LED**|**Itead BN-SZ01**|**Lombex LUX Nova 2 (white and color)**| |![Arilux AL-LC01 (RGB)](images/devices/arilux-al-lc01.jpg)|![Arilux AL-LC02 (RGBW)](images/devices/arilux-al-lc02.jpg)|![Arilux AL-LC06 (RGBWWCW)](images/devices/arilux-al-lc06.jpg)| |**Arilux AL-LC01 (RGB)**|**Arilux AL-LC02 (RGBW)**|**Arilux AL-LC06 (RGBWWCW)**| |![Arilux AL-LC11 (RGBWWW) & RF](images/devices/arilux-al-lc11.jpg)|![MagicHome LED Controller (1.0 and 2.x)](images/devices/magichome-led-controller.jpg)|![Huacanxing H801/802](images/devices/huacanxing-h801.jpg)| -|**Arilux AL-LC11 (RGBWWW) & RF**|**MagicHome LED Controller (1.0/2.x)**|**Huacanxing H801/802**| +|**Arilux AL-LC11 (RGBWWW) & RF**|**MagicHome LED Controller (1.0/2.x, also ZJ WFMN A/B11)**|**Huacanxing H801/802**| + +### Radio links / gateways + +|||| +|---|---|---| +|![Tinkerman RFM69GW](images/devices/tinkerman-rfm69gw.jpg)|![Itead Sonoff RF Bridge](images/devices/itead-sonoff-rfbridge.jpg)|![Itead Sonoff RF](images/devices/itead-sonoff-rf.jpg)| +|**Tinkerman RFM69GW**|**Itead Sonoff RF Bridge**|**Itead Sonoff RF**| + +### Other devices + +|||| +|---|---|---| +|![Tonbux Mosquito Killer](images/devices/tonbux-mosquito-killer.jpg)|![Itead Sonoff IFAN02](images/devices/itead-sonoff-ifan02.jpg)|| +|**Tonbux Mosquito Killer**|**Itead Sonoff IFAN02**||| + +### Custom & Development boards + +|||| +|---|---|---| +|![Tinkerman Espurna H](images/devices/tinkerman-espurna-h.jpg)||![NodeMCU](images/devices/nodemcu-lolin-v3.jpg)| +|**Tinkerman ESPurna H**||**NodeMCU Lolin V3**| |![Itead Sonoff SV](images/devices/itead-sonoff-sv.jpg)|![Itead 1CH Inching](images/devices/itead-1ch-inching.jpg)|![Itead Motor Clockwise/Anticlockwise](images/devices/itead-motor.jpg)| |**Itead Sonoff SV**|**Itead 1CH Inching**|**Itead Motor Clockwise/Anticlockwise**| -|![Jan Goedeke Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.jpg)|![Jorge García Wifi + Relays Board Kit](images/devices/jorgegarcia-wifi-relays.jpg)|![EXS Wifi Relay v3.1](images/devices/exs-wifi-relay-v31.jpg)| -|**Jan Goedeke Wifi Relay (NO/NC)**|**Jorge García Wifi + Relays Board Kit**|**EXS Wifi Relay v3.1**| -|![EXS Wifi Relay v5.0](images/devices/exs-wifi-relay-v50.jpg)|![Allterco Shelly1](images/devices/allterco-shelly1.jpg)|![Allterco Shelly2](images/devices/allterco-shelly2.jpg)| -|**EXS Wifi Relay v5.0**|**Alterco Shelly1**|**Alterco Shelly2**| -|![ManCaveMade ESP-Live](images/devices/mancavemade-esp-live.jpg)|![Wemos D1 Mini Relay Shield](images/devices/wemos-d1-mini-relayshield.jpg)|![Witty Cloud](images/devices/witty-cloud.jpg)| -|**ManCaveMade ESP-Live**|**Wemos D1 Mini Relay Shield**|**Witty Cloud**| +|![ManCaveMade ESP-Live](images/devices/mancavemade-esp-live.jpg)|![Wemos D1 Mini Relay Shield](images/devices/wemos-d1-relayshield.jpg)|![Gizwits Witty Cloud](images/devices/witty-cloud.jpg)| +|**ManCaveMade ESP-Live**|**Wemos D1 Mini Relay Shield**|**Gizwits Witty Cloud**| |![IKE ESPike](images/devices/ike-espike.jpg)|![Pilotak ESP DIN](images/devices/pilotak-esp-din.jpg)|![Arniex Swifitch](images/devices/arniex-swifitch.jpg)| |**IKE ESPike**|**Pilotak ESP DIN|**Arniex Swifitch**| |![Heltec Touch Relay](images/devices/heltec-touch-relay.jpg)|![Generic Relay v4.0](images/devices/generic-relay-40.jpg)|![Generic RGBLed v1.0](images/devices/generic-rgbled-10.jpg)| |**Heltec Touch Relay**|**Generic Relay v4.0**|**Generic RGBLed v1.0**| -|![Generic DHT11 v1.0](images/devices/generic-dht11-10.jpg)|![Generic DS18B20 v1.0](images/devices/generic-ds18b20-10.jpg)|![Bruno Horta's OnOfre](images/devices/bh-onofre.jpg)| -|**Generic DHT11 v1.0**|**Generic DS18B20 v1.0**|**Bruno Horta's OnOfre**| -|![Allnet ESP8266-UP-Relay](images/devices/allnet-esp8266-up-relay.jpg)|![RH Electronics Geiger Counter](images/devices/generic-geiger-diy.png)|![Luani HVIO](images/devices/luani-hvio.jpg)| -|**Allnet ESP8266-UP-Relay**|**RH Electronics Geiger Counter**|**Luani HVIO**| -|![Phyx ESP12 RGBW](images/devices/phyx-esp12-rgbw.jpg)||| -|**Phyx ESP12 RGBW**|||| -|![Tonbux Mosquito Killer](images/devices/tonbux-mosquito-killer.jpg)|![Itead Sonoff IFAN02](images/devices/itead-sonoff-ifan02.jpg)|| -|**Tonbux Mosquito Killer**|**Itead Sonoff IFAN02**||| +|![Generic DHT11 v1.0](images/devices/generic-dht11-10.jpg)|![Generic DS18B20 v1.0](images/devices/generic-ds18b20-10.jpg)|![InterMitTech QuinLED 2.6](images/devices/intermittech-quinled-2.6.jpg)| +|**Generic DHT11 v1.0**|**Generic DS18B20 v1.0**|**InterMitTech QuinLED 2.6**| +|![Phyx ESP12 RGBW](images/devices/phyx-esp12-rgbw.jpg)|![RH Electronics Geiger Counter](images/devices/generic-geiger-diy.png)|![Green ESP Relay](images/devices/green-esp-relay.jpg)| +|**Phyx ESP12 RGBW**|**RH Electronics Geiger Counter**|**Green ESP Relay**| +|![Foxel Lightfox Dual](images/devices/foxel-lightfox-dual.jpg)||| +|**Foxel Lightfox Dual**||| + **Other supported boards (beta):** KMC 4 Outlet, Gosund WS1, MakerFocus Intelligent Module LM33 for Lamps diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index 45a7e87e..a48a268a 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -26,11 +26,11 @@ //#define DIGOO_NX_SP202 //#define ELECTRODRAGON_WIFI_IOT //#define ESPURNA_CORE -//#define ESTINK_WIFI_POWER_STRIP //#define EUROMATE_WIFI_STECKER_SCHUKO //#define EUROMATE_WIFI_STECKER_SCHUKO_V2 //#define EXS_WIFI_RELAY_V31 //#define EXS_WIFI_RELAY_V50 +//#define FORNORM_ZLD_34EU //#define FOXEL_LIGHTFOX_DUAL //#define GBLIFE_RGBW_SOCKET //#define GENERIC_8CH @@ -42,7 +42,6 @@ //#define GENERIC_ESP01S_RGBLED_V10 //#define GENERIC_V9261F //#define GIZWITS_WITTY_CLOUD -//#define GOSUND_SP1_V23 //#define GOSUND_WS1 //#define GREEN_ESP8266RELAY //#define HAMA_WIFI_STECKDOSE_00176533 diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index e91cf8e3..9dd0094d 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -2103,14 +2103,10 @@ #define LED1_PIN_INVERSE 1 // ----------------------------------------------------------------------------- -// Oukitel - P1 +// Oukitel P1 Smart Plug +// https://www.amazon.com/Docooler-OUKITEL-Control-Wireless-Adaptor/dp/B07J3BYFJX/ref=sr_1_fkmrnull_2?keywords=oukitel+p1+smart+switch&qid=1550424399&s=gateway&sr=8-2-fkmrnull // ----------------------------------------------------------------------------- - #elif defined(OUKITEL_P1) - // ----------------------------------------------------------------------------- - // Oukitel P1 Smart Plug - // https://www.amazon.com/Docooler-OUKITEL-Control-Wireless-Adaptor/dp/B07J3BYFJX/ref=sr_1_fkmrnull_2?keywords=oukitel+p1+smart+switch&qid=1550424399&s=gateway&sr=8-2-fkmrnull - // ----------------------------------------------------------------------------- // Info #define MANUFACTURER "Oukitel" @@ -2645,17 +2641,16 @@ // ------------------------------------------------------------------------------ -// Estink Wifi Power Strip -// https://www.amazon.de/Steckdosenleiste-Ladeger%C3%A4t-Sprachsteuerung-SmartphonesTablets-Android/dp/B0796W5FZY // Fornorm Wi-Fi USB Extension Socket (ZLD-34EU) // https://www.aliexpress.com/item/Fornorm-WiFi-Extension-Socket-with-Surge-Protector-Smart-Power-Strip-3-Outlets-and-4-USB-Charging/32849743948.html +// Also: Estink Wifi Power Strip // ----------------------------------------------------------------------------- -#elif defined(ESTINK_WIFI_POWER_STRIP) +#elif defined(FORNORM_ZLD_34EU) // Info - #define MANUFACTURER "ESTINK" - #define DEVICE "WIFI_POWER_STRIP" + #define MANUFACTURER "FORNORM" + #define DEVICE "ZLD_34EU" // Disable UART noise since this board uses GPIO3 #define DEBUG_SERIAL_SUPPORT 0 @@ -2856,6 +2851,7 @@ // ----------------------------------------------------------------------------- // Several boards under different names uing a power chip labelled BL0937 or HJL-01 +// Also model number KS-602S // ----------------------------------------------------------------------------- #elif defined(GOSUND_WS1) @@ -2877,44 +2873,6 @@ #define LED1_PIN 1 #define LED1_PIN_INVERSE 1 -// This one is the same as the BLITZWOLF_BWSHPX_V23 -#elif defined(GOSUND_SP1_V23) - - // Info - #define MANUFACTURER "GOSUND" - #define DEVICE "SP1_v23" - - // Buttons - #define BUTTON1_PIN 3 - #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH - #define BUTTON1_RELAY 1 - - // Relays - #define RELAY1_PIN 14 - #define RELAY1_TYPE RELAY_TYPE_NORMAL - - // LEDs - #define LED1_PIN 1 - #define LED1_PIN_INVERSE 1 - #define LED2_PIN 13 - #define LED2_PIN_INVERSE 0 - #define LED2_MODE LED_MODE_FINDME - #define LED2_RELAY 1 - - // HJL01 / BL0937 - #ifndef HLW8012_SUPPORT - #define HLW8012_SUPPORT 1 - #endif - #define HLW8012_SEL_PIN 12 - #define HLW8012_CF1_PIN 5 - #define HLW8012_CF_PIN 4 - - #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 - // ---------------------------------------------------------------------------------------- // Homecube 16A is similar but some pins differ and it also has RGB LEDs // https://www.amazon.de/gp/product/B07D7RVF56/ref=oh_aui_detailpage_o00_s01?ie=UTF8&psc=1 @@ -3321,8 +3279,10 @@ #define LIGHT_CH4_INVERSE 0 // ---------------------------------------------------------------------------------------- -// Smart life Mini Smart Socket is similar Homecube 16A but some GPIOs differ -// https://www.ebay.de/itm/Smart-Steckdose-WIFI-WLAN-Amazon-Alexa-Fernbedienung-Home-Socket-Zeitschaltuh-DE/123352026749?hash=item1cb85a8e7d:g:IasAAOSwk6dbj390 +// Smart life Mini Smart Socket is similar Homecube 16A but some GPIOs differ +// https://www.ebay.de/itm/Smart-Steckdose-WIFI-WLAN-Amazon-Alexa-Fernbedienung-Home-Socket-Zeitschaltuh-DE/123352026749?hash=item1cb85a8e7d:g:IasAAOSwk6dbj390 +// Also labeled NETVIP +// https://www.amazon.es/Inteligente-NETVIP-Inal%C3%A1mbrico-Interruptor-Funciona/dp/B07KH8YWS5 // ---------------------------------------------------------------------------------------- #elif defined(SMARTLIFE_MINI_SMART_SOCKET) diff --git a/code/espurna/migrate.ino b/code/espurna/migrate.ino index e0e390fe..de0880f4 100644 --- a/code/espurna/migrate.ino +++ b/code/espurna/migrate.ino @@ -986,7 +986,7 @@ void migrate() { setSetting("relayType", 0, RELAY_TYPE_NORMAL); setSetting("relayType", 1, RELAY_TYPE_NORMAL); - #elif defined(ESTINK_WIFI_POWER_STRIP) + #elif defined(FORNORM_ZLD_34EU) setSetting("board", 77); setSetting("btnGPIO", 0, 16); diff --git a/code/espurna/sensors/SDS011Sensor.h b/code/espurna/sensors/SDS011Sensor.h index 18f496a1..477af425 100644 --- a/code/espurna/sensors/SDS011Sensor.h +++ b/code/espurna/sensors/SDS011Sensor.h @@ -1,5 +1,5 @@ // ----------------------------------------------------------------------------- -// SDS011 particulates sensor +// SDS011 dust sensor // Based on: https://github.com/ricki-z/SDS011 // // Uses SoftwareSerial library diff --git a/code/platformio.ini b/code/platformio.ini index b9805c7b..78dc6660 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -2457,7 +2457,7 @@ board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DESTINK_WIFI_POWER_STRIP +build_flags = ${common.build_flags_1m0m} -DFORNORM_ZLD_34EU monitor_speed = ${common.monitor_speed} extra_scripts = ${common.extra_scripts} @@ -2468,7 +2468,7 @@ board = ${common.board_1m} board_build.flash_mode = ${common.flash_mode} lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m0m} -DESTINK_WIFI_POWER_STRIP +build_flags = ${common.build_flags_1m0m} -DFORNORM_ZLD_34EU upload_speed = ${common.upload_speed} upload_port = ${common.upload_port} upload_flags = ${common.upload_flags} diff --git a/images/devices/blitzwolf-bw-shp6.jpg b/images/devices/blitzwolf-bw-shp6.jpg new file mode 100644 index 00000000..243981c9 Binary files /dev/null and b/images/devices/blitzwolf-bw-shp6.jpg differ diff --git a/images/devices/digoo-nx-sp202.jpg b/images/devices/digoo-nx-sp202.jpg new file mode 100644 index 00000000..dc3f3a5b Binary files /dev/null and b/images/devices/digoo-nx-sp202.jpg differ diff --git a/images/devices/foxel-lightfox-dual.jpg b/images/devices/foxel-lightfox-dual.jpg new file mode 100644 index 00000000..eaac2458 Binary files /dev/null and b/images/devices/foxel-lightfox-dual.jpg differ diff --git a/images/devices/gblife-rgbw-socket.jpg b/images/devices/gblife-rgbw-socket.jpg new file mode 100644 index 00000000..38f09c59 Binary files /dev/null and b/images/devices/gblife-rgbw-socket.jpg differ diff --git a/images/devices/gosund-ws1.jpg b/images/devices/gosund-ws1.jpg new file mode 100644 index 00000000..6531d9a5 Binary files /dev/null and b/images/devices/gosund-ws1.jpg differ diff --git a/images/devices/green-esp-relay.jpg b/images/devices/green-esp-relay.jpg new file mode 100644 index 00000000..e3df6d21 Binary files /dev/null and b/images/devices/green-esp-relay.jpg differ diff --git a/images/devices/hama-wifi-steckdose.jpg b/images/devices/hama-wifi-steckdose.jpg new file mode 100644 index 00000000..d04a1579 Binary files /dev/null and b/images/devices/hama-wifi-steckdose.jpg differ diff --git a/images/devices/litesun-la-wf3.jpg b/images/devices/litesun-la-wf3.jpg new file mode 100644 index 00000000..1497100a Binary files /dev/null and b/images/devices/litesun-la-wf3.jpg differ diff --git a/images/devices/lombex-lux-nova2.jpg b/images/devices/lombex-lux-nova2.jpg new file mode 100644 index 00000000..a6314b83 Binary files /dev/null and b/images/devices/lombex-lux-nova2.jpg differ diff --git a/images/devices/lyasi-rgb-led.jpg b/images/devices/lyasi-rgb-led.jpg new file mode 100644 index 00000000..01e41cfe Binary files /dev/null and b/images/devices/lyasi-rgb-led.jpg differ diff --git a/images/devices/maxcio-w-de004.jpg b/images/devices/maxcio-w-de004.jpg new file mode 100644 index 00000000..86fac5e2 Binary files /dev/null and b/images/devices/maxcio-w-de004.jpg differ diff --git a/images/devices/orvibo-b25.jpg b/images/devices/orvibo-b25.jpg new file mode 100644 index 00000000..3a40d544 Binary files /dev/null and b/images/devices/orvibo-b25.jpg differ diff --git a/images/devices/oukitel-p1.jpg b/images/devices/oukitel-p1.jpg new file mode 100644 index 00000000..b0e0a0a2 Binary files /dev/null and b/images/devices/oukitel-p1.jpg differ diff --git a/images/devices/smartlife-mini-smart-socket.jpg b/images/devices/smartlife-mini-smart-socket.jpg new file mode 100644 index 00000000..7c38997b Binary files /dev/null and b/images/devices/smartlife-mini-smart-socket.jpg differ diff --git a/images/devices/teckin-sp20.jpg b/images/devices/teckin-sp20.jpg new file mode 100644 index 00000000..126e9dd7 Binary files /dev/null and b/images/devices/teckin-sp20.jpg differ diff --git a/images/devices/tonbux-xs-ssa06.jpg b/images/devices/tonbux-xs-ssa06.jpg index 0aad3a96..670b2475 100644 Binary files a/images/devices/tonbux-xs-ssa06.jpg and b/images/devices/tonbux-xs-ssa06.jpg differ diff --git a/images/devices/wemos-d1-mini-relayshield.jpg b/images/devices/wemos-d1-mini-relayshield.jpg deleted file mode 100644 index cb963e56..00000000 Binary files a/images/devices/wemos-d1-mini-relayshield.jpg and /dev/null differ diff --git a/images/devices/wemos-d1-relayshield.jpg b/images/devices/wemos-d1-relayshield.jpg new file mode 100644 index 00000000..1e9f8293 Binary files /dev/null and b/images/devices/wemos-d1-relayshield.jpg differ