Index: firmware/App/Drivers/BatteryDriver.c
===================================================================
diff -u -r365cfa9529a444e02ecc928dea87e97bca95c193 -re353dd386442059f6a658804e08909deec511292
--- firmware/App/Drivers/BatteryDriver.c	(.../BatteryDriver.c)	(revision 365cfa9529a444e02ecc928dea87e97bca95c193)
+++ firmware/App/Drivers/BatteryDriver.c	(.../BatteryDriver.c)	(revision e353dd386442059f6a658804e08909deec511292)
@@ -16,9 +16,9 @@
 ***************************************************************************/
 
 #include <string.h>      // For memcpy
+#include "i2c.h"
 
 #include "BatteryDriver.h"
-#include "i2c.h"
 #include "Messaging.h"
 #include "Timers.h"
 
@@ -47,7 +47,7 @@
 };
 
 /// Lookup table mapping register enum to register addresses.
-static const U32 regAddr[ NUM_OF_BATTERY_REGISTERS - 1 ] = {
+static const U32 regAddr[ NUM_OF_BATTERY_REGISTERS ] = {
                                   0x00,                                     ///< BEGINNING_OF_LIST
                                   0x0F,                                     ///< BATTERY_PACK_REMAINING_CAPACITY
                                   0x16,                                     ///< BATTERY_PACK_BATTERY_STATUS
@@ -223,7 +223,7 @@
     BOOL result = FALSE;
 
     if ( ( deviceSel < NUM_OF_BATTERY_DEVICES ) &&
-            ( registerSel < NUM_OF_BATTERY_REGISTERS -1 ) )
+            ( registerSel < NUM_OF_BATTERY_REGISTERS ) )
     {
         if ( TRUE == startCommTx( deviceAddr[deviceSel] ) )
         {