Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -rc1ffce3b0fdff5b35988c232b00d68c75827fc6b -r2f288730bdaa9233f4ef9d9d890e1381c1e87965
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision c1ffce3b0fdff5b35988c232b00d68c75827fc6b)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 2f288730bdaa9233f4ef9d9d890e1381c1e87965)
@@ -132,7 +132,8 @@
     BATTERY_PACK_MANUFACTURER_NAME,                                         ///< Battery pack mfg name
     BATTERY_PACK_DEVICE_NAME,                                               ///< Battery pack device name
     BATTERY_PACK_DEVICE_CHEMISTRY,                                          ///< Battery pack device chemistry
-    END_OF_LIST
+    END_OF_LIST,                                                            ///< End of battery data list
+    NUM_OF_BATTERY_PACK_LIST,                                               ///< Number of battery pack list
 } BATTERY_MANAGEMENT_ENUM_T;
 
 // ********** private data **********
@@ -696,7 +697,7 @@
             break;
 
         default:
-            // TODO s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_BATTERY_INVALID_MANAGEMENT_DATA_STATE, current_BM_value )
             break;
     }
 }
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rf1157c760b320bf088921a25eb78e973d6341578 -r2f288730bdaa9233f4ef9d9d890e1381c1e87965
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision f1157c760b320bf088921a25eb78e973d6341578)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 2f288730bdaa9233f4ef9d9d890e1381c1e87965)
@@ -186,6 +186,7 @@
     SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_PAT_CONN_STATE,                // 155
     SW_FAULT_ID_PRES_LIMITS_INVALID_STATE,
     SW_FAULT_ID_BLOOD_LEAK_EMBEDDED_MODE_INVALID_STATE,
+    SW_FAULT_ID_BATTERY_INVALID_MANAGEMENT_DATA_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;