Merge remote-tracking branch 'origin/json-quoting'

aREST.h

@@ -1416,28 +1416,29 @@ virtual void root_answer() {
   else {
     addToBufferF(F("{\"variables\": {"));
 
-    for (uint8_t i = 0; i < variables_index; i++){
+    for (uint8_t i = 0; i < variables_index; i++) {
       addToBuffer(variable_names[i], true);
+
       addToBufferF(F(": "));
       variables[i]->addToBuffer(this);
 
+      // Add a comma unless this is our last variable
       if (i < variables_index - 1) {
         addToBufferF(F(", "));
       }
     }
 
     addToBufferF(F("}, "));
+    // END
   }
 
-  // End
   addHardwareToBuffer();
 
   #ifndef PubSubClient_h
     addToBufferF(F("\r\n"));
   #endif
 }
 
-
 void function(char * function_name, int (*f)(String)){
 
   functions_names[functions_index] = function_name;
@@ -1609,8 +1610,8 @@ void addToBuffer(const char * toAdd, bool quotable){
 
 // Add to output buffer
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(ESP8266) || defined(CORE_WILDFIRE) || !defined(ADAFRUIT_CC3000_H) || defined(ESP32)
-void addToBuffer(const String& toAdd, bool quotable){
 
+void addToBuffer(const String& toAdd, bool quotable) {
   if (DEBUG_MODE) {
     #if defined(ESP8266)|| defined (ESP32)
     Serial.print("Memory loss:");
@@ -1831,15 +1832,13 @@ uint8_t esp_12_pin_map(uint8_t pin) {
 
 }
 
-
 void addVariableToBuffer(uint8_t index) {
   addToBuffer(variable_names[index], true);
   addToBufferF(F(": "));
   variables[index]->addToBuffer(this);
   addToBufferF(F(", "));
 }
 
-
 void addHardwareToBuffer() {
   addToBufferF(F("\"id\": "));
   addToBuffer(id, true);
@@ -1850,7 +1849,6 @@ void addHardwareToBuffer() {
   addToBufferF(F(", \"connected\": true}"));
 }
 
-
 // For non AVR boards
 #if defined (__arm__)
 char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {