Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r383e37189e8db6a077a0d488dc6cdd5a610b6674 -r50ce0801d50b365148d2969b0d75e5768744181a
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 383e37189e8db6a077a0d488dc6cdd5a610b6674)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 50ce0801d50b365148d2969b0d75e5768744181a)
@@ -56,7 +56,7 @@
 // ********** private data **********
 
 static U16 batteryStatus = 0;                                               ///< Battery current status.
-static OVERRIDE_U32_T batteryRelStateOfCharge_pct = { 0, 0, 0, 0 };         ///< Battery pack relative state of charge.
+static U32 batteryRelStateOfCharge_pct;                                     ///< Battery pack relative state of charge.
 static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mAh).
 static U16 batteryPackStatus = 0;                                           ///< Battery pack current status.
 static U32 lastBatteryMonitorTime = 0;                                      ///< Previous battery monitor time.
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rad4d98e7d69ee6320a7ab573c353cd6ff92a76fe -r50ce0801d50b365148d2969b0d75e5768744181a
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ad4d98e7d69ee6320a7ab573c353cd6ff92a76fe)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 50ce0801d50b365148d2969b0d75e5768744181a)
@@ -169,6 +169,7 @@
     SW_FAULT_ID_ILLEGAL_MEM_ACCESS,
     SW_FAULT_ID_DG_INVALID_FILL_COMMAND_REJECTED,
     SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,                               // 140
+    SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;