Index: firmware/App/Drivers/BatteryDriver.c
===================================================================
diff -u -r2e75c0c69869132ff4adb46a0509aab7a04d60a3 -r78d196593cdcc9c3cd7166f02a99a7408a3e0b32
--- firmware/App/Drivers/BatteryDriver.c	(.../BatteryDriver.c)	(revision 2e75c0c69869132ff4adb46a0509aab7a04d60a3)
+++ firmware/App/Drivers/BatteryDriver.c	(.../BatteryDriver.c)	(revision 78d196593cdcc9c3cd7166f02a99a7408a3e0b32)
@@ -31,21 +31,19 @@
 #define BATTERY_COMM_TIME_OUT_MS                    2                       ///< Battery communication time out in ms.
 #define BATTERY_CHARGER_SLAVE_ADDRESS               0x6B                    ///< Battery charger controller device address.
 #define BATTERY_PACK_SLAVE_ADDRESS                  0x0B                    ///< Battery pack device address.
-#define BATTERY_I2C_STATUS_REGISTER_MIN             0                       //ToDo
-#define BATTERY_I2C_STATUS_REGISTER_MAX             2                       //ToDo
 
 // ********** private data **********
 
 static OVERRIDE_U32_T batteryI2CStatusRegister;            ///< Battery I2C Interrupt Status register
 
 /// Lookup table mapping device enum to I2C slave addresses.
-const U32 device_addr[MAXIMUM_DEVICE_ADDRESSES] = {
+const U32 device_addr[NUM_OF_BATTERY_DEVICES] = {
                                                  0x6B,                      ///< BATTERY_CHARGER_ADDRESS
                                                  0x0B,                      ///< BATTERY_PACK_ADDRESS
 };
 
 /// Lookup table mapping register enum to register addresses.
-const U32 reg_addr[MAXIMUM_BATTERY_REGISTERS] = {
+const U32 reg_addr[NUM_OF_BATTERY_REGISTERS-1] = {
                                   0x00,                                     ///< BEGINNING_OF_LIST
                                   0x0f,                                     ///< BATTERY_PACK_REMAINING_CAPACITY
                                   0x16,                                     ///< BATTERY_PACK_BATTERY_STATUS
@@ -191,8 +189,8 @@
  * and get data based on given command.
  * @details \b Inputs: none
  * @details \b Outputs: get data from battery device
- * @param device battery device to communicate with.
- * @param registers register to read from batteru device.
+ * @param deviceSel battery device to communicate with.
+ * @param registerSel register to read from batteru device.
  * @param dataPtr pointer to store the register data
  * @return TRUE if data received successfully, otherwise FALSE
  *************************************************************************/
@@ -371,7 +369,7 @@
  *************************************************************************/
 BOOL testBatteryI2CStatusOverride( MESSAGE_T *message )
 {
-    BOOL result = u32Override( message, &batteryI2CStatusRegister, BATTERY_I2C_STATUS_REGISTER_MIN, BATTERY_I2C_STATUS_REGISTER_MAX );
+    BOOL result = u32Override( message, &batteryI2CStatusRegister, 0x0, 0xFFFFFFFF );
     return result;
 }