Index: firmware/App/Drivers/Battery.h
===================================================================
diff -u -r88dfa298eb85a9153d0bf216916308337096c835 -rffa216b61ad4197eebb4aecdbe2517cad4996a21
--- firmware/App/Drivers/Battery.h	(.../Battery.h)	(revision 88dfa298eb85a9153d0bf216916308337096c835)
+++ firmware/App/Drivers/Battery.h	(.../Battery.h)	(revision ffa216b61ad4197eebb4aecdbe2517cad4996a21)
@@ -29,41 +29,46 @@
  */
 
 // ********** public definitions **********
-/// Payload record structure for battery module data broadcast message
+/// Payload record structure for battery status data broadcast message
 typedef struct
 {
     U32 RemainingCapacity;
-    U32 BatteryStatus;  //
-    U32 RemainingCapacityAlarm;  //
-    U32 RemainingTimeAlarm;  //
-    U32 BatteryMode;  //
-    U32 AtRate;  //
-    U32 AtRateTimeToFull;  //
-    U32 AtRateTimeToEmpty;  //
-    U32 AtRateOK;  //
-    U32 Temperature;  //
-    U32 Voltage;  //
-    U32 Current;  //
-    U32 AverageCurrent;  //
-    U32 MaxError;  //
-    U32 RelativeStateOfCharge;  //
-    U32 AbsoluteStateOfCharge;  //
-    U32 FullChargeCapacity;  //
-    U32 RunTimeToEmpty;  //
-    U32 AverageTimeToEmpty;  //
-    U32 AverageTimeToFull;  //
-    U32 ChargingCurrent;  //
-    U32 ChargingVoltage;  //
-    U32 CycleCount;  //
-    U32 DesignCapacity;  //
-    U32 DesignVoltage;  //
-    U32 SpecificationInfo;  //
-    U32 ManufactureDate;  //
-    U32 SerialNumber;  //
-    U32 ManufacturerName;  //
-    U32 DeviceName;  //
-    U32 DeviceChemistry;  //
-    U32 BatteryChargerStatus; //
+    U32 BatteryStatus;
+    U32 BatteryChargerStatus;
+} BATTERY_STATUS_PAYLOAD_T;  
+
+/// Payload record structure for battery module data broadcast message
+typedef struct
+{
+    U32 RemainingCapacityAlarm;  
+    U32 RemainingTimeAlarm;  
+    U32 BatteryMode;  
+    U32 AtRate;  
+    U32 AtRateTimeToFull;  
+    U32 AtRateTimeToEmpty;  
+    U32 AtRateOK;  
+    U32 Temperature;  
+    U32 Voltage;  
+    U32 Current;  
+    U32 AverageCurrent;  
+    U32 MaxError;  
+    U32 RelativeStateOfCharge;  
+    U32 AbsoluteStateOfCharge;  
+    U32 FullChargeCapacity;  
+    U32 RunTimeToEmpty;  
+    U32 AverageTimeToEmpty;  
+    U32 AverageTimeToFull;  
+    U32 ChargingCurrent;  
+    U32 ChargingVoltage;  
+    U32 CycleCount;  
+    U32 DesignCapacity;  
+    U32 DesignVoltage;  
+    U32 SpecificationInfo;  
+    U32 ManufactureDate;  
+    U32 SerialNumber;  
+    U32 ManufacturerName;  
+    U32 DeviceName;  
+    U32 DeviceChemistry;  
 } BATTERY_MANAGER_PAYLOAD_T;
 
 // ********** public function prototypes **********