Battery enabled, setDefaults recursive

UI
==
- Array.svelte: showEditor not in $props

Server
=====
- Module.cpp: setDefaults recursive
- Features.ini: battery enabled
- pio.ini: set battery pin and voltage

Author: ewowi

features.ini

@@ -6,7 +6,7 @@ build_flags =
   -D FT_UPLOAD_FIRMWARE=1
   -D FT_DOWNLOAD_FIRMWARE=1 ; requires FT_NTP=1
   -D FT_SLEEP=1
-  -D FT_BATTERY=0
+  -D FT_BATTERY=1
   -D FT_ANALYTICS=1
   -D FT_FILEMANAGER=1
   -D FT_LIVESCRIPT=1

interface/src/lib/components/custom/Array.svelte

@@ -26,20 +26,22 @@
 	import Array from '$lib/components/custom/Array.svelte';
 	import ArrayLight from '$lib/components/custom/ArrayLight.svelte';
 
-    let { property, data, definition, showEditor = false, onChange, changeOnInput, value1=$bindable(), value2 } = $props();
+    let { property, data, definition, onChange, changeOnInput, value1=$bindable(), value2 } = $props();
 
     let dataEditable: any = $state({});
 
     let propertyEditable: string = $state("");
 
+    let showEditor: boolean = $state(false);
+
     //if no records added yet, add an empty array
     if (data[property.name] == undefined) {
         data[property.name] = [];
     }
 
     let lastIndex: number = -1;
 
-    console.log("Array property", property, data, definition, showEditor, changeOnInput, data[property.name], value1, value2);
+    console.log("Array property", property, data, definition, changeOnInput, data[property.name], value1, value2);
     for (let i = 0; i < definition.length; i++) {
         // console.log("addItem def", propertyName, property)
         if (property.name == definition[i].name) {

interface/src/routes/system/status/SystemStatus.svelte

@@ -206,7 +206,7 @@
 						</div>
 					</div>
 				{/if}
-				
+
 				<div class="rounded-box bg-base-100 flex items-center space-x-3 px-4 py-2">
 					<div class="mask mask-hexagon bg-primary h-auto w-10 flex-none">
 						<Heap class="text-primary-content h-auto w-full scale-75" />

lib/framework/WWWData.h

@@ -14,7 +14,7 @@ data_dir = data
 extra_configs = 
 	factory_settings.ini
 	features.ini
-default_envs = esp32-s3-devkitc-1
+; default_envs = esp32-s3-devkitc-1
 
 [custom]
 build_flags = 
@@ -31,7 +31,7 @@ build_flags =
 	${features.build_flags}
     -D BUILD_TARGET=\"$PIOENV\"
     -D APP_NAME=\"MoonBase\" ; Must only contain characters from [a-zA-Z0-9-_] as this is converted into a filename
-    -D APP_VERSION=\"0.5.4\" ; semver compatible version string
+    -D APP_VERSION=\"0.5.5\" ; semver compatible version string
 
     ; Move all networking stuff to the protocol core 0 and leave business logic on application core 1
     -D ESP32SVELTEKIT_RUNNING_CORE=0
@@ -61,8 +61,8 @@ build_flags =
     ; -D TELEPLOT_TASKS
 
     ; Uncomment and set right values if FT_BATTERY=1 and battery voltage is on pin
-    ; -D BATTERY_PIN=35
-    ; -D BATTERY_MV=4200
+    -D BATTERY_PIN=35
+    -D BATTERY_MV=4200
 
     ; Uncomment to use JSON instead of MessagePack for event messages. Default is MessagePack.
     -D EVENT_USE_JSON=1 

platformio.ini

@@ -11,12 +11,24 @@
 
 #include "Module.h"
 
-void ModuleState::setupData() {
+void setDefaults(JsonObject root, JsonArray definition) {
+    for (JsonObject property: definition) {
+        if (property["type"] != "array") {
+            root[property["name"]] = property["default"];
+        } else {
+            JsonArray array = root[property["name"]].to<JsonArray>();
+            //loop over detail propertys (recursive)
+            JsonObject object = array.add<JsonObject>(); // add one row
+            setDefaults(object, property["n"].as<JsonArray>());
+        }
+    }
+}
 
-    ESP_LOGD("", "ModuleState::setupData size %d", data.size());
+void ModuleState::setupData() {
 
     //only if no file ...
     if (data.size() == 0) {
+        ESP_LOGD("", "ModuleState::setupData size %d", data.size());
         JsonDocument definition;
         if (setupDefinition) 
             setupDefinition(definition.to<JsonArray>());
@@ -25,32 +37,24 @@ void ModuleState::setupData() {
 
         char buffer[256];
         serializeJson(definition, buffer, sizeof(buffer));
-        ESP_LOGD("", "setupDefinition %s", buffer);
+        // ESP_LOGD("", "setupDefinition %s", buffer);
 
         JsonObject root = data.to<JsonObject>();
 
-        //create doc based on definition... only top level properties
-        for (JsonObject property: definition.as<JsonArray>()) {
-            if (property["type"] != "array") {
-                root[property["name"]] = property["default"];
-            } else {
-                root[property["name"]].to<JsonArray>();
-                //loop over detail propertys (recursive)
-            }
-        }
+        setDefaults(root, definition.as<JsonArray>());
 
         // char buffer[256];
-        serializeJson(root, buffer, sizeof(buffer));
-        ESP_LOGD("", "setupData %s", buffer);
+        // serializeJson(root, buffer, sizeof(buffer));
+        // ESP_LOGD("", "setupData %s", buffer);
     }
 
     //to do: check if the file matches the definition
 }
 
 void ModuleState::read(ModuleState &state, JsonObject &root)
 {
-    TaskHandle_t httpdTask = xTaskGetHandle("httpd");
-    ESP_LOGI("", "Module::read task %s %d", pcTaskGetName(httpdTask), uxTaskGetStackHighWaterMark(httpdTask));
+    TaskHandle_t currentTask = xTaskGetCurrentTaskHandle();
+    ESP_LOGI("", "Module::read task %s %d", pcTaskGetName(currentTask), uxTaskGetStackHighWaterMark(currentTask));
 
     root.set(state.data.as<JsonObject>()); //copy
 
@@ -90,8 +94,8 @@ StateUpdateResult ModuleState::update(JsonObject &root, ModuleState &state)
 {
 
     if (root.size() != 0) { // in case of empty file
-        TaskHandle_t httpdTask = xTaskGetHandle("httpd");
-        ESP_LOGI("", "Module::update task %s %d", pcTaskGetName(httpdTask), uxTaskGetStackHighWaterMark(httpdTask));
+        TaskHandle_t currentTask = xTaskGetCurrentTaskHandle();
+        ESP_LOGI("", "Module::update task %s %d", pcTaskGetName(currentTask), uxTaskGetStackHighWaterMark(currentTask));
         state.updatedItems.clear();
 
         //check which propertys have updated

src/custom/Module.cpp

@@ -79,6 +79,7 @@ class ModuleAnimations : public Module
     }
 
     void setupDefinition(JsonArray root) override {
+        ESP_LOGD("", "");
         JsonObject property;
         JsonArray details;
         JsonArray values;
@@ -129,9 +130,9 @@ class ModuleAnimations : public Module
             property = details.add<JsonObject>(); property["name"] = "type"; property["type"] = "text"; property["default"] = "map";
         }
 
-        char buffer[1024];
-        serializeJson(root, buffer, sizeof(buffer));
-        ESP_LOGD("", "definition %s", buffer);
+        // char buffer[1024];
+        // serializeJson(root, buffer, sizeof(buffer));
+        // ESP_LOGD("", "definition %s", buffer);
     }
 
     void onUpdate(UpdatedItem updatedItem) override

src/custom/ModuleAnimations.h

@@ -28,6 +28,7 @@ ModuleDemo(PsychicHttpServer *server,
     }
 
 void setupDefinition(JsonArray root) override{
+    ESP_LOGD("", "");
     JsonObject property;
     JsonArray details;
     JsonArray values;
@@ -58,9 +59,9 @@ void setupDefinition(JsonArray root) override{
 
         // {"hostName":"MoonLight","connectionMode":"Priority","savedNetworks":[],"invoices":[{"number":1000,"name":"ewowi","date":"2025-03-21", "lines":[{"service":"con", "price":124}]}]}
 
-        char buffer[256];
-        serializeJson(root, buffer, sizeof(buffer));
-        ESP_LOGD("", "definition %s", buffer);
+        // char buffer[256];
+        // serializeJson(root, buffer, sizeof(buffer));
+        // ESP_LOGD("", "definition %s", buffer);
     }
 
     void onUpdate(UpdatedItem updatedItem) override