diff --git a/README.md b/README.md index 7ed0c8b9..075de472 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,8 @@ Here is the list of supported hardware. For more information please refer to the |**Jan Goedeke Wifi Relay (NO/NC)**|**Jorge García Wifi + Relays Board Kit**|**EXS Wifi Relay v3.1**| |![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**| +|![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**| ||| |**YJZK 2-gang switch**|**STM_RELAY**|| diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index 35c36836..7ebf06ad 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -71,6 +71,9 @@ //#define GREEN_ESP8266RELAY //#define IKE_ESPIKE //#define ARNIEX_SWIFITCH +//#define GENERIC_ESP01SRELAY40 +//#define GENERIC_ESP01SRGBLED10 +//#define HELTEC_TOUCHRELAY //-------------------------------------------------------------------------------- // Features (values below are non-default values) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 0f202cc9..440ce4a8 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -1797,6 +1797,68 @@ #define LED1_PIN 12 // D6 #define LED1_PIN_INVERSE 1 +// ----------------------------------------------------------------------------- +// ESP-01S RELAY v4.0 +// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180404024035&SearchText=esp-01s+relay +// ----------------------------------------------------------------------------- + +#elif defined(GENERIC_ESP01SRELAY40) + + // Info + #define MANUFACTURER "GENERIC" + #define DEVICE "ESP01S_RELAY_40" + + // Relays + #define RELAY1_PIN 0 + #define RELAY1_TYPE RELAY_TYPE_NORMAL + + // LEDs + #define LED1_PIN 2 + #define LED1_PIN_INVERSE 0 + +// ----------------------------------------------------------------------------- +// ESP-01S RGB LED v1.0 (some sold with ws2818) +// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180404023816&SearchText=esp-01s+led+controller +// ----------------------------------------------------------------------------- + +#elif defined(GENERIC_ESP01SRGBLED10) + + // Info + #define MANUFACTURER "GENERIC" + #define DEVICE "ESP01S_RGBLED_10" + + // This board is sold as RGB LED module BUT it has on board 3 pin ph2.0 connector (VCC, GPIO2, GND) + // so, if you wish, you may connect LED, BUTTON, RELAY, SENSOR etc. + + // Buttons + //#define BUTTON1_PIN 2 + + // Relays + //#define RELAY1_PIN 2 + + // LEDs + #define LED1_PIN 2 + +// ----------------------------------------------------------------------------- +// Heltec Touch Relay +// https://www.aliexpress.com/wholesale?catId=0&initiative_id=SB_20180408043114&SearchText=esp8266+touch+relay +// ----------------------------------------------------------------------------- + +#elif defined(HELTEC_TOUCHRELAY) + + // Info + #define MANUFACTURER "HELTEC" + #define DEVICE "TOUCH_RELAY" + + // Buttons + #define BUTTON1_PIN 14 + #define BUTTON1_RELAY 1 + #define BUTTON1_MODE BUTTON_PUSHBUTTON + + // Relays + #define RELAY1_PIN 12 + #define RELAY1_TYPE RELAY_TYPE_NORMAL + // ----------------------------------------------------------------------------- // TEST boards (do not use!!) // ----------------------------------------------------------------------------- diff --git a/code/espurna/migrate.ino b/code/espurna/migrate.ino index 93610332..81f79c1b 100644 --- a/code/espurna/migrate.ino +++ b/code/espurna/migrate.ino @@ -843,11 +843,42 @@ void migrate() { setSetting("btnGPIO", 2, 13); setSetting("btnRelay", 2, 2); setSetting("relayGPIO", 0, 4); - setSetting("relayType", 0, RELAY_TYPE_INVERSE); + setSetting("relayType", 0, RELAY_TYPE_NORMAL); setSetting("relayGPIO", 1, 5); - setSetting("relayType", 1, RELAY_TYPE_INVERSE); + setSetting("relayType", 1, RELAY_TYPE_NORMAL); setSetting("relayGPIO", 2, 16); - setSetting("relayType", 2, RELAY_TYPE_INVERSE); + setSetting("relayType", 2, RELAY_TYPE_NORMAL); + + #elif defined(ARNIEX_SWIFITCH) + + setSetting("board", 64); + setSetting("ledGPIO", 0, 12); + setSetting("ledLogic", 0, 1); + setSetting("btnGPIO", 0, 4); + setSetting("btnRelay", 0, 1); + setSetting("relayGPIO", 0, 5); + setSetting("relayType", 0, RELAY_TYPE_INVERSE); + + #elif defined(GENERIC_ESP01SRELAY40) + + setSetting("board", 65); + setSetting("ledGPIO", 0, 2); + setSetting("ledLogic", 0, 0); + setSetting("relayGPIO", 0, 0); + setSetting("relayType", 0, RELAY_TYPE_NORMAL); + + #elif defined(GENERIC_ESP01SRGBLED10) + + setSetting("board", 66); + setSetting("ledGPIO", 0, 2); + + #elif defined(HELTEC_TOUCHRELAY) + + setSetting("board", 67); + setSetting("btnGPIO", 0, 14); + setSetting("btnRelay", 0, 1); + setSetting("relayGPIO", 0, 12); + setSetting("relayType", 0, RELAY_TYPE_NORMAL); #else diff --git a/code/platformio.ini b/code/platformio.ini index 0d1dd602..d910f028 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -4,12 +4,46 @@ src_dir = espurna data_dir = espurna/data [common] -; platform = espressif8266@1.6.0 -platform = espressif8266@1.5.0 -build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS} +# ------------------------------------------------------------------------------ +# PLATFORM: +# !! DO NOT confuse platformio's Esp8266 development platform with Arduino core for ESP8266 +# +# we use platformIO 1.5.0 as default +# platform 1.6.0 = arduino core 2.4.0 is required for newer features/boards +# ------------------------------------------------------------------------------ +platform_150 = espressif8266@1.5.0 +platform_160 = espressif8266@1.6.0 +platform = ${common.platform_150} + +# ------------------------------------------------------------------------------ +# FLAGS: DEBUG +# +# ------------------------------------------------------------------------------ debug_flags = -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM + +# ------------------------------------------------------------------------------ +# FLAGS: build flags +# build flags for 512k/1m ESP's are different because we use Linker Scripts to adjust flash split +# 512 KB = 487 KB sketch, 20 KB eeprom +# 1 MB = 999 KB sketch, 20 KB eeprom +# ------------------------------------------------------------------------------ +build_flags = -g -DMQTT_MAX_PACKET_SIZE=400 ${env.ESPURNA_FLAGS} build_flags_512k = ${common.build_flags} -Wl,-Tesp8266.flash.512k0.ld build_flags_1m = ${common.build_flags} -Wl,-Tesp8266.flash.1m0.ld + +# ------------------------------------------------------------------------------ +# GLOBALS: +# ------------------------------------------------------------------------------ +# IP address when using OTA +upload_port = "192.168.4.1" +upload_flags = --auth=fibonacci --port 8266 +#upload_port = "${env.ESPURNA_IP}" +#upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 + +# ------------------------------------------------------------------------------ +# LIBRARIES: required dependencies +# Please note that we don't always use the latest version of a library. +# ------------------------------------------------------------------------------ lib_deps = ArduinoJson https://github.com/marvinroger/async-mqtt-client#v0.8.1 @@ -92,8 +126,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DWEMOS_D1_MINI_RELAYSHIELD -DDEBUG_FAUXMO=Serial -DNOWSAUTH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:nodemcu-lolin] @@ -126,8 +160,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DNODEMCU_LOLIN -DDEBUG_FAUXMO=Serial -DNOWSAUTH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -151,8 +185,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H06 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -174,8 +208,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DTINKERMAN_ESPURNA_H08 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -221,8 +255,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -246,8 +280,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_BASIC -DDHT_SUPPORT=1 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -282,8 +316,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RF upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -307,8 +341,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -332,8 +366,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_POW upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -356,8 +390,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:itead-sonoff-dual-r2] @@ -379,8 +413,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_DUAL_R2 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} extra_scripts = ${common.extra_scripts} [env:itead-sonoff-4ch] @@ -403,8 +437,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -428,8 +462,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_4CH_PRO upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -453,8 +487,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_TOUCH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -478,8 +512,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_B1 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -503,8 +537,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_1CH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -528,8 +562,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_2CH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -553,8 +587,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_T1_3CH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -578,8 +612,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_LED upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -603,8 +637,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_RFBRIDGE upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 19200 extra_scripts = ${common.extra_scripts} @@ -630,8 +664,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SLAMPHER upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -655,8 +689,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_S20 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -680,8 +714,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_1CH_INCHING upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -705,8 +739,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_MOTOR upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -729,8 +763,8 @@ board_flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_SONOFF_SV -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -754,8 +788,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DELECTRODRAGON_WIFI_IOT -DDHT_SUPPORT=1 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -779,8 +813,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DWORKCHOICE_ECOPLUG upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -802,8 +836,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NC upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -825,8 +859,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DJANGOE_WIFI_RELAY_NO upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -848,8 +882,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DOPENENERGYMONITOR_MQTT_RELAY -DDALLAS_SUPPORT=1 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -871,8 +905,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DJORGEGARCIA_WIFI_RELAYS upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -896,8 +930,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DAITHINKER_AI_LIGHT upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -921,8 +955,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -945,8 +979,8 @@ board_flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DMAGICHOME_LED_CONTROLLER_20 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -970,8 +1004,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H801 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -995,8 +1029,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DHUACANXING_H802 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1020,8 +1054,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC01 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1045,8 +1079,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC02 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1070,8 +1104,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC06 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1095,8 +1129,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_AL_LC11 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1120,8 +1154,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = -g -Wl,-Tesp8266.flash.1m0.ld -DARILUX_E27 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1145,8 +1179,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DITEAD_BNSZ01 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1170,8 +1204,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DWION_50055 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1195,8 +1229,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DEXS_WIFI_RELAY_V31 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1219,8 +1253,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DGENERIC_V9261F upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1244,8 +1278,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DGENERIC_V9261F upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1268,8 +1302,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DGENERIC_ECH1560 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1293,8 +1327,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DGENERIC_ECH1560 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1317,8 +1351,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags} -DMANCAVEMADE_ESPLIVE upload_speed = 460800 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1342,8 +1376,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DINTERMITTECH_QUINLED upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1367,8 +1401,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DXENON_SM_PW702U upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1392,8 +1426,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DAUTHOMETION_LYT8266 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1417,8 +1451,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DKMC_70011 upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1442,8 +1476,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DYJZK_SWITCH_2CH upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1574,8 +1608,8 @@ lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} build_flags = ${common.build_flags_1m} -DSTM_RELAY upload_speed = 115200 -upload_port = "192.168.4.1" -upload_flags = --auth=fibonacci --port 8266 +upload_port = ${common.upload_port} +upload_flags = ${common.upload_flags} monitor_baud = 115200 extra_scripts = ${common.extra_scripts} @@ -1747,6 +1781,78 @@ upload_port = "${env.ESPURNA_IP}" upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 extra_scripts = ${common.extra_scripts} +[env:generic-esp01s-relay-40] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRELAY40 +monitor_baud = 115200 +extra_scripts = ${common.extra_scripts} + +[env:generic-esp01s-relay-40-ota] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRELAY40 +upload_speed = 115200 +upload_port = "${env.ESPURNA_IP}" +upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +extra_scripts = ${common.extra_scripts} + +[env:generic-esp01s-rgbled-10] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRGBLED10 +monitor_baud = 115200 +extra_scripts = ${common.extra_scripts} + +[env:generic-esp01s-rgbled-10-ota] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DGENERIC_ESP01SRGBLED10 +upload_speed = 115200 +upload_port = "${env.ESPURNA_IP}" +upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +extra_scripts = ${common.extra_scripts} + +[env:heltec-touch-relay] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DHELTEC_TOUCHRELAY +monitor_baud = 115200 +extra_scripts = ${common.extra_scripts} + +[env:heltec-touch-relay-ota] +platform = ${common.platform} +framework = arduino +board = esp01_1m +board_flash_mode = dout +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags_1m} -DHELTEC_TOUCHRELAY +upload_speed = 115200 +upload_port = "${env.ESPURNA_IP}" +upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 +extra_scripts = ${common.extra_scripts} + # ------------------------------------------------------------------------------ # GENERIC OTA ENVIRONMENTS # ------------------------------------------------------------------------------ diff --git a/images/devices/generic-relay-40.jpg b/images/devices/generic-relay-40.jpg new file mode 100644 index 00000000..005e6af4 Binary files /dev/null and b/images/devices/generic-relay-40.jpg differ diff --git a/images/devices/generic-rgbled-10.jpg b/images/devices/generic-rgbled-10.jpg new file mode 100644 index 00000000..235cb833 Binary files /dev/null and b/images/devices/generic-rgbled-10.jpg differ diff --git a/images/devices/heltec-touch-relay.jpg b/images/devices/heltec-touch-relay.jpg new file mode 100644 index 00000000..883e689f Binary files /dev/null and b/images/devices/heltec-touch-relay.jpg differ diff --git a/images/devices/maxcio-15a.jpg b/images/devices/maxcio-15a.jpg deleted file mode 100644 index a7974a55..00000000 Binary files a/images/devices/maxcio-15a.jpg and /dev/null differ diff --git a/images/devices/yidian-16a.jpg b/images/devices/yidian-16a.jpg deleted file mode 100644 index 1f36b69c..00000000 Binary files a/images/devices/yidian-16a.jpg and /dev/null differ