Cleanup with the meta_logging and rocket_state.h

Just some small bug fixes. Right now I'm stuck on what 'MultipleLogSink<Sinks...> sinks;' is and why it isn't working. I'm assuming its because of the other files.

Author: MichaelCyrwus

MIDAS/GroundStation

@@ -0,0 +1 @@
+Subproject commit a066162245425367a4bda452001b6c0ff4578e21

MIDAS/src/data_logging_meta.h

@@ -12,9 +12,11 @@ enum MetaDataCode {
     EVENT_TMAIN,
 
     // Non-events
-    DATA_LAUNCHSITE_ALT_BARO,
-    DATA_LAUNCHSITE_ALT_GPS,
-    DATA_LAUNCH_INITIAL_TILT
+    DATA_LAUNCHSITE_BARO,
+    DATA_LAUNCHSITE_GPS,
+    DATA_LAUNCH_INITIAL_TILT,
+    DATA_TILT_AT_BURNOUT,
+    DATA_TILT_AT_IGNITION
 };
 
 struct MetaLogging {

MIDAS/src/esp_eeprom_checksum.h

@@ -0,0 +1,2 @@
+// autogenerated on build by applying crc32 on esp_eeprom_format.h
+#define EEPROM_CHECKSUM (0xcfa22d7d)

MIDAS/src/finite-state-machines/fsm.h

@@ -34,6 +34,10 @@ class FSM {
 
     FSMState tick_fsm(FSMState& curr_state, StateEstimate state_estimate, CommandFlags& commands);
 
+    // Constructor for the metadata
+    // Created so that FSMState, StateEstimate, and CommandFlags objects can supercede the mutex lock
+    FSMState tick_fsm(RocketData& sys);
+
 private:
     double launch_time;
     double burnout_time;

MIDAS/src/hardware/SDLog.cpp

@@ -24,7 +24,7 @@ ErrorCode SDSink::init() {
     char file_name[16] = "data";
     char meta_name[24];
     char dfext[] = ".launch";
-    sdFileNamer(file_name, ext, SD_MMC);
+    sdFileNamer(file_name, dfext, SD_MMC);
 
     strcpy(meta_name, file_name);
     char* extpos = strrchr(meta_name, '.');

MIDAS/src/rocket_state.h

@@ -6,6 +6,10 @@
 #include "hal.h"
 #include "Buffer.h"
 
+// temprary macro
+// originally declared in data_loggng_meta.h
+#define META_LOGGING_MAX_SIZE 64
+
 /** 
  * @brief The RocketState struct stores everything that is needed by more than one system/thread of the Rocket.
  *
@@ -153,6 +157,8 @@ class Latency {
     }
 };
 
+#define META_LOGGING_MAX_SIZE 64
+
 enum MetaDataCode {
     // Launch events
     EVENT_TLAUNCH,
@@ -202,7 +208,6 @@ struct MetaLogging {
     }
 };
 
-
 /**
  * @struct CommandFlags
  * 

MIDAS/src/systems.cpp

@@ -30,7 +30,7 @@ DECLARE_THREAD(logger, RocketSystems* arg) {
 
         if (meta_delay_ctr >= 100) {
             MetaLogging::MetaLogEntry entry;
-            if(arg->meta_log.get_queued(&entry)) {
+            if(arg->meta_logging.get_queued(&entry)) {
                 uint8_t buf[72];
                 size_t total_size = sizeof(MetaDataCode) + entry.size;
                 memcpy(buf, &entry.log_type, sizeof(MetaDataCode));