Index: firmware/App/Monitors/Battery.c
===================================================================
diff -u -r365cfa9529a444e02ecc928dea87e97bca95c193 -re353dd386442059f6a658804e08909deec511292
--- firmware/App/Monitors/Battery.c	(.../Battery.c)	(revision 365cfa9529a444e02ecc928dea87e97bca95c193)
+++ firmware/App/Monitors/Battery.c	(.../Battery.c)	(revision e353dd386442059f6a658804e08909deec511292)
@@ -54,7 +54,7 @@
 static const U32 BATT_STATUS_ERROR_PERSIST_MS = ( 5 * MS_PER_SECOND );        ///< Persist time in ms for battery pack status error condition.
 static U32 lastBatteryMonitorTime;                                            ///< Previous battery monitor time.
 static U32 batteryDataPublicationTimerCounter;                                ///< Used to schedule battery data publication to CAN bus.
-static OVERRIDE_U32_T batteryRegisterOverrides[ NUM_OF_BATTERY_REGISTERS-1 ]; ///< Battery register data and overrides.
+static OVERRIDE_U32_T batteryRegisterOverrides[ NUM_OF_BATTERY_REGISTERS ]; ///< Battery register data and overrides.
 static OVERRIDE_U32_T batteryDataPublishInterval;                             ///< Interval at which to publish battery data to CAN bus.
 static BATTERY_MANAGEMENT_ENUM_T currentBmValue;                              ///< Index for which battery data to read now.
 static BATTERY_DATA_PAYLOAD_T batteryData;                                    ///< Record with latest battery data.
@@ -113,7 +113,7 @@
 {
     U32 registerIdx;
 
-    for ( registerIdx = 0; registerIdx < NUM_OF_BATTERY_REGISTERS-1; registerIdx++ )
+    for ( registerIdx = 0; registerIdx < NUM_OF_BATTERY_REGISTERS; registerIdx++ )
     {
         batteryRegisterOverrides[ registerIdx ].data = 0U;
         batteryRegisterOverrides[ registerIdx ].ovData = 0U;
@@ -133,7 +133,7 @@
  *************************************************************************/
 static void setBatteryRegisterData( BATTERY_MANAGEMENT_ENUM_T registerSel, U32 data )
 {
-    if ( registerSel < NUM_OF_BATTERY_REGISTERS-1 )
+    if ( registerSel < NUM_OF_BATTERY_REGISTERS )
     {
         batteryRegisterOverrides[ registerSel ].data = data;
     }
@@ -152,7 +152,7 @@
 {
     U32 result = 0U;
 
-    if ( registerSel < NUM_OF_BATTERY_REGISTERS-1 )
+    if ( registerSel < NUM_OF_BATTERY_REGISTERS )
     {
         result = getU32OverrideValue( &batteryRegisterOverrides[ registerSel ] );
     }
@@ -176,7 +176,7 @@
                                          BATTERY_MANAGEMENT_ENUM_T registerSel,
                                          U08 errorBits )
 {
-    if ( registerSel < NUM_OF_BATTERY_REGISTERS-1 )
+    if ( registerSel < NUM_OF_BATTERY_REGISTERS )
     {
         if ( TRUE == isPersistentAlarmTriggered(
                 alarmID, ( getBatteryRegisterValue( registerSel ) & errorBits ) != 0U ) )
@@ -358,7 +358,7 @@
  *************************************************************************/
 BOOL isBatteryCharged( void )
 {
-    BOOL result = 0U;
+    BOOL result = FALSE;
 
     result = ( getBatteryRegisterValue( BATTERY_PACK_REMAINING_CAPACITY )
             > BATTERY_MIN_CAPACITY_MAH ? TRUE : FALSE );
@@ -376,7 +376,7 @@
  *************************************************************************/
 BOOL isBatteryRemainingCapacityLessThan60Wh( void )
 {
-    BOOL result = 0U;
+    BOOL result = FALSE;
 
     result = ( getBatteryRegisterValue( BATTERY_PACK_REMAINING_CAPACITY )
             < BATTERY_60WH_CAPACITY_MAH ) ? TRUE : FALSE;