Index: firmware/App/Drivers/Battery.h
===================================================================
diff -u -r52ca7c614ee2a0479c03c6581f3b34fcd2ee4786 -r88dfa298eb85a9153d0bf216916308337096c835
--- firmware/App/Drivers/Battery.h	(.../Battery.h)	(revision 52ca7c614ee2a0479c03c6581f3b34fcd2ee4786)
+++ firmware/App/Drivers/Battery.h	(.../Battery.h)	(revision 88dfa298eb85a9153d0bf216916308337096c835)
@@ -32,22 +32,18 @@
 /// Payload record structure for battery module data broadcast message
 typedef struct
 {
-    U32 RemainingCapacity1;
-    U32 BatteryStatus1;  //
+    U32 RemainingCapacity;
+    U32 BatteryStatus;  //
     U32 RemainingCapacityAlarm;  //
     U32 RemainingTimeAlarm;  //
     U32 BatteryMode;  //
     U32 AtRate;  //
-    U32 RemainingCapacity2; // inserting multiple instances of RemainingCapacity
-    U32 BatteryStatus2;  //    inserting multiple instances of BatteryStatus
     U32 AtRateTimeToFull;  //
     U32 AtRateTimeToEmpty;  //
     U32 AtRateOK;  //
     U32 Temperature;  //
     U32 Voltage;  //
     U32 Current;  //
-    U32 RemainingCapacity3; //
-    U32 BatteryStatus3;  //
     U32 AverageCurrent;  //
     U32 MaxError;  //
     U32 RelativeStateOfCharge;  //
@@ -57,20 +53,17 @@
     U32 AverageTimeToEmpty;  //
     U32 AverageTimeToFull;  //
     U32 ChargingCurrent;  //
-    U32 RemainingCapacity4; //
-    U32 BatteryStatus4;  //
     U32 ChargingVoltage;  //
     U32 CycleCount;  //
     U32 DesignCapacity;  //
     U32 DesignVoltage;  //
     U32 SpecificationInfo;  //
     U32 ManufactureDate;  //
     U32 SerialNumber;  //
-    U32 RemainingCapacity5; //
-    U32 BatteryStatus5;  //
     U32 ManufacturerName;  //
     U32 DeviceName;  //
     U32 DeviceChemistry;  //
+    U32 BatteryChargerStatus; //
 } BATTERY_MANAGER_PAYLOAD_T;
 
 // ********** public function prototypes **********