From e06dd5d7983f34c5dab604dde63f381e47510c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Thu, 16 Aug 2018 18:54:03 +0200
Subject: [PATCH] Clean up

---
 code/espurna/config/hardware.h |  6 +++---
 code/espurna/hardware.ino      | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 09713134..9930021b 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -63,7 +63,7 @@
 
 #elif defined(NODEMCU_LOLIN)
 
-    #include "devices/002_nodemcu_lolin.json.h"
+    //#include "devices/002_nodemcu_lolin.json.h"
 
 #elif defined(WEMOS_D1_MINI)
 
@@ -87,7 +87,7 @@
 
 #elif defined(WEMOS_D1_MINI_RELAYSHIELD)
 
-    #include "devices/003_wemos_d1_mini_relayshield.json.h"
+    //#include "devices/003_wemos_d1_mini_relayshield.json.h"
 
 // -----------------------------------------------------------------------------
 // ESPurna
@@ -95,7 +95,7 @@
 
 #elif defined(TINKERMAN_ESPURNA_H06)
 
-    #include "devices/023_tinkerman_espurna_h06.json.h"
+    //#include "devices/023_tinkerman_espurna_h06.json.h"
 
     // HLW8012
     #ifndef HLW8012_SUPPORT
diff --git a/code/espurna/hardware.ino b/code/espurna/hardware.ino
index 353753e5..92d0a30e 100644
--- a/code/espurna/hardware.ino
+++ b/code/espurna/hardware.ino
@@ -205,8 +205,8 @@ void _hardwareLoad() {
         setSetting("board", 9);
         setSetting("device", "ITEAD_SONOFF_DUAL");
 
-        setSetting("btnRelay", 0, GPIO_INVALID);
-        setSetting("btnRelay", 1, GPIO_INVALID);
+        setSetting("btnRelay", 0, GPIO_NONE);
+        setSetting("btnRelay", 1, GPIO_NONE);
         setSetting("btnRelay", 2, 0);
 
         setSetting("ledGPIO", 0, 13);
@@ -413,7 +413,7 @@ void _hardwareLoad() {
 
         setSetting("litProvider", LIGHT_PROVIDER_MY92XX);
 
-        setSetting("myModel", MY92XX_MODEL_MY9291); // 4 channels per chip
+       setSetting("myModel", MY92XX_MODEL_MY9291); // 4 channels per chip
         setSetting("myChips", 1);
         setSetting("myDIGPIO", 13);
         setSetting("myDCKIGPIO", 15);
@@ -1758,7 +1758,7 @@ void _hardwareLoad() {
         setSetting("device", "STM_RELAY");
 
         setSetting("rlyDummy", 2);
-        setSetting("rlyProvider", RELAY_PROVIDER_STM)
+        setSetting("rlyProvider", RELAY_PROVIDER_STM);
 
         setSetting("dbgSerial", 0);
 
@@ -1814,7 +1814,7 @@ void _hardwareLoad() {
         setSetting("rfm69CSGPIO", 15);
         setSetting("rfm69IRQGPIO", 5);
         setSetting("rfm69ResetGPIO", 7);
-        setSetting("rfm69HW", 0)
+        setSetting("rfm69HW", 0);
 
     #elif defined(ITEAD_SONOFF_IFAN02)
 
@@ -1882,6 +1882,7 @@ void _hardwareSpecific() {
 
 }
 
+// -----------------------------------------------------------------------------
 
 void hardwareSetup() {
     _hardwareMigrate();