Added sd support and fixed proto malloc

esp32/include/communication/comm_base.hpp

@@ -54,7 +54,8 @@ class CommAdapterBase {
 
         pb_ostream_t stream = pb_ostream_from_buffer(buffer, out_size);
         if (!pb_encode(&stream, socket_message_Message_fields, &msg_)) {
-            ESP_LOGE("ProtoComm", "Failed to encode message (tag %d), buffer too small?", (int)tag);
+            ESP_LOGE("ProtoComm", "Failed to encode message (tag %d): %s (calc=%u, written=%u)",
+                     (int)tag, PB_GET_ERROR(&stream), out_size, stream.bytes_written);
             return;
         }
 

esp32/include/communication/proto_helpers.h

@@ -3,6 +3,7 @@
 #include <pb_encode.h>
 #include <pb_decode.h>
 #include <platform_shared/message.pb.h>
+#include <esp_log.h>
 #include <functional>
 #include <map>
 
@@ -71,32 +72,48 @@ class ProtoDecoder {
     bool decode(const uint8_t* data, size_t len, int clientId) {
         pb_istream_t stream = pb_istream_from_buffer(data, len);
 
-        if (!pb_decode(&stream, socket_message_Message_fields, &msg_)) {
+        // Reset message before decoding (nanopb will malloc FT_POINTER fields)
+        msg_ = socket_message_Message_init_zero;
+
+        bool success = pb_decode(&stream, socket_message_Message_fields, &msg_);
+
+        if (!success) {
+            ESP_LOGE("ProtoHelpers", "Decode failed: %s (len=%u)", PB_GET_ERROR(&stream), len);
+            pb_release(socket_message_Message_fields, &msg_);
             return false;
         }
 
+        bool handled = false;
         switch (msg_.which_message) {
             case socket_message_Message_sub_notif_tag:
                 if (subscribeHandler_) subscribeHandler_(msg_.message.sub_notif.tag, clientId);
-                return true;
+                handled = true;
+                break;
 
             case socket_message_Message_unsub_notif_tag:
                 if (unsubscribeHandler_) unsubscribeHandler_(msg_.message.unsub_notif.tag, clientId);
-                return true;
+                handled = true;
+                break;
 
             case socket_message_Message_pingmsg_tag:
                 if (pingHandler_) pingHandler_(clientId);
-                return true;
+                handled = true;
+                break;
 
             default: {
                 auto it = handlers_.find(msg_.which_message);
                 if (it != handlers_.end()) {
                     it->second(clientId);
-                    return true;
+                    handled = true;
                 }
-                return false;
+                break;
             }
         }
+
+        // Free any malloc'd FT_POINTER fields
+        pb_release(socket_message_Message_fields, &msg_);
+
+        return handled;
     }
 
   private:

esp32/include/filesystem.h

@@ -9,16 +9,18 @@
 #include <cstdio>
 #include <platform_shared/api.pb.h>
 
-#define MOUNT_POINT "/littlefs"
+#define MOUNT_POINT "/"
+#define LITTLEFS_MOUNT_POINT "/littlefs"
+#define SD_MOUNT_POINT "/sdcard"
 
-#define FS_CONFIG_DIRECTORY MOUNT_POINT "/config"
-#define DEVICE_CONFIG_FILE MOUNT_POINT "/config/peripheral.pb"
-#define CAMERA_SETTINGS_FILE MOUNT_POINT "/config/cameraSettings.pb"
-#define AP_SETTINGS_FILE MOUNT_POINT "/config/apSettings.pb"
-#define MDNS_SETTINGS_FILE MOUNT_POINT "/config/mdnsSettings.pb"
-#define WIFI_SETTINGS_FILE MOUNT_POINT "/config/wifiSettings.pb"
-#define PERIPHERAL_SETTINGS_FILE MOUNT_POINT "/config/peripheralSettings.pb"
-#define SERVO_SETTINGS_FILE MOUNT_POINT "/config/servoSettings.pb"
+#define FS_CONFIG_DIRECTORY LITTLEFS_MOUNT_POINT "/config"
+#define DEVICE_CONFIG_FILE LITTLEFS_MOUNT_POINT "/config/peripheral.pb"
+#define CAMERA_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/cameraSettings.pb"
+#define AP_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/apSettings.pb"
+#define MDNS_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/mdnsSettings.pb"
+#define WIFI_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/wifiSettings.pb"
+#define PERIPHERAL_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/peripheralSettings.pb"
+#define SERVO_SETTINGS_FILE LITTLEFS_MOUNT_POINT "/config/servoSettings.pb"
 
 namespace FileSystem {
 

esp32/include/filesystem_ws.h

@@ -7,7 +7,7 @@
 #include <functional>
 #include <cstdio>
 
-#define FS_MAX_CHUNK_SIZE 16384
+#define FS_MAX_CHUNK_SIZE (1024*64)
 #define FS_TRANSFER_TIMEOUT_MS 30000
 
 namespace FileSystemWS {