From 63f4b173daa9371f296facd03e2854df5ed85f0d Mon Sep 17 00:00:00 2001
From: Scott Powell <ripple_biz@protonmail.com>
Date: Wed, 15 Jul 2026 13:21:44 +1000
Subject: [PATCH] * misc fixes

---
 src/helpers/ConfigSerializer.cpp | 46 +++++++++++++++++++++++++++-----
 src/helpers/ConfigSerializer.h   |  6 ++---
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/helpers/ConfigSerializer.cpp b/src/helpers/ConfigSerializer.cpp
index 221fd197..76673309 100644
--- a/src/helpers/ConfigSerializer.cpp
+++ b/src/helpers/ConfigSerializer.cpp
@@ -97,10 +97,10 @@ int ConfigSerializer::Context::readNext() {
 bool ConfigSerializer::loadSerial(Stream& s) {
   Context context(&s, OP::READ);
   _context = &context;  // set the context for structure() call
-  // parse the Json file
-  uint8_t sp = 0;
+  uint8_t sp = 0;   // object nesting stack pointer
   int next_tok;
 
+  // parse the Json file
   while ((next_tok = context.readNext()) > TOK_EOF) {
     if (next_tok == TOK_KEY) {
       context.setKey(sp, context.getToken());
@@ -108,7 +108,7 @@ bool ConfigSerializer::loadSerial(Stream& s) {
       _depth = 1;  // re-run the structure() hierarchy again (looking for specific key, at specific depth)
       structure();
     } else if (next_tok == TOK_START_OBJ) {
-      if (sp < CONFIF_MAX_DEPTH - 1) {
+      if (sp < CONFIG_MAX_DEPTH - 1) {
         sp++;
       } else {
         Serial.printf("Error: max nesting reached"); // TODO: debug logging
@@ -145,7 +145,20 @@ void ConfigSerializer::def(const char* key, char* value, size_t max_len) {
     writeComma();
     _context->file()->print(key);
     _context->file()->print(":\"");
-    _context->file()->print(value);   // TODO: escape quotes
+    char c;
+    while ((c = *value++) != 0) {  // TODO: handle UTF-8 encoding
+      if (c == '"') {
+        _context->file()->print("\\\"");
+      } else if (c == '\\') {
+        _context->file()->print("\\\\");
+      } else if (c == '\n') {
+        _context->file()->print("\\n");
+      } else if (c == '\r') {
+        _context->file()->print("\\r");
+      } else {
+        _context->file()->print(c);
+      }
+    }
     _context->file()->print("\"");
   } else {
     if (_context->keyMatch(_depth, key)) {
@@ -233,12 +246,29 @@ void ConfigSerializer::def(const char* key, int8_t& value) {
   }
 }
 
+void ConfigSerializer::def(const char* key, bool& value) {
+  if (_context->op() == OP::WRITE) {
+    writeComma();
+    _context->file()->print(key);
+    _context->file()->print(":");
+    _context->file()->print(value ? "true" : "false");
+  } else {
+    if (_context->keyMatch(_depth, key)) {
+      value = strcmp(_context->getToken(), "true") == 0 || atoi(_context->getToken()) != 0;  // 'true' or a non-zero number
+    }
+  }  
+}
+
 void ConfigSerializer::def(const char* key, double& value) {
   if (_context->op() == OP::WRITE) {
     writeComma();
     _context->file()->print(key);
     _context->file()->print(":");
-    _context->file()->print(value, 6);  // REVISIT: how many dec places?
+    if (value == 0.0) {
+      _context->file()->print("0");  // shorter encoding
+    } else {
+      _context->file()->print(value, 6);  // REVISIT: how many dec places?
+    }
   } else {
     if (_context->keyMatch(_depth, key)) {
       value = atof(_context->getToken());
@@ -251,7 +281,11 @@ void ConfigSerializer::def(const char* key, float& value) {
     writeComma();
     _context->file()->print(key);
     _context->file()->print(":");
-    _context->file()->print(value, 4);  // REVISIT: how many dec places?
+    if (value == 0.0f) {
+      _context->file()->print("0");  // shorter encoding
+    } else {
+      _context->file()->print(value, 4);  // REVISIT: how many dec places?
+    }
   } else {
     if (_context->keyMatch(_depth, key)) {
       value = (float) atof(_context->getToken());
diff --git a/src/helpers/ConfigSerializer.h b/src/helpers/ConfigSerializer.h
index 2f1d2ae1..5f0dc488 100644
--- a/src/helpers/ConfigSerializer.h
+++ b/src/helpers/ConfigSerializer.h
@@ -2,8 +2,8 @@
 
 #include <Arduino.h>
 
-#ifndef CONFIF_MAX_DEPTH
-  #define CONFIF_MAX_DEPTH   8
+#ifndef CONFIG_MAX_DEPTH
+  #define CONFIG_MAX_DEPTH   8
 #endif
 
 #ifndef CONFIG_MAX_KEYLEN
@@ -27,7 +27,7 @@ class ConfigSerializer {
     uint8_t rd_mode;
     char pending;
     char rd_buf[CONFIG_MAX_TOKEN_LEN];
-    char _keys[CONFIF_MAX_DEPTH][CONFIG_MAX_KEYLEN];
+    char _keys[CONFIG_MAX_DEPTH][CONFIG_MAX_KEYLEN];
 
   public:
     bool success = true;