From 9a412520b557d5c2b5f4b4e6815f5d229be889a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xose=20P=C3=A9rez?= Date: Thu, 3 May 2018 23:30:37 +0200 Subject: [PATCH] Changes to the ALLNET 4duino IoT WLAN relay --- code/espurna/config/arduino.h | 2 +- code/espurna/config/hardware.h | 29 +++++++++++++++++++---------- code/espurna/migrate.ino | 4 ++-- code/platformio.ini | 8 ++++---- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h index 7c23e218..07e33612 100644 --- a/code/espurna/config/arduino.h +++ b/code/espurna/config/arduino.h @@ -80,7 +80,7 @@ //#define HELTEC_TOUCHRELAY //#define ZHILDE_EU44_W //#define LUANI_HVIO -//#define ALLNET_ESP8266_UP +//#define ALLNET_4DUINO_IOT_WLAN_RELAIS //-------------------------------------------------------------------------------- // Features (values below are non-default values) diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index 6f8518c4..e29d0be4 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -2000,13 +2000,14 @@ // ----------------------------------------------------------------------------- // Allnet 4duino ESP8266-UP-Relais // http://www.allnet.de/de/allnet-brand/produkte/neuheiten/p/allnet-4duino-iot-wlan-relais-unterputz-esp8266-up-relais/ + // https://shop.allnet.de/fileadmin/transfer/products/148814.pdf // ----------------------------------------------------------------------------- -#elif defined(ALLNET_ESP8266_UP) +#elif defined(ALLNET_4DUINO_IOT_WLAN_RELAIS) // Info #define MANUFACTURER "ALLNET" - #define DEVICE "ESP8266_UP_Relais" + #define DEVICE "4DUINO_IOT_WLAN_RELAIS" // Relays #define RELAY1_PIN 14 @@ -2018,16 +2019,24 @@ #define LED1_PIN_INVERSE 1 // Buttons - #define BUTTON1_PIN 4 - #define BUTTON1_MODE BUTTON_PUSHBUTTON - #define BUTTON1_PRESS BUTTON_MODE_TOGGLE - #define BUTTON1_CLICK BUTTON_MODE_NONE - #define BUTTON1_DBLCLICK BUTTON_MODE_NONE - #define BUTTON1_LNGCLICK BUTTON_MODE_NONE - #define BUTTON1_LNGLNGCLICK BUTTON_MODE_NONE + //#define BUTTON1_PIN 0 + //#define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH - #define BUTTON2_PIN 5 + // Using pins labelled as SDA & SCL as buttons + #define BUTTON2_PIN 4 #define BUTTON2_MODE BUTTON_PUSHBUTTON + #define BUTTON2_PRESS BUTTON_MODE_TOGGLE + #define BUTTON2_CLICK BUTTON_MODE_NONE + #define BUTTON2_DBLCLICK BUTTON_MODE_NONE + #define BUTTON2_LNGCLICK BUTTON_MODE_NONE + #define BUTTON2_LNGLNGCLICK BUTTON_MODE_NONE + + #define BUTTON3_PIN 5 + #define BUTTON3_MODE BUTTON_PUSHBUTTON + + // Using pins labelled as SDA & SCL for I2C + //#define I2C_SDA_PIN 4 + //#define I2C_SCL_PIN 5 // ----------------------------------------------------------------------------- diff --git a/code/espurna/migrate.ino b/code/espurna/migrate.ino index 548537d4..ab4ef36b 100644 --- a/code/espurna/migrate.ino +++ b/code/espurna/migrate.ino @@ -930,11 +930,11 @@ void migrate() { setSetting("relayGPIO", 1, 5); setSetting("relayType", 1, RELAY_TYPE_NORMAL); - #elif defined(ALLNET_ESP8266_UP) + #elif defined(ALLNET_4DUINO_IOT_WLAN_RELAIS) setSetting("board", 73); setSetting("relayGPIO", 0, 14); - setSetting("relayResetGPIO", 1, 12); + setSetting("relayResetGPIO", 0, 12); setSetting("relayType", 0, RELAY_TYPE_LATCHED); #else diff --git a/code/platformio.ini b/code/platformio.ini index 737f97fe..a5a58e9e 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -2105,25 +2105,25 @@ upload_port = "${env.ESPURNA_IP}" upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266 extra_scripts = ${common.extra_scripts} -[env:allnet-esp8266-up-relay] +[env:allnet-4duino-iot-wlan-relais] platform = ${common.platform} framework = arduino board = esp12e board_flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m} -DALLNET_ESP8266_UP +build_flags = ${common.build_flags_1m} -DALLNET_4DUINO_IOT_WLAN_RELAIS monitor_baud = 115200 extra_scripts = ${common.extra_scripts} -[env:allnet-esp8266-up-relay-ota] +[env:allnet-4duino-iot-wlan-relais-ota] platform = ${common.platform} framework = arduino board = esp12e board_flash_mode = dout lib_deps = ${common.lib_deps} lib_ignore = ${common.lib_ignore} -build_flags = ${common.build_flags_1m} -DALLNET_ESP8266_UP +build_flags = ${common.build_flags_1m} -DALLNET_4DUINO_IOT_WLAN_RELAIS upload_speed = 115200 upload_port = "${env.ESPURNA_IP}" upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266