tweak debug disk creation

CMakeLists.txt

@@ -52,7 +52,7 @@ target_sources(gadget PUBLIC
     src/usb_descriptors.c
     src/usb_msc.c
     src/fat_disk.c
-    src/debug.c
+    src/debug_disk.c
     src/buttons.c
     src/lipo.c
     src/ble.c

include/debug.h → include/debug_disk.h

@@ -1,5 +1,5 @@
 /*
- * debug.h
+ * debug_disk.h
  *
  * Copyright (c) 2022 - 2023 Thomas Buck (thomas@xythobuz.de)
  *
@@ -16,13 +16,12 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DEBUG_H__
-#define __DEBUG_H__
+#ifndef __DEBUG_DISK_H__
+#define __DEBUG_DISK_H__
 
-int debug_msc_mount(void);
-int debug_msc_unmount(void);
+void debug_disk_init(void);
 
-void debug_msc_stats(void);
-void debug_msc_pmw3360(void);
+int debug_disk_mount(void);
+int debug_disk_unmount(void);
 
-#endif // __DEBUG_H__
+#endif // __DEBUG_DISK_H__

pack_data.sh

@@ -4,10 +4,12 @@ set -euo pipefail
 cd "$(dirname "$0")"
 echo "Packing data"
 
+rm -rf build/src
 mkdir -p build/src
 cp COPYING build/src
 cp README.md build/src
 cp CMakeLists.txt build/src
+cp .gitmodules build/src/gitmodules
 cp -r include build/src
 cp -r src build/src
 

src/console.c

@@ -27,7 +27,7 @@
 #include "util.h"
 #include "usb_cdc.h"
 #include "usb_msc.h"
-#include "debug.h"
+#include "debug_disk.h"
 #include "console.h"
 #include "lipo.h"
 #include "ble.h"

src/debug.c

@@ -1,61 +0,0 @@
-/*
- * debug.c
- *
- * Copyright (c) 2022 - 2023 Thomas Buck (thomas@xythobuz.de)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * See <http://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-#include "pico/stdlib.h"
-#include "ff.h"
-
-#include "config.h"
-#include "log.h"
-#include "debug.h"
-
-static FATFS fs;
-static bool mounted = false;
-
-int debug_msc_mount(void) {
-    if (mounted) {
-        debug("already mounted");
-        return 0;
-    }
-
-    FRESULT res = f_mount(&fs, "", 0);
-    if (res != FR_OK) {
-        debug("error: f_mount returned %d", res);
-        mounted = false;
-        return -1;
-    }
-
-    mounted = true;
-    return 0;
-}
-
-int debug_msc_unmount(void) {
-    if (!mounted) {
-        debug("already unmounted");
-        return 0;
-    }
-
-    FRESULT res = f_mount(0, "", 0);
-    if (res != FR_OK) {
-        debug("error: f_mount returned %d", res);
-        return -1;
-    }
-
-    mounted = false;
-    return 0;
-}

src/debug_disk.c

@@ -0,0 +1,132 @@
+/*
+ * debug_disk.c
+ *
+ * Copyright (c) 2022 - 2023 Thomas Buck (thomas@xythobuz.de)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * See <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "pico/stdlib.h"
+#include "ff.h"
+
+#include "config.h"
+#include "log.h"
+#include "debug_disk.h"
+
+#include "pack_data.h"
+
+static FATFS fs;
+static bool mounted = false;
+
+void debug_disk_init(void) {
+    if (debug_disk_mount() != 0) {
+        debug("error mounting disk");
+        return;
+    }
+
+    // maximum length: 11 bytes
+    f_setlabel("DEBUG DISK");
+
+    FIL file;
+    FRESULT res = f_open(&file, "README.md", FA_CREATE_ALWAYS | FA_WRITE);
+    if (res != FR_OK) {
+        debug("error: f_open returned %d", res);
+    } else {
+        char readme[1024];
+        size_t pos = 0;
+        pos += snprintf(readme + pos, 1024 - pos, "# Volcano Remote Control Gadget\r\n");
+        pos += snprintf(readme + pos, 1024 - pos, "\r\n");
+        pos += snprintf(readme + pos, 1024 - pos, "Project by Thomas Buck <thomas@xythobuz.de>\r\n");
+        pos += snprintf(readme + pos, 1024 - pos, "Licensed under GPLv3.\r\n");
+        pos += snprintf(readme + pos, 1024 - pos, "See included 'src.tar.xz' for sources.\r\n");
+        pos += snprintf(readme + pos, 1024 - pos, "Repo at https://git.xythobuz.de/thomas/sb-py\r\n");
+
+        size_t len = strlen(readme);
+        UINT bw;
+        res = f_write(&file, readme, len, &bw);
+        if ((res != FR_OK) || (bw != len)) {
+            debug("error: f_write returned %d", res);
+        }
+
+        res = f_close(&file);
+        if (res != FR_OK) {
+            debug("error: f_close returned %d", res);
+        }
+    }
+
+    res = f_open(&file, "src.tar.xz", FA_CREATE_ALWAYS | FA_WRITE);
+    if (res != FR_OK) {
+        debug("error: f_open returned %d", res);
+    } else {
+        UINT bw;
+        UINT len = 0;
+        while (1) {
+            res = f_write(&file, data_tar_xz + len, data_tar_xz_len - len, &bw);
+            len += bw;
+            if (res != FR_OK) {
+                debug("error: f_write returned %d", res);
+                break;
+            } else if (bw == 0) {
+                debug("error: f_write did not write");
+                break;
+            } else if (bw == data_tar_xz_len) {
+                break;
+            }
+        }
+
+        res = f_close(&file);
+        if (res != FR_OK) {
+            debug("error: f_close returned %d", res);
+        }
+    }
+
+    if (debug_disk_unmount() != 0) {
+        debug("error unmounting disk");
+    }
+}
+
+int debug_disk_mount(void) {
+    if (mounted) {
+        debug("already mounted");
+        return 0;
+    }
+
+    FRESULT res = f_mount(&fs, "", 0);
+    if (res != FR_OK) {
+        debug("error: f_mount returned %d", res);
+        mounted = false;
+        return -1;
+    }
+
+    mounted = true;
+    return 0;
+}
+
+int debug_disk_unmount(void) {
+    if (!mounted) {
+        debug("already unmounted");
+        return 0;
+    }
+
+    FRESULT res = f_mount(0, "", 0);
+    if (res != FR_OK) {
+        debug("error: f_mount returned %d", res);
+        return -1;
+    }
+
+    mounted = false;
+    return 0;
+}

src/fat_disk.c

@@ -18,7 +18,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 
 #include "pico/stdlib.h"
 #include "ff.h"
@@ -26,11 +25,9 @@
 
 #include "config.h"
 #include "log.h"
-#include "debug.h"
+#include "debug_disk.h"
 #include "fat_disk.h"
 
-#include "pack_data.h"
-
 static uint8_t disk[DISK_BLOCK_COUNT * DISK_BLOCK_SIZE];
 
 void fat_disk_init(void) {
@@ -38,75 +35,6 @@ void fat_disk_init(void) {
     FRESULT res = f_mkfs("", 0, work, sizeof(work));
     if (res != FR_OK) {
         debug("error: f_mkfs returned %d", res);
-        return;
-    }
-
-    if (debug_msc_mount() != 0) {
-        debug("error mounting disk");
-        return;
-    }
-
-    // maximum length: 11 bytes
-    f_setlabel("DEBUG DISK");
-
-    FIL file;
-    res = f_open(&file, "README.md", FA_CREATE_ALWAYS | FA_WRITE);
-    if (res != FR_OK) {
-        debug("error: f_open returned %d", res);
-    } else {
-        char readme[1024];
-        size_t pos = 0;
-        pos += snprintf(readme + pos, 1024 - pos, "# Volcano Remote Control Gadget\r\n");
-        pos += snprintf(readme + pos, 1024 - pos, "\r\n");
-        pos += snprintf(readme + pos, 1024 - pos, "Project by Thomas Buck <thomas@xythobuz.de>\r\n");
-        pos += snprintf(readme + pos, 1024 - pos, "Licensed under GPLv3.\r\n");
-        pos += snprintf(readme + pos, 1024 - pos, "See included src.tar.xz for sources.\r\n");
-        pos += snprintf(readme + pos, 1024 - pos, "Repo at https://git.xythobuz.de/thomas/sb-py\r\n");
-
-        size_t len = strlen(readme);
-        UINT bw;
-        res = f_write(&file, readme, len, &bw);
-        if ((res != FR_OK) || (bw != len)) {
-            debug("error: f_write returned %d", res);
-        }
-
-        res = f_close(&file);
-        if (res != FR_OK) {
-            debug("error: f_close returned %d", res);
-        }
-    }
-
-    res = f_open(&file, "src.tar.xz", FA_CREATE_ALWAYS | FA_WRITE);
-    if (res != FR_OK) {
-        debug("error: f_open returned %d", res);
-    } else {
-        UINT bw;
-        UINT len = 0;
-        while (1) {
-            debug("write %d", len);
-            res = f_write(&file, data_tar_xz + len, data_tar_xz_len - len, &bw);
-            if (bw == 0) {
-                debug("abort");
-                break;
-            }
-            len += bw;
-            if (res != FR_OK) {
-                debug("error: f_write returned %d", res);
-                break;
-            }
-            if (bw == data_tar_xz_len) {
-                break;
-            }
-        }
-
-        res = f_close(&file);
-        if (res != FR_OK) {
-            debug("error: f_close returned %d", res);
-        }
-    }
-
-    if (debug_msc_unmount() != 0) {
-        debug("error unmounting disk");
     }
 }
 

src/main.c

@@ -27,6 +27,7 @@
 #include "log.h"
 #include "usb.h"
 #include "fat_disk.h"
+#include "debug_disk.h"
 #include "buttons.h"
 #include "ble.h"
 #include "lcd.h"
@@ -70,6 +71,9 @@ int main(void) {
     debug("fat_disk_init");
     fat_disk_init();
 
+    debug("debug_disk_init");
+    debug_disk_init();
+
     // trigger after 1000ms
     watchdog_enable(1000, 1);