BMS: select IVT pack-voltage channel via macro; identify IVT part

Add FEB_IVT_PACK_VOLTAGE_CHANNEL (FEB_Const.h, default U2/0x523) so the
IVT-S voltage channel feeding FEB_CAN_IVT_GetVoltage() -- used by precharge
and the BMS|ivt console -- is selectable with one macro. All channels still
decode via the generated DBC unpack; the macro only picks the reported one.
The console now prints V1/V2/V3 plus the selected pack voltage with its
channel label. Also document the exact part (ISAscale IVT-MODULAR) in the
IVT interface header.

Author: ZacharyBer

BMS/Core/User/Inc/FEB_CAN_IVT.h

@@ -3,7 +3,10 @@
  * @brief IVT (Isabellenhutte) Current/Voltage Sensor CAN Interface
  * @author Formula Electric @ Berkeley
  *
- * Receives IVT-S sensor data over CAN:
+ * The IVT we use is the ISAscale IVT-MODULAR (IVT-MOD, or just IVT for short),
+ * Isabellenhutte's modular high-accuracy current/voltage/temperature sensor.
+ *
+ * Receives IVT sensor data over CAN:
  * - 0x521: Current
  * - 0x522: Voltage 1 (pack voltage, used for precharge monitoring)
  * - 0x523: Voltage 2

BMS/Core/User/Inc/FEB_Const.h

@@ -101,6 +101,17 @@
 #define ISOSPI_FAILOVER_LOCKOUT_MS 1000 // Milliseconds to wait before allowing failover again
 #define ISOSPI_PRIMARY_CHANNEL 1        // Primary channel: 1=SPI1, 2=SPI2
 
+// ********************************** IVT-S Sensor Configuration *****************
+
+// IVT-S voltage channel carrying the HV pack sense line (which IVT input the
+// pack is physically wired to). Selects the channel FEB_CAN_IVT_GetVoltage()
+// reports — used by precharge and the BMS|ivt console. All channels are always
+// decoded via the DBC unpack; this only picks the reported one.
+//   1 -> U1 (frame 0x522)   2 -> U2 (0x523)   3 -> U3 (0x524)
+#ifndef FEB_IVT_PACK_VOLTAGE_CHANNEL
+#define FEB_IVT_PACK_VOLTAGE_CHANNEL 2
+#endif
+
 // ********************************** Accumulator Structure **********************
 
 typedef struct

BMS/Core/User/Src/FEB_CAN_IVT.c

@@ -8,6 +8,7 @@
  */
 
 #include "FEB_CAN_IVT.h"
+#include "FEB_Const.h"
 #include "feb_can_lib.h"
 #include "feb_can.h"
 #include "stm32f4xx_hal.h"
@@ -176,8 +177,17 @@ float FEB_CAN_IVT_GetVoltage(void)
     return 0.0f;
   }
 
-  /* Convert mV to V */
+  /* Convert mV to V. Channel is selected at compile time by the board wiring
+   * (FEB_IVT_PACK_VOLTAGE_CHANNEL in FEB_Const.h). */
+#if FEB_IVT_PACK_VOLTAGE_CHANNEL == 1
   return ivt_data.voltage_1_mV * 0.001f;
+#elif FEB_IVT_PACK_VOLTAGE_CHANNEL == 2
+  return ivt_data.voltage_2_mV * 0.001f;
+#elif FEB_IVT_PACK_VOLTAGE_CHANNEL == 3
+  return ivt_data.voltage_3_mV * 0.001f;
+#else
+#error "FEB_IVT_PACK_VOLTAGE_CHANNEL must be 1, 2, or 3"
+#endif
 }
 
 float FEB_CAN_IVT_GetCurrent(void)

BMS/Core/User/Src/FEB_Commands.c

@@ -384,9 +384,10 @@ static void subcmd_ivt(int argc, char *argv[])
 
   FEB_Console_Printf("\r\n=== IVT Sensor Data ===\r\n");
   FEB_Console_Printf("Pack Current:  %.2f A\r\n", ivt->current_mA / 1000.0f);
-  FEB_Console_Printf("Pack Voltage:  %.2f V (V1)\r\n", ivt->voltage_1_mV / 1000.0f);
+  FEB_Console_Printf("Voltage 1:     %.2f V\r\n", ivt->voltage_1_mV / 1000.0f);
   FEB_Console_Printf("Voltage 2:     %.2f V\r\n", ivt->voltage_2_mV / 1000.0f);
   FEB_Console_Printf("Voltage 3:     %.2f V\r\n", ivt->voltage_3_mV / 1000.0f);
+  FEB_Console_Printf("Pack Voltage:  %.2f V (U%d)\r\n", FEB_CAN_IVT_GetVoltage(), FEB_IVT_PACK_VOLTAGE_CHANNEL);
   FEB_Console_Printf("Temperature:   %.1f C\r\n", ivt->temperature_C);
   FEB_Console_Printf("Data Age:      %lu ms (%s)\r\n", (unsigned long)age, fresh ? "FRESH" : "STALE");
 }

BMS/VERSION

@@ -1 +1 @@
-1.7.6
+1.7.7

VERSION

@@ -1 +1 @@
-1.7.21
+1.7.22