Merge pull request #46 from Formula-Electric-Berkeley/zb/time_versioning_csv

Zb/time versioning csv

Author: ZacharyBer

.cubemx-manifest.json

@@ -0,0 +1,53 @@
+name: Auto-bump minor on PR merge
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [main]
+
+permissions:
+  contents: write
+
+# Serialize back-to-back merges so two workflows don't race each other
+# when both try to commit to main.
+concurrency:
+  group: auto-bump-main
+  cancel-in-progress: false
+
+jobs:
+  bump:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Configure git identity
+        run: |
+          git config user.name  "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Bump minor versions
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: ./scripts/auto-bump-merge.sh "$BASE_SHA" "$MERGE_SHA" "$PR_NUMBER"
+
+      - name: Push commit and tags
+        run: |
+          # Only push if the script actually made a commit. `auto-bump-merge.sh`
+          # exits 0 without committing when the PR didn't touch any board or
+          # common/ path — in that case there's nothing new on HEAD to push.
+          if [ "$(git rev-list --count origin/main..HEAD)" -gt 0 ]; then
+            # --atomic makes the branch update and tag push a single transaction:
+            # if the server rejects either, neither is applied, so we never end
+            # up with a bump commit on main without its matching tag.
+            git push --atomic origin main --tags
+          else
+            echo "No version bump commit produced; nothing to push."
+          fi

.github/workflows/auto-bump-minor.yml

@@ -48,3 +48,13 @@ repos:
         language: script
         pass_filenames: false
         always_run: true
+
+      # Auto-increment patch version on each commit for affected boards + repo.
+      # No-ops if a VERSION file is already staged (so /version stays authoritative).
+      - id: auto-bump-patch
+        name: auto-bump-patch
+        entry: ./scripts/auto-bump-commit.sh
+        language: script
+        pass_filenames: false
+        always_run: true
+        stages: [pre-commit]

.pre-commit-config.yaml

@@ -138,6 +138,42 @@
                 "cwd": "${workspaceFolder}"
             },
             "problemMatcher": []
+        },
+        {
+            "type": "shell",
+            "label": "Firmware: Bump Board Version",
+            "detail": "Bump <BOARD>/VERSION, commit, tag <BOARD>-v<X.Y.Z>, push",
+            "command": "bash",
+            "args": ["${workspaceFolder}/scripts/bump-version.sh", "${input:bumpBoard}", "${input:bumpType}"],
+            "options": { "cwd": "${workspaceFolder}" },
+            "problemMatcher": []
+        },
+        {
+            "type": "shell",
+            "label": "Firmware: Bump Repo Version",
+            "detail": "Bump top-level VERSION, commit, tag v<X.Y.Z>, push",
+            "command": "bash",
+            "args": ["${workspaceFolder}/scripts/bump-version.sh", "repo", "${input:bumpType}"],
+            "options": { "cwd": "${workspaceFolder}" },
+            "problemMatcher": []
+        },
+        {
+            "type": "shell",
+            "label": "Firmware: Bump All (Common Changed)",
+            "detail": "Bump every board + repo + common, tag each, push. Use when common/ changed.",
+            "command": "bash",
+            "args": ["${workspaceFolder}/scripts/bump-version.sh", "all", "${input:bumpType}", "--yes"],
+            "options": { "cwd": "${workspaceFolder}" },
+            "problemMatcher": []
+        },
+        {
+            "type": "shell",
+            "label": "Firmware: Bump Auto-Detect",
+            "detail": "Inspect staged/unstaged diff, bump affected boards (or all if common/ changed), push",
+            "command": "bash",
+            "args": ["${workspaceFolder}/scripts/bump-version.sh"],
+            "options": { "cwd": "${workspaceFolder}" },
+            "problemMatcher": []
         }
     ],
     "inputs": [
@@ -147,6 +183,20 @@
             "description": "Select board to flash",
             "options": ["BMS", "DASH", "DART", "DCU", "LVPDB", "PCU", "Sensor_Nodes", "UART", "UART_TEST"],
             "default": "LVPDB"
+        },
+        {
+            "id": "bumpBoard",
+            "type": "pickString",
+            "description": "Which board's firmware version to bump",
+            "options": ["BMS", "DASH", "DART", "DCU", "LVPDB", "PCU", "Sensor_Nodes", "UART", "UART_TEST"],
+            "default": "BMS"
+        },
+        {
+            "id": "bumpType",
+            "type": "pickString",
+            "description": "Semantic version bump",
+            "options": ["patch", "minor", "major"],
+            "default": "patch"
         }
     ]
 }

.vscode/tasks.json

@@ -105,7 +105,11 @@ add_executable(${PROJECT_NAME} ${ALL_SOURCES})
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${BASE_INCLUDES})
 
-target_link_libraries(${PROJECT_NAME} PRIVATE m feb_io feb_tps feb_rtos_utils feb_uart feb_log feb_console)
+target_link_libraries(${PROJECT_NAME} PRIVATE m feb_io feb_version feb_tps feb_rtos_utils feb_uart feb_log feb_console)
+
+# Embed version + build provenance (reads VERSION + git, generates feb_build_info.c)
+include(${CMAKE_SOURCE_DIR}/cmake/FEB_Version.cmake)
+feb_apply_version(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Enable floating-point printf/scanf for newlib-nano
 target_link_options(${PROJECT_NAME} PRIVATE

BMS/CMakeLists.txt

@@ -106,10 +106,8 @@ float FEB_ADBMS_GET_ACC_AVG_Temp(void);
 float FEB_ADBMS_GET_ACC_MIN_Temp(void);
 float FEB_ADBMS_GET_ACC_MAX_Temp(void);
 float FEB_ADBMS_GET_Cell_Temperature(uint8_t bank, uint16_t cell);
-
-// ********************************** Print Accumulator **************************
-
-void FEB_ADBMS_Print_Accumulator(void);
+uint16_t FEB_ADBMS_GET_Therm_Raw_Code(uint8_t bank, uint16_t sensor);
+float FEB_ADBMS_GET_Therm_Raw_mV(uint8_t bank, uint16_t sensor);
 
 // ********************************** Balancing **********************************
 

BMS/Core/User/Inc/FEB_ADBMS6830B.h

@@ -22,11 +22,4 @@
  */
 void BMS_RegisterCommands(void);
 
-/**
- * @brief Print CSV data (voltages and/or temperatures)
- * @param argc Argument count (2 for mode)
- * @param argv Arguments: argv[1] = "volts", "temps", or "all"
- */
-void subcmd_csv(int argc, char *argv[]);
-
 #endif /* FEB_COMMANDS_H */

BMS/Core/User/Inc/FEB_Commands.h

@@ -18,13 +18,10 @@
 // Total number of cells per bank
 #define FEB_NUM_CELLS_PER_BANK (FEB_NUM_CELLS_PER_IC * FEB_NUM_ICPBANK)
 
-// Alias for compatibility
-#define FEB_NUM_CELL_PER_BANK FEB_NUM_CELLS_PER_BANK
+// Number of temperature sensors per IC: 6 MUXes × 7 channels = 42
+#define FEB_NUM_TEMP_SENSE_PER_IC 42
 
-// Number of temperature sensors per IC (for MUX reading)
-#define FEB_NUM_TEMP_SENSE_PER_IC 41
-
-// Total number of temperature sensors per bank (10 per IC × 2 ICs)
+// Total number of temperature sensors per bank
 #define FEB_NUM_TEMP_SENSORS (FEB_NUM_TEMP_SENSE_PER_IC * FEB_NUM_ICPBANK)
 
 // ********************************** ADBMS6830B ADC Conversion Constants ********
@@ -129,6 +126,8 @@ typedef struct
   uint8_t badReadV;                                   // Bad voltage read counter
   float temp_sensor_readings_V[FEB_NUM_TEMP_SENSORS]; // Temperature sensor readings
   uint8_t temp_violations[FEB_NUM_TEMP_SENSORS];      // Per-sensor violation counters
+  uint16_t therm_raw_codes[FEB_NUM_TEMP_SENSORS];     // Raw ADC codes (0xFFFF = PEC failure)
+  float therm_raw_voltages_mV[FEB_NUM_TEMP_SENSORS];  // Converted mV (NaN = PEC failure)
 } bank_data_t;
 
 typedef struct