clean up file handling

Alpha-CubeSat · Nov 21, 2024 · 538978b · 538978b
1 parent 8a9a093
commit 538978b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/Control Tasks/SDControlTask.cpp b/src/Control Tasks/SDControlTask.cpp
@@ -9,24 +9,29 @@ void SDControlTask::begin() {
         return;
     }
 
-    File boot = SD.open("boot.txt", O_RDWR);
+    File boot = SD.open(constants::sd::boot_filename, O_RDWR);
     if (boot) {
         String read_out = boot.readStringUntil('\n');
         file_count = read_out.toInt();
         boot.seek(0);
         file_count++;
         boot.println(file_count);
         boot.close();
+    } else {
+        boot = SD.open(constants::sd::boot_filename, FILE_WRITE);
+        boot.println(file_count);
+        boot.flush();
+        boot.close();
     }
 
     static char buffer[20];
     sprintf(buffer, "data_%d.csv", file_count);
 
-    sfr::sd::filename = buffer;
+    sfr::sd::log_filename = buffer;
 }
 
 void SDControlTask::execute() {
-    file = SD.open(sfr::sd::filename, FILE_WRITE);
+    file = SD.open(sfr::sd::log_filename, FILE_WRITE);
 
     String data = String(millis()) + "," +
                   String(sfr::motor::pulse_width_angle) + "," +

diff --git a/src/constants.hpp b/src/constants.hpp
@@ -84,7 +84,7 @@ namespace constants {
     }
 
     namespace sd {
-        constexpr char const *filename = "data.csv";
+        constexpr char const *boot_filename = "boot.txt";
     }
 } // namespace constants
 

diff --git a/src/sfr.cpp b/src/sfr.cpp
@@ -30,6 +30,6 @@ namespace sfr {
     } // namespace imu
 
     namespace sd {
-        char const *filename = "data_0.csv";
+        char const *log_filename = "data_0.csv";
     }
 } // namespace sfr
diff --git a/src/sfr.hpp b/src/sfr.hpp
@@ -30,7 +30,7 @@ namespace sfr {
         extern float gyro_z;
     } // namespace imu
     namespace sd {
-        extern char const *filename;
+        extern char const *log_filename;
     }
 } // namespace sfr