diff --git a/README.md b/README.md index 1b026242..cb301092 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,8 @@ For more information please refer to the [ESPurna Wiki](https://bitbucket.org/xo ## Supported hardware +Here is the list of supported hardware. For more information please refer to the [ESPurna Wiki Hardware page](https://bitbucket.org/xoseperez/espurna/wiki/Hardware). + |||| |-|-|-| |![IteadStudio S20](images/devices/s20.jpg)|![IteadStudio Slampher](images/devices/slampher.jpg)|![IteadStudio Sonoff 4CH](images/devices/sonoff-4ch.jpg)| @@ -62,8 +64,8 @@ For more information please refer to the [ESPurna Wiki](https://bitbucket.org/xo |**IteadStudio Sonoff RF**|**IteadStudio Sonoff SV**|**IteadStudio Sonoff Touch**| |![Wemos D1 Mini Relay Shield](images/devices/d1mini.jpg)|![Electrodragon Relay Board](images/devices/electrodragon-relay-board.jpg)|![WorkChoice EcoPlug](images/devices/workchoice-ecoplug.jpg)| |**Wemos D1 Mini Relay Shield**|**Electrodragon Relay Board**|**WorkChoice EcoPlug**| -|![JanGoe Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.png)|![OpenEnergyMonitor WiFi MQTT Relay / Thermostat](images/devices/mqtt-relay.jpg)|| -|**JanGoe Wifi Relay (NO/NC)**|**OpenEnergyMonitor WiFi MQTT Relay / Thermostat**|| +|![JanGoe Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.png)|![OpenEnergyMonitor WiFi MQTT Relay / Thermostat](images/devices/mqtt-relay.jpg)|![Jorge García Wifi + Relays Board Kit](images/devices/jorgegarcia-wifi-relays-board-kit.jpg)| +|**JanGoe Wifi Relay (NO/NC)**|**OpenEnergyMonitor WiFi MQTT Relay / Thermostat**|**Jorge García Wifi + Relays Board Kit**| ## License diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index 437148c3..0279717b 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -27,8 +27,8 @@ //#define ECOPLUG //#define WIFI_RELAY_NC //#define WIFI_RELAY_NO -//#define ESPURNA //#define MQTT_RELAY +//#define WIFI_RELAYS_BOARD_KIT //-------------------------------------------------------------------------------- // Features (values below are non-default values) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 74796a3a..de011a40 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -228,7 +228,8 @@ #define LED1_PIN_INVERSE 0 // ----------------------------------------------------------------------------- -// JanGoe Wifi Relay (https://github.com/JanGoe/esp8266-wifi-relay) +// JanGoe Wifi Relay +// https://github.com/JanGoe/esp8266-wifi-relay // ----------------------------------------------------------------------------- #elif defined(WIFI_RELAY_NC) @@ -262,20 +263,19 @@ #define RELAY2_PIN_INVERSE 0 // ----------------------------------------------------------------------------- -// ESPurna board (still beta) +// Jorge García Wifi+Relays Board Kit +// https://www.tindie.com/products/jorgegarciadev/wifi--relays-board-kit +// https://github.com/jorgegarciadev/wifikit // ----------------------------------------------------------------------------- -#elif defined(ESPURNA) +#elif defined(WIFI_RELAYS_BOARD_KIT) - #define MANUFACTURER "TINKERMAN" - #define DEVICE "ESPURNA" - #define BUTTON1_PIN 0 - #define BUTTON1_RELAY 1 - #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH - #define RELAY1_PIN 12 - #define RELAY1_PIN_INVERSE 0 - #define LED1_PIN 13 - #define LED1_PIN_INVERSE 0 + #define MANUFACTURER "JORGE_GARCIA" + #define DEVICE "WIFI_RELAYS_BOARD_KIT" + #define RELAY1_PIN 0 + #define RELAY1_PIN_INVERSE 1 + #define RELAY2_PIN 2 + #define RELAY2_PIN_INVERSE 1 // ----------------------------------------------------------------------------- // WiFi MQTT Relay / Thermostat diff --git a/code/platformio.ini b/code/platformio.ini index 0a9f665e..d60fd530 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -89,7 +89,7 @@ extra_script = pio_hooks.py build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF upload_speed = 115200 upload_port = "192.168.4.1" -upload_flags = --auth=Algernon1 --port 8266 +upload_flags = --auth=fibonacci --port 8266 [env:sonoff-dht22-debug] platform = espressif8266 @@ -119,7 +119,7 @@ extra_script = pio_hooks.py build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF -DENABLE_DS18B20=1 upload_speed = 115200 upload_port = "192.168.4.1" -upload_flags = --auth=Algernon1 --port 8266 +upload_flags = --auth=fibonacci --port 8266 [env:sonoff-pow-debug] platform = espressif8266 @@ -140,7 +140,7 @@ extra_script = pio_hooks.py build_flags = -g -Wl,-Tesp8266.flash.1m128.ld -DDEBUG_PORT=Serial -DSONOFF_POW upload_speed = 115200 upload_port = "192.168.4.1" -upload_flags = --auth=Algernon1 --port 8266 +upload_flags = --auth=fibonacci --port 8266 [env:sonoff-dual-debug] platform = espressif8266 @@ -318,3 +318,24 @@ build_flags = -g -DDEBUG_PORT=Serial -DMQTT_RELAY -DENABLE_DS18B20=1 upload_speed = 115200 upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 + +[env:wifi-relays-debug] +platform = espressif8266 +framework = arduino +board = esp01_1m +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +extra_script = pio_hooks.py +build_flags = -g -DDEBUG_PORT=Serial -DWIFI_RELAYS_BOARD_KIT + +[env:wifi-relays-debug-ota] +platform = espressif8266 +framework = arduino +board = esp01_1m +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +extra_script = pio_hooks.py +build_flags = -g -DDEBUG_PORT=Serial -DWIFI_RELAYS_BOARD_KIT +upload_speed = 115200 +upload_port = "192.168.4.1" +upload_flags = --auth=fibonacci --port 8266 diff --git a/images/devices/jorgegarcia-wifi-relays-board-kit.jpg b/images/devices/jorgegarcia-wifi-relays-board-kit.jpg new file mode 100644 index 00000000..a73a9069 Binary files /dev/null and b/images/devices/jorgegarcia-wifi-relays-board-kit.jpg differ