Clean up - fixed misspellings

Clean up - fixed misspellings, bugs in web app.
Still can't save interface type though

data/web/index.html

@@ -128,7 +128,7 @@
     ];
 
     var FORM_SETTINGS_HELP = {
-      csn_pin_RxReady : "'csn' for 'nRF24' interface, and RxReady for 'PL1167_LT8900' interface",
+      csn_pin : "'csn' for 'nRF24' interface, and 'PKT' for 'PL1167_LT8900' interface",
       packet_repeats : "The number of times to repeat RF packets sent to bulbs",
       http_repeat_factor : "Multiplicative factor on packet_repeats for " +
         "requests initiated by the HTTP API. UDP API typically receives " +
@@ -547,18 +547,14 @@
           elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
         }
 
-        if (FORM_SETTINGS_HELP[k]) {
-          elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
-        }
-
         if(k === "radio_interface_type")
         {
-          elmt += '<div class="btn-group" id="sniff-type" data-toggle="buttons">' +
+          elmt += '<div class="btn-group" id="radiointerface" data-toggle="buttons">' +
             '<label class="btn btn-secondary active">' +
-            '<input type="radio" name="options" autocomplete="off" data-value="nRF24" > nRF24' +
+            '<input type="radio" name="radiointerface_nRF" autocomplete="off" data-value="nRF24" > nRF24' +
             '</label>'+
             '<label class="btn btn-secondary">' +
-              '<input type="radio" name="options" autocomplete="off" data-value="LT1167_PL8900"> LT1167_PL8900' +
+              '<input type="radio" name="radiointerface_PL1167" autocomplete="off" data-value="PL1167/LT8900/8910/8920" > PL1167/LT8900/8910/8920' +
             '</label>' +
           '</div>';
         }
@@ -576,7 +572,10 @@
         var obj = {};
 
         FORM_SETTINGS.forEach(function(k) {
-          obj[k] = $('#settings input[name="' + k + '"]').val();
+          
+            obj[k] = $('#settings input[name="' + k + '"]').val();
+          
+
         });
 
         // pretty hacky. whatever.
@@ -595,6 +594,8 @@
             data: JSON.stringify(obj)
           }
         );
+        //console.log(obj);
+        //console.log(JSON.stringify(obj));
 
         e.preventDefault();
         return false;

lib/MiLight/MiLightClient.h

@@ -27,7 +27,7 @@ class MiLightClient {
 
     for (size_t i = 0; i < numRadios; i++)
     {
-      if(InterfaceType == LT1167_PL8900)
+      if(InterfaceType == PL1167_LT8900)
       {
         radios[i] = new RadioStack(byCSPin, byResetPin, byPktFlag, *MiLightRadioConfig::ALL_CONFIGS[i]);
       }

lib/MiLight/RadioStack.h

@@ -19,7 +19,7 @@ public:
   }
 
   RadioStack(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
-      : config(config),UsedInterfaceType(LT1167_PL8900)
+      : config(config),UsedInterfaceType(PL1167_LT8900)
     {
       radioPL1167_LT8900 = new MiLightRadioPL1167_LT8900(byCSPin, byResetPin, byPktFlag, config);
     }
@@ -37,7 +37,7 @@ public:
     {
       return this->radio;
     }
-    else if(UsedInterfaceType == LT1167_PL8900)
+    else if(UsedInterfaceType == PL1167_LT8900)
     {
       return this->radioPL1167_LT8900;
     }

lib/Settings/Settings.cpp

@@ -55,9 +55,9 @@ void Settings::deserialize(Settings& settings, JsonObject& parsedSettings) {
       {
         settings.radioInterfaceType =  nRF24;
       }
-      else if(InterfaceType == "nRF24")
+      else if(InterfaceType == "PL1167/LT8900/8910/8920")
       {
-        settings.radioInterfaceType =  LT1167_PL8900;
+        settings.radioInterfaceType =  PL1167_LT8900;
       }
     }
 
@@ -141,9 +141,9 @@ void Settings::patch(JsonObject& parsedSettings) {
       {
         this->radioInterfaceType =  nRF24;
       }
-      else if(InterfaceType == "LT1167_PL8900")
+      else if(InterfaceType == "PL1167/LT8900/8910/8920")
       {
-        this->radioInterfaceType =  LT1167_PL8900;
+        this->radioInterfaceType =  PL1167_LT8900;
       }
     }
 
@@ -211,9 +211,9 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) {
   {
     root["radio_interface_type"] = "nRF24";
   }
-  else if(this->radioInterfaceType == LT1167_PL8900)
+  else if(this->radioInterfaceType == PL1167_LT8900)
   {
-    root["radio_interface_type"] = "LT1167_PL8900";
+    root["radio_interface_type"] = "PL1167/LT8900/8910/8920";
   }
 
   root["packet_repeats"] = this->packetRepeats;

lib/Settings/Settings.h

@@ -27,7 +27,7 @@
 enum eRadioInterfaceType
 {
   nRF24 = 0,
-  LT1167_PL8900 =1,
+  PL1167_LT8900 =1,
 };
 
 class GatewayConfig {
@@ -52,7 +52,7 @@ public:
     cePin(D0),
     csnPin(D8),
     resetPin(0),
-    radioInterfaceType(LT1167_PL8900),
+    radioInterfaceType(PL1167_LT8900),
     deviceIds(NULL),
     gatewayConfigs(NULL),
     numDeviceIds(0),

platformio.ini

@@ -17,17 +17,18 @@ lib_deps_external =
   WiFiManager
   ArduinoJson
 build_flags = !echo -D MILIGHT_HUB_VERSION="\"$(git describe --always)\""
-//build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
+; build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
 # -D MILIGHT_UDP_DEBUG
+upload_speed = 9600
 
-[env:nodemcuv2]
-platform = espressif8266
-framework = arduino
-board = nodemcuv2
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
+; [env:nodemcuv2]
+; platform = espressif8266
+; framework = arduino
+; board = nodemcuv2
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}
+; build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
 
 [env:d1_mini]
 platform = espressif8266
@@ -38,20 +39,20 @@ lib_deps =
   ${common.lib_deps_external}
 build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"d1_mini\""
 
-[env:esp12]
-platform = espressif8266
-board = esp12e
-framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
+; [env:esp12]
+; platform = espressif8266
+; board = esp12e
+; framework = arduino
+; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}
 
-[env:esp07]
-platform = espressif8266
-board = esp07
-framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
+; [env:esp07]
+; platform = espressif8266
+; board = esp07
+; framework = arduino
+; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}

src/main.cpp

@@ -68,10 +68,10 @@ void applySettings()
       milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, nRF24);
       milightClient->begin();
   }
-  else if(settings.radioInterfaceType == LT1167_PL8900)
+  else if(settings.radioInterfaceType == PL1167_LT8900)
   {
       Serial.println("Starting using 'PL1167_LT8900' interface...");
-      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, LT1167_PL8900);
+      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, PL1167_LT8900);
       milightClient->begin();
   }
   initMilightUdpServers();