wip: json is maybe not the best way to store data in an embedded thingy

Author: heiso

firmware/esp32-s3/.vscode/c_cpp_properties.json

@@ -10,16 +10,13 @@
         "${env:IDF_PATH}/components/**"
       ],
       "browse": {
-        "path": [
-          "${env:IDF_PATH}/components",
-          "${workspaceFolder}"
-        ],
+        "path": ["${env:IDF_PATH}/components", "${workspaceFolder}"],
         "limitSymbolsToIncludedHeaders": true
       }
     }
   ],
   "env": {
-    "IDF_PATH": "~/esp/esp-idf",
+    "IDF_PATH": "${workspaceFolder}/../../ressources/espressif/esp-idf",
     "IDF_TOOL_PATH": "~/.espressif/tools"
   },
   "version": 4

firmware/esp32-s3/main/config_storage.c

@@ -15,8 +15,9 @@ static const char *TAG = "MACROLEV";
 
 #define BOOT_MODE_PIN GPIO_NUM_0
 #define STORAGE_NAMESPACE "storage"
+#define STORAGE_BASE_PATH "/spiffs"
 #define JSON_FILENAME "config.json"
-#define CDC_ACCUM_BUF_SIZE 1024
+#define CDC_ACCUM_BUF_SIZE (250 * 1024) // 250kb max
 
 #define MARKER "[EOF]"
 #define MARKER_LEN (sizeof(MARKER) - 1)
@@ -32,8 +33,7 @@ esp_err_t save_json_to_file(const char *filename, cJSON *json) {
   }
 
   char filepath[64];
-  // snprintf(filepath, sizeof(filepath), "/%s", filename);
-  snprintf(filepath, sizeof(filepath), filename);
+  snprintf(filepath, sizeof(filepath), "%s/%s", STORAGE_BASE_PATH, filename);
 
   FILE *f = fopen(filepath, "w");
   if (f == NULL) {
@@ -105,7 +105,7 @@ static void usb_cdc_rx_queue_handler_task(void *pvParameters) {
       ESP_LOGI(TAG, "Received %d bytes from USB", msg.buf_len);
 
       // Check for buffer overflow
-      if (cdc_accum_len + msg.buf_len < CDC_ACCUM_BUF_SIZE) {
+      if (cdc_accum_len + msg.buf_len <= CDC_ACCUM_BUF_SIZE) {
         memcpy(&cdc_accum_buf[cdc_accum_len], msg.buf, msg.buf_len);
         cdc_accum_len += msg.buf_len;
 
@@ -137,7 +137,7 @@ static void usb_cdc_rx_queue_handler_task(void *pvParameters) {
           }
         }
       } else {
-        ESP_LOGE(TAG, "CDC accumulation buffer overflow. Resetting buffer.");
+        ESP_LOGE(TAG, "CDC accumulation buffer overflow. Resetting buffer. cdc_accum_len: %d, CDC_ACCUM_BUF_SIZE: %d", cdc_accum_len, CDC_ACCUM_BUF_SIZE);
         cdc_accum_len = 0;
       }
     }
@@ -149,7 +149,7 @@ static esp_err_t init_spiffs(void) {
   ESP_LOGI(TAG, "Initializing SPIFFS");
 
   esp_vfs_spiffs_conf_t conf = {
-    .base_path = "/",
+    .base_path = STORAGE_BASE_PATH,
     .partition_label = NULL,
     .max_files = 1,
     .format_if_mount_failed = true

firmware/esp32-s3/main/main.c

@@ -27,7 +27,6 @@ void app_main(void) {
   // Main loop
   while (1) {
     vTaskDelay(pdMS_TO_TICKS(10));
-    // if (xQueueReceive(usb_queue, &msg, portMAX_DELAY)) {
     //   if (msg.buf_len) {
     //     // Print received data
     //     ESP_LOGI(TAG, "Data from channel %d with length %d", msg.itf, msg.buf_len);

firmware/esp32-s3/main/sensors.c

@@ -9,17 +9,6 @@
 #include <stdio.h>
 #include <string.h>
 
-/**
- * chip dependent
- * - usb
- * - config r/w
- * - how to read adc values
- *
- * lib
- * - config parse
- * - runtime
- */
-
 static const char *TAG = "MACROLEV";
 
 /**

firmware/esp32-s3/main/usb.c

@@ -94,7 +94,6 @@ void tinyusb_cdc_rx_callback(int itf, cdcacm_event_t *event) {
 void usb_init(void) {
   // Initialize TinyUSB
   ESP_LOGI(TAG, "USB initialization");
-  extern const tinyusb_config_t tusb_cfg;
   ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
 
   // Create the CDC RX queue

firmware/esp32-s3/test.json

@@ -0,0 +1 @@
+[{"id":15,"layout":{"x":0,"y":1,"height":1,"width":1},"hardware":{"adcChannel":0,"muxChannel":2,"magnetDirection":"NORTH_UP","switchMagneticProfileId":0},"deadzones":{"startOffset":0,"endOffset":0},"actuationDistance":0,"releaseDistance":0,"rapidTrigger":{"isEnabled":0,"isContinuous":0,"actuationDistanceDelta":0,"releaseDistanceDelta":0},"layers":[{"holdTimeBeforeActuation":0,"isAutoCapsEnabled":0,"autoCapsVelocityTreshold":0,"keycodes":[{"type":"NORMAL","value":0}]}]},{"id":15,"layout":{"x":0,"y":1,"height":1,"width":1},"hardware":{"adcChannel":0,"muxChannel":2,"magnetDirection":"NORTH_UP","switchMagneticProfileId":0},"deadzones":{"startOffset":0,"endOffset":0},"actuationDistance":0,"releaseDistance":0,"rapidTrigger":{"isEnabled":0,"isContinuous":0,"actuationDistanceDelta":0,"releaseDistanceDelta":0},"layers":[{"holdTimeBeforeActuation":0,"isAutoCapsEnabled":0,"autoCapsVelocityTreshold":0,"keycodes":[{"type":"NORMAL","value":0}]}]},{"id":15,"layout":{"x":0,"y":1,"height":1,"width":1},"hardware":{"adcChannel":0,"muxChannel":2,"magnetDirection":"NORTH_UP","switchMagneticProfileId":0},"deadzones":{"startOffset":0,"endOffset":0},"actuationDistance":0,"releaseDistance":0,"rapidTrigger":{"isEnabled":0,"isContinuous":0,"actuationDistanceDelta":0,"releaseDistanceDelta":0},"layers":[{"holdTimeBeforeActuation":0,"isAutoCapsEnabled":0,"autoCapsVelocityTreshold":0,"keycodes":[{"type":"NORMAL","value":0}]}]}]