new devices

new devices; heltec touch relay, generic relay 4.0, generic rgbled 1.0
hyteoo · Apr 8, 2018 · ead966f · ead966f
1 parent 5a5c38c
commit ead966f
Show file tree

Hide file tree

Showing 10 changed files with 320 additions and 116 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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