DCU fix

ZacharyBer · ZacharyBer · commit ce9ab331d619 · 2026-06-06T15:12:42.000-07:00
diff --git a/.cubemx-manifest.json b/.cubemx-manifest.json
@@ -4,7 +4,7 @@
   "boards": {
     "BMS": {
       "ioc_checksum": "08670b75875f2feedea3280eecc4821f36b742ccf7680976ae6f87bc3937ebfc",
-      "generated_at": "2026-05-31T22:00:42Z",
+      "generated_at": "2026-06-06T22:12:01Z",
       "files": {
         "Core/Inc/FreeRTOSConfig.h": "363755b7a21dd5a790f0bafbfd68f00abe141fd8691720b3604bc84b7dbaa81b",
         "Core/Inc/adc.h": "0ac97025a4065f07b7b65a906bd0c45ea800215434ed43c287c1685507f3f612",
@@ -75,7 +75,7 @@
     },
     "DASH": {
       "ioc_checksum": "919253252bb89abb628b9105693f93510957783991dc2f4608e8da228a4235ea",
-      "generated_at": "2026-05-31T22:00:44Z",
+      "generated_at": "2026-06-06T22:12:03Z",
       "files": {
         "Core/Inc/FreeRTOSConfig.h": "692168cbc9c915133ce3f329cec850c5372c1759ec0412ced61fc14741de14be",
         "Core/Inc/can.h": "d9c82c8382c196a76d472a6b82a292a0384a086536ca280ce701ebbba9f5c682",
@@ -177,7 +177,7 @@
     },
     "DART": {
       "ioc_checksum": "5e40a62867a13bf2ccbc21a8343b896b2979b658d024cb6721e46e05b32b5a45",
-      "generated_at": "2026-05-31T22:00:44Z",
+      "generated_at": "2026-06-06T22:12:03Z",
       "files": {
         "Core/Inc/can.h": "8bb6621564cd436d9b9697bc86bc4c6f6ae0492b84673344dfa5a3a2d0ee06cb",
         "Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -202,10 +202,10 @@
       }
     },
     "DCU": {
-      "ioc_checksum": "1897fddbae0d70adffbb05afce5d5d2ae8f76fef77b684b121ff3e8f6f6dc2ea",
-      "generated_at": "2026-05-31T22:00:46Z",
+      "ioc_checksum": "3ca0c8e6d3c37e459605b21b9193ba2cfe5a96315c2aa0cf6f560a585e03e01f",
+      "generated_at": "2026-06-06T22:12:05Z",
       "files": {
-        "Core/Inc/FreeRTOSConfig.h": "86f1fd7d3548ad19ef6466838128e59d8e2359bdee26eeb29f7fa19514b9e91d",
+        "Core/Inc/FreeRTOSConfig.h": "f664caa84f355ae18d9faf3f04e5f62d8c95d07210511fb284854ae5a426e17e",
         "Core/Inc/can.h": "98925d7f4010f054e17d240116244377377c15248a5413a09ff811cdc23084e5",
         "Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
         "Core/Inc/gpio.h": "e2d62f964a0b7f238384ed6a20a181d09df9647240a268dc547acf5b35099f74",
@@ -289,7 +289,7 @@
     },
     "LVPDB": {
       "ioc_checksum": "aad83d2888e50c4498ca882150e6cc94c6266554b55da81220b3a142c5b5e4b2",
-      "generated_at": "2026-05-31T22:00:47Z",
+      "generated_at": "2026-06-06T22:12:05Z",
       "files": {
         "Core/Inc/can.h": "17611aeff90b90e352bc2ace2749644663492ecb10c71539567ef9b1441fd5d9",
         "Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -317,7 +317,7 @@
     },
     "PCU": {
       "ioc_checksum": "3eaf91e0bfa3eca7f8f45868c51a0ac1dcb92b96efaedca982684c948468503b",
-      "generated_at": "2026-05-31T22:00:47Z",
+      "generated_at": "2026-06-06T22:12:06Z",
       "files": {
         "Core/Inc/adc.h": "e36acfe1b822eff1de7e9f93073b8da32c94dd5b09484b716e190c6aa63eb3d0",
         "Core/Inc/can.h": "98925d7f4010f054e17d240116244377377c15248a5413a09ff811cdc23084e5",
@@ -347,7 +347,7 @@
     },
     "Sensor_Nodes": {
       "ioc_checksum": "92d075b8d175250a76dee123ca59955032f2ebe8519ffb49e998bb810b3701f2",
-      "generated_at": "2026-06-06T20:57:01Z",
+      "generated_at": "2026-06-06T22:12:06Z",
       "files": {
         "Core/Inc/adc.h": "0ac97025a4065f07b7b65a906bd0c45ea800215434ed43c287c1685507f3f612",
         "Core/Inc/can.h": "98925d7f4010f054e17d240116244377377c15248a5413a09ff811cdc23084e5",
@@ -377,7 +377,7 @@
     },
     "UART": {
       "ioc_checksum": "9ff281c674a516d9870dbee5d60587351e97884ecd27127e2d1464987bf16a17",
-      "generated_at": "2026-05-31T22:00:49Z",
+      "generated_at": "2026-06-06T22:12:07Z",
       "files": {
         "Core/Inc/FreeRTOSConfig.h": "2a0e6022391d5ec198a77021ec3bf284583e245f9ce20c420fb7608f638330d6",
         "Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -437,7 +437,7 @@
     },
     "UART_TEST": {
       "ioc_checksum": "06c9618835096e44e3f73cd158bbc2e3fcf76e65dc9a29db68fe607180843efd",
-      "generated_at": "2026-05-31T22:00:50Z",
+      "generated_at": "2026-06-06T22:12:09Z",
       "files": {
         "Core/Inc/FreeRTOSConfig.h": "773dad076864ff18d5d85603d348d4931d29dde9925486e58f95a97ac98b8404",
         "Core/Inc/app_freertos.h": "6229601c2ebf192d40ceef377f3c1785571eaf6407f10bc87be5b06357dd3515",
diff --git a/BMS/VERSION b/BMS/VERSION
@@ -1 +1 @@
-1.7.4
+1.7.5
diff --git a/DART/VERSION b/DART/VERSION
@@ -1 +1 @@
-1.7.3
+1.7.4
diff --git a/DASH/VERSION b/DASH/VERSION
@@ -1 +1 @@
-1.7.5
+1.7.6
diff --git a/DCU/VERSION b/DCU/VERSION
@@ -1 +1 @@
-1.7.3
+1.7.4
diff --git a/LVPDB/VERSION b/LVPDB/VERSION
@@ -1 +1 @@
-1.7.5
+1.7.6
diff --git a/PCU/VERSION b/PCU/VERSION
@@ -1 +1 @@
-1.7.14
+1.7.15
diff --git a/Sensor_Nodes/VERSION b/Sensor_Nodes/VERSION
@@ -1 +1 @@
-1.7.3
+1.7.4
diff --git a/UART/VERSION b/UART/VERSION
@@ -1 +1 @@
-1.7.3
+1.7.4
diff --git a/UART_TEST/VERSION b/UART_TEST/VERSION
@@ -1 +1 @@
-1.7.2
+1.7.3
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.18
+1.7.19
diff --git a/common/FEB_Serial_Library/FEB_Console/Src/feb_console.c b/common/FEB_Serial_Library/FEB_Console/Src/feb_console.c
@@ -86,7 +86,7 @@ static bool csv_in_transaction;
 
 static int parse_args(char *line, char *argv[], int max_args);
 static const FEB_Console_Cmd_t *find_command(const char *name);
-__attribute__((unused)) static size_t u64_to_decimal(uint64_t v, char *out, size_t cap);
+static size_t u64_to_decimal(uint64_t v, char *out, size_t cap);
 static bool tx_id_is_valid(const char *s);
 static bool board_matches(const char *addr);
 static int csv_emit_v(const char *response_type, const char *fmt, va_list ap);
@@ -111,7 +111,7 @@ void FEB_Console_Init(bool register_default_commands)
   }
 #endif
 
-  // FEB_Time_Init();
+  FEB_Time_Init();
 
   if (register_default_commands)
   {
@@ -411,14 +411,14 @@ int FEB_Console_CsvEmitAs(const char *tx_id, const char *response_type, const ch
     response_type = "";
   }
 
-  // uint64_t us = FEB_Time_Us();
-  // char us_str[24];
-  // u64_to_decimal(us, us_str, sizeof(us_str));
+  uint64_t us = FEB_Time_Us();
+  char us_str[24];
+  u64_to_decimal(us, us_str, sizeof(us_str));
 
   const char *board_name = (feb_build_info.board_name != NULL) ? feb_build_info.board_name : "?";
 
   char buf[FEB_CONSOLE_PRINTF_BUFFER_SIZE];
-  int pre = snprintf(buf, sizeof(buf), "csv,%s,%s,%s,%s", tx_id, board_name, ".", response_type);
+  int pre = snprintf(buf, sizeof(buf), "csv,%s,%s,%s,%s", tx_id, board_name, us_str, response_type);
   if (pre < 0)
   {
     return pre;
@@ -542,9 +542,9 @@ static const FEB_Console_Cmd_t *find_command(const char *name)
   return NULL;
 }
 
-/* newlib-nano printf drops %llu, so format the uint64 manually.
-   Retained (unused) until feb_time + the CSV timestamp wiring are restored. */
-__attribute__((unused)) static size_t u64_to_decimal(uint64_t v, char *out, size_t cap)
+/* newlib-nano printf drops %llu, so format the uint64 microsecond timestamp
+   manually for the CSV row. */
+static size_t u64_to_decimal(uint64_t v, char *out, size_t cap)
 {
   if (cap == 0)
   {
@@ -621,14 +621,14 @@ static int csv_emit_v(const char *response_type, const char *fmt, va_list ap)
     response_type = "";
   }
 
-  // uint64_t us = FEB_Time_Us();
-  // char us_str[24];
-  // u64_to_decimal(us, us_str, sizeof(us_str));
+  uint64_t us = FEB_Time_Us();
+  char us_str[24];
+  u64_to_decimal(us, us_str, sizeof(us_str));
 
   const char *board_name = (feb_build_info.board_name != NULL) ? feb_build_info.board_name : "?";
 
   char buf[FEB_CONSOLE_PRINTF_BUFFER_SIZE];
-  int pre = snprintf(buf, sizeof(buf), "csv,%s,%s,%s,%s", csv_current_tx_id, board_name, ".", response_type);
+  int pre = snprintf(buf, sizeof(buf), "csv,%s,%s,%s,%s", csv_current_tx_id, board_name, us_str, response_type);
   if (pre < 0)
   {
     return pre;
diff --git a/common/FEB_Time_Library/Inc/feb_time.h b/common/FEB_Time_Library/Inc/feb_time.h
@@ -1,87 +1,87 @@
-// /**
-//  ******************************************************************************
-//  * @file           : feb_time.h
-//  * @brief          : FEB Time Library - microsecond-precision monotonic clock
-//  * @author         : Formula Electric @ Berkeley
-//  ******************************************************************************
-//  * @details
-//  *
-//  * Provides a 64-bit microsecond clock. On Cortex-M3+ (F446RE boards) it is
-//  * backed by the DWT cycle counter - zero peripheral cost, uses only the
-//  * CoreDebug/DWT core units. On Cortex-M0 (F042 / DART), DWT is not present,
-//  * so the library falls back to HAL_GetTick() plus SysTick->VAL for sub-tick
-//  * resolution. The API and units are identical on both paths.
-//  *
-//  * Usage:
-//  *   FEB_Time_Init();                 // once at boot, before use
-//  *   uint64_t t0 = FEB_Time_Us();
-//  *   ...
-//  *   uint64_t dt = FEB_Time_Us() - t0;
-//  *
-//  * Wrap handling:
-//  *   DWT->CYCCNT is 32 bits and wraps every (2^32)/SystemCoreClock seconds
-//  *   (~23.86 s at 180 MHz). FEB_Time_Us() self-maintains a 64-bit counter
-//  *   by detecting wraps on each read. As long as FEB_Time_Us() is called
-//  *   at least once within each wrap window, counting is exact.
-//  *
-//  *   In practice, any CSV console traffic polls the counter many times
-//  *   per second, so this is never an issue. For extra safety on idle
-//  *   systems, wire FEB_Time_OnSysTick() into a periodic hook (SysTick,
-//  *   FreeRTOS tick, or any task running at >= 0.05 Hz).
-//  *
-//  ******************************************************************************
-//  */
+/**
+ ******************************************************************************
+ * @file           : feb_time.h
+ * @brief          : FEB Time Library - microsecond-precision monotonic clock
+ * @author         : Formula Electric @ Berkeley
+ ******************************************************************************
+ * @details
+ *
+ * Provides a 64-bit microsecond clock. On Cortex-M3+ (F446RE boards) it is
+ * backed by the DWT cycle counter - zero peripheral cost, uses only the
+ * CoreDebug/DWT core units. On Cortex-M0 (F042 / DART), DWT is not present,
+ * so the library falls back to HAL_GetTick() plus SysTick->VAL for sub-tick
+ * resolution. The API and units are identical on both paths.
+ *
+ * Usage:
+ *   FEB_Time_Init();                 // once at boot, before use
+ *   uint64_t t0 = FEB_Time_Us();
+ *   ...
+ *   uint64_t dt = FEB_Time_Us() - t0;
+ *
+ * Wrap handling:
+ *   DWT->CYCCNT is 32 bits and wraps every (2^32)/SystemCoreClock seconds
+ *   (~23.86 s at 180 MHz). FEB_Time_Us() self-maintains a 64-bit counter
+ *   by detecting wraps on each read. As long as FEB_Time_Us() is called
+ *   at least once within each wrap window, counting is exact.
+ *
+ *   In practice, any CSV console traffic polls the counter many times
+ *   per second, so this is never an issue. For extra safety on idle
+ *   systems, wire FEB_Time_OnSysTick() into a periodic hook (SysTick,
+ *   FreeRTOS tick, or any task running at >= 0.05 Hz).
+ *
+ ******************************************************************************
+ */
 
-// #ifndef FEB_TIME_H
-// #define FEB_TIME_H
+#ifndef FEB_TIME_H
+#define FEB_TIME_H
 
-// #ifdef __cplusplus
-// extern "C"
-// {
-// #endif
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-// #include <stdint.h>
+#include <stdint.h>
 
-//   /**
-//    * @brief Initialize the FEB Time subsystem
-//    *
-//    * Enables the DWT cycle counter and captures SystemCoreClock. Must be called
-//    * once at boot, after SystemInit() has set SystemCoreClock to its final value.
-//    *
-//    * Safe to call multiple times (idempotent).
-//    */
-//   void FEB_Time_Init(void);
+  /**
+   * @brief Initialize the FEB Time subsystem
+   *
+   * Enables the DWT cycle counter and captures SystemCoreClock. Must be called
+   * once at boot, after SystemInit() has set SystemCoreClock to its final value.
+   *
+   * Safe to call multiple times (idempotent).
+   */
+  void FEB_Time_Init(void);
 
-//   /**
-//    * @brief Get monotonic microseconds since FEB_Time_Init()
-//    *
-//    * @return 64-bit microsecond count
-//    *
-//    * Thread/ISR safe: briefly disables interrupts while sampling the cycle
-//    * counter and wrap accumulator (~a dozen instructions).
-//    */
-//   uint64_t FEB_Time_Us(void);
+  /**
+   * @brief Get monotonic microseconds since FEB_Time_Init()
+   *
+   * @return 64-bit microsecond count
+   *
+   * Thread/ISR safe: briefly disables interrupts while sampling the cycle
+   * counter and wrap accumulator (~a dozen instructions).
+   */
+  uint64_t FEB_Time_Us(void);
 
-//   /**
-//    * @brief Get monotonic microseconds as 32-bit (wraps every ~71 minutes)
-//    *
-//    * Cheaper than FEB_Time_Us() for call sites that don't need the full range.
-//    */
-//   uint32_t FEB_Time_Us32(void);
+  /**
+   * @brief Get monotonic microseconds as 32-bit (wraps every ~71 minutes)
+   *
+   * Cheaper than FEB_Time_Us() for call sites that don't need the full range.
+   */
+  uint32_t FEB_Time_Us32(void);
 
-//   /**
-//    * @brief Optional periodic wrap-catcher
-//    *
-//    * If the application may be idle for longer than one DWT wrap period
-//    * (~23.86 s at 180 MHz) without ever calling FEB_Time_Us(), wire this
-//    * into any hook that runs at least once per ~20 s. Safe to call from ISR.
-//    *
-//    * Not required when CSV console traffic is active (each row calls Us()).
-//    */
-//   void FEB_Time_OnSysTick(void);
+  /**
+   * @brief Optional periodic wrap-catcher
+   *
+   * If the application may be idle for longer than one DWT wrap period
+   * (~23.86 s at 180 MHz) without ever calling FEB_Time_Us(), wire this
+   * into any hook that runs at least once per ~20 s. Safe to call from ISR.
+   *
+   * Not required when CSV console traffic is active (each row calls Us()).
+   */
+  void FEB_Time_OnSysTick(void);
 
-// #ifdef __cplusplus
-// }
-// #endif
+#ifdef __cplusplus
+}
+#endif
 
-// #endif /* FEB_TIME_H */
+#endif /* FEB_TIME_H */
diff --git a/common/FEB_Time_Library/Src/feb_time.c b/common/FEB_Time_Library/Src/feb_time.c
diff --git a/common/VERSION b/common/VERSION
