Merge pull request #326 from USC-ACTLab/uSDGenericLogs

Generalize logging to uSD card
bitcraze · May 30, 2018 · c139156 · c139156
2 parents ccfb590 + c4d8087
commit c139156
Show file tree

Hide file tree

Showing 7 changed files with 382 additions and 425 deletions.
diff --git a/src/deck/drivers/interface/usddeck.h b/src/deck/drivers/interface/usddeck.h
@@ -4,27 +4,19 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#define USDLOG_ACC              (0x01)
-#define USDLOG_GYRO             (0x02)
-#define USDLOG_BARO             (0x04)
-#define USDLOG_MAG              (0x08)
-#define USDLOG_STABILIZER       (0x10)
-#define USDLOG_CONTROL          (0x20)
-#define USDLOG_RANGE            (0x40)
-
 typedef struct usdLogDataPtr_s {
   uint32_t* tick;
-  float* floats;
-  int* ints;
+  uint8_t* data;
 } usdLogQueuePtr_t;
 
 typedef struct usdLogConfig_s {
   char filename[13];
   uint8_t items;
   uint16_t frequency;
   uint8_t bufferSize;
-  uint8_t floatSlots;
-  uint8_t intSlots;
+  uint16_t numSlots;
+  uint16_t numBytes;
+  int* varIds; // dynamically allocated
 } usdLogConfig_t;
 
 #define USD_WRITE(FILE, MESSAGE, BYTES, BYTES_WRITTEN, CRC_VALUE, CRC_FINALXOR, CRC_TABLE) \