Review toJon functions

examples/TimezoneToJson/TimezoneToJson.ino

@@ -13,7 +13,16 @@ void setup() {
   uint32_t start = ESP.getFreeHeap();
 
   JsonDocument doc;
-  Mycila::NTP.timezonesToJson(doc.to<JsonObject>());
+
+  Mycila::NTP.timezonesToJsonObject(doc.to<JsonObject>());
+  serializeJsonPretty(doc, Serial);
+  Serial.println();
+
+  Serial.print("Heap used: ");
+  Serial.print(start - ESP.getFreeHeap());
+  Serial.println(" bytes");
+
+  Mycila::NTP.timezonesToJsonArray(doc.to<JsonArray>());
   serializeJsonPretty(doc, Serial);
   Serial.println();
 

platformio.ini

@@ -1,6 +1,6 @@
 [env]
-build_flags = -Wall -Wextra
-; build_flags = -Wall -Wextra -D MYCILA_NTP_JSON_SUPPORT
+; build_flags = -Wall -Wextra
+build_flags = -Wall -Wextra -D MYCILA_NTP_JSON_SUPPORT
 lib_deps = ArduinoJson
 
 upload_protocol = esptool
@@ -12,8 +12,8 @@ monitor_filters = esp32_exception_decoder, log2file
 
 [platformio]
 lib_dir = .
-src_dir = examples/NTP
-; src_dir = examples/TimezoneToJson
+; src_dir = examples/NTP
+src_dir = examples/TimezoneToJson
 
 [env:esp32]
 platform = espressif32@6.5.0

src/MycilaNTP.cpp

@@ -82,7 +82,7 @@ bool Mycila::NTPClass::sync(const timeval* tv) {
 }
 
 #ifdef MYCILA_NTP_JSON_SUPPORT
-void Mycila::NTPClass::timezonesToJson(const JsonObject& doc) const {
+void Mycila::NTPClass::timezonesToJsonObject(const JsonObject& doc) const {
   char* start = const_cast<char*>(MYCILA_NTP_SPEC);
   char* token = strstr(start, "=");
   while (token != nullptr) {
@@ -95,6 +95,17 @@ void Mycila::NTPClass::timezonesToJson(const JsonObject& doc) const {
     doc[timezone] = spec;
   }
 }
+
+void Mycila::NTPClass::timezonesToJsonArray(const JsonArray& doc) const {
+  char* start = const_cast<char*>(MYCILA_NTP_SPEC);
+  char* token = strstr(start, "=");
+  while (token != nullptr) {
+    doc.add(String(start, static_cast<size_t>(token - start)));
+    token = strstr(token + 1, "\n");
+    start = token + 1;
+    token = strstr(start, "=");
+  }
+}
 #endif
 
 namespace Mycila {

src/MycilaNTP.h

@@ -40,7 +40,10 @@ namespace Mycila {
       bool isSynced() const { return _synced; }
 
 #ifdef MYCILA_NTP_JSON_SUPPORT
-      void timezonesToJson(const JsonObject& doc) const;
+      // map of timezone names and timezone info
+      void timezonesToJsonObject(const JsonObject& doc) const;
+      // list of timezone names
+      void timezonesToJsonArray(const JsonArray& doc) const;
 #endif
 
     private: