fix bug; save settings

lib/Settings/Settings.cpp

@@ -5,11 +5,16 @@
 void Settings::deserialize(Settings& settings, String json) {
   DynamicJsonBuffer jsonBuffer;
   JsonObject& parsedSettings = jsonBuffer.parseObject(json);
-    
-  settings.adminUsername = parsedSettings.get<String>("admin_username");
-  settings.adminPassword = parsedSettings.get<String>("admin_password");
-  settings.cePin = parsedSettings["ce_pin"];
-  settings.csnPin = parsedSettings["csn_pin"];
+  deserialize(settings, parsedSettings);
+}
+
+void Settings::deserialize(Settings& settings, JsonObject& parsedSettings) {
+  if (parsedSettings.success()) {
+    settings.adminUsername = parsedSettings.get<String>("admin_username");
+    settings.adminPassword = parsedSettings.get<String>("admin_password");
+    settings.cePin = parsedSettings["ce_pin"];
+    settings.csnPin = parsedSettings["csn_pin"];
+  }
 }
 
 void Settings::load(Settings& settings) {

lib/Settings/Settings.h

@@ -1,5 +1,6 @@
 #include <Arduino.h>
 #include <StringStream.h>
+#include <ArduinoJson.h>
 
 #ifndef _SETTINGS_H_INCLUDED
 #define _SETTINGS_H_INCLUDED
@@ -20,6 +21,7 @@ public:
   { }
 
   static void deserialize(Settings& settings, String json);
+  static void deserialize(Settings& settings, JsonObject& json);
   static void load(Settings& settings);
   
   void save();

lib/WebServer/PatternHandler.cpp

@@ -4,7 +4,7 @@ PatternHandler::PatternHandler(
     const String& pattern, 
     const HTTPMethod method, 
     const PatternHandler::TPatternHandlerFn fn
-  ) : method(method), fn(fn) {
+  ) : method(method), fn(fn), tokenPositions(NULL) {
   Vector<StringToken>* tokenPositions = new Vector<StringToken>();
   tokenize(pattern, tokenPositions);
   
@@ -32,6 +32,9 @@ bool PatternHandler::canHandle(HTTPMethod requestMethod, String requestUri) {
   tokenPositions = new Vector<StringToken>();
   tokenize(requestUri, tokenPositions);
   
+  Serial.print(tokenPositions->size());
+  Serial.println(" tokens in URL");
+  
   if (numPatternTokens == tokenPositions->size()) {
     for (int i = 0; i < numPatternTokens; i++) {
       const StringToken urlTokenP = (*tokenPositions)[i];

src/main.cpp

@@ -33,15 +33,29 @@ void handleUpdateGateway(const UrlTokenBindings* urlBindings) {
 }
 
 void handleUpdateGroup(const UrlTokenBindings* urlBindings) {
+  Serial.println("Yeehaw?");
+  
   DynamicJsonBuffer buffer;
   JsonObject& request = buffer.parse(server.arg("plain"));
   
+  if (!request.success()) {
+    server.send(400, "text/plain", "Invalid JSON");
+    return;
+  }
+  
+  Serial.println("deserialized");
+  
   const uint16_t deviceId = parseInt<uint16_t>(urlBindings->get("device_id"));
   const uint8_t groupId = urlBindings->get("group_id").toInt();
   
+  Serial.println(deviceId);
+  Serial.println(groupId);
+  
   if (request.containsKey("status")) {
     const String& statusStr = request.get<String>("status");
     MiLightStatus status = (statusStr == "on" || statusStr == "true") ? ON : OFF;
+    Serial.println(status);
+    Serial.println((int)milightClient);
     milightClient->updateStatus(deviceId, groupId, status);
   }
   
@@ -152,16 +166,41 @@ void onWebUpdated() {
   server.send(200, "text/plain", "success");
 }
 
+void initMilightClient() {
+  if (milightClient) {
+    delete milightClient;
+  }
+  
+  milightClient = new MiLightClient(settings.cePin, settings.csnPin);
+  milightClient->begin();
+}
+
+void handleUpdateSettings() {
+  DynamicJsonBuffer buffer;
+  const String& rawSettings = server.arg("plain");
+  JsonObject& parsedSettings = buffer.parse(rawSettings);
+  
+  if (parsedSettings.success()) {
+    Settings::deserialize(settings, parsedSettings);
+    settings.save();
+    initMilightClient();
+    
+    server.send(200, "application/json", "true");
+  } else {
+    server.send(400, "application/json", "\"Invalid JSON\"");
+  }
+}
+
 void setup() {
   Serial.begin(9600);
   wifiManager.autoConnect();
   SPIFFS.begin();
   Settings::load(settings);
-  
-  milightClient = new MiLightClient(settings.cePin, settings.csnPin);
-  milightClient->begin();
+  initMilightClient();
   
   server.on("/", HTTP_GET, handleServeFile(WEB_INDEX_FILENAME, "text/html"));
+  server.on("/settings", HTTP_GET, handleServeFile(SETTINGS_FILE, "application/json"));
+  server.on("/settings", HTTP_POST, handleUpdateSettings);
   server.on("/gateway_traffic", HTTP_GET, handleListenGateway);
   server.onPattern("/gateways/:device_id/:group_id", HTTP_PUT, handleUpdateGroup);
   server.onPattern("/gateways/:device_id", HTTP_PUT, handleUpdateGateway);

web/index.html

@@ -22,6 +22,8 @@
     .radio-option { padding: 0 5px; cursor: pointer; }
     .command-buttons { list-style: none; margin: 0; padding: 0; }
     .command-buttons li { display: inline-block; margin-right: 1em; }
+    .form-entry { margin: 0 0 20px 0; }
+    .form-entry .form-control { width: 20em; }
     .btn-secondary { 
       background-color: #fff; 
       border: 1px solid #ccc;
@@ -64,11 +66,18 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/9.7.0/bootstrap-slider.min.js"></script>
   
   <script lang="text/javascript">
+    var FORM_SETTINGS = ["admin_username", "admin_password", "ce_pin", "csn_pin"];
+  
     var activeUrl = function() {
-      return "/gateways/" +
-        $('input[name="deviceId"]').val() +
-        "/" +
-        $('#groupId input:checked').data('value');
+      var deviceId = $('input[name="deviceId"]').val()
+        , groupId = $('#groupId input:checked').data('value');
+        
+      if (deviceId == "") {
+        alert("Please enter a device ID.");
+        throw "abc";
+      }
+        
+      return "/gateways/" + deviceId + "/" + groupId;
     }
     
     var updateGroup = _.throttle(
@@ -94,6 +103,13 @@
       });
     };
     
+    var loadSettings = function() {
+      $.getJSON('/settings', function(val) {
+        Object.keys(val).forEach(function(k) {
+          $('#settings input[name="' + k + '"]').val(val[k]);
+        });
+      });
+    };
     
     $(function() {
       $('.radio-option').click(function() {
@@ -157,6 +173,38 @@
           $(this).html('Stop Sniffing');
         }
       });
+      
+      var settings = "";
+      
+      FORM_SETTINGS.forEach(function(k) {
+        var elmt = '<div class="form-entry">';
+        elmt += '<label for="' + k + '">' + k + '</label>';
+        elmt += '<input type="text" class="form-control" name="' + k + '"/>';
+        elmt += '</div>';
+        settings += elmt;
+      });
+        
+      $('#settings').prepend(settings);
+      $('#settings').submit(function(e) {
+        var obj = {};
+        FORM_SETTINGS.forEach(function(k) {
+          obj[k] = $('#settings input[name="' + k + '"]').val();
+        });
+        
+        $.ajax(
+          "/settings",
+          {
+            method: 'post',
+            contentType: 'application/json',
+            data: JSON.stringify(obj)
+          }
+        );
+        
+        e.preventDefault();
+        return false;
+      });
+      
+      loadSettings();
     });
   </script>
   
@@ -174,7 +222,7 @@
     <div class="row">
       <div class="col-sm-4">
         <label for="deviceId">Device Id</label>
-        <input type="text" class="input" name="deviceId" />
+        <input type="text" class="form-control" name="deviceId" />
       </div>
       
       <div class="col-sm-8">
@@ -259,6 +307,21 @@
       </div>
     </div>
     
+    <div class="row header-row">
+      <div class="col-sm-12">
+        <h1>Settings</h1>
+      </div>
+    </div>
+    
+    <div>&nbsp;</div>
+    
+    <div class="row">
+      <div class="col-sm-12">
+        <form action="#" id="settings">
+          <input type="submit" class="btn btn-success" value="Submit" />
+        </form>
+      </div>
+    </div>
     
     <div class="row header-row">
       <div class="col-sm-12">