Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -rfbb66032e095655b8857834bb4537539928ffadd -r8a9025b76d41a63d760ab1b0dcd7f68852338301
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision fbb66032e095655b8857834bb4537539928ffadd)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 8a9025b76d41a63d760ab1b0dcd7f68852338301)
@@ -40,6 +40,7 @@
 
 #define BATTERY_COMM_TIME_OUT_MS                    1                       ///< Battery communication time out in ms.
 #define BATTERY_MONITOR_INTERVAL_MS                 250                     ///< Battery monitor interval in ms.
+//#define BATTERY_MONITOR_INTERVAL_MS                 10000                     ///< Battery monitor interval in ms. - TODO+ Remove for TEST ONLY DN-30SEPT2022
 #define AC_POWER_LOST_PERSISTENT_COUNT              3                       ///< AC power lost persistent count before alarming.
 #define BATTERY_COMM_FAULT_PERSISTENTCE_COUNT       5                       ///< Battery communication fault persistent count before alarming.
 
@@ -344,10 +345,10 @@
 
     if ( TRUE == startCommTx( slaveAddr ) )
     {
-        U16 data = (U16)( *dataPtr & MASK_OFF_MSW );
-
+        U16 data = (U16)( (*dataPtr) & MASK_OFF_MSW );
         if ( TRUE == getData( command, &data ) )
         {
+            *dataPtr = data;
             result = TRUE;
         }
     }
@@ -596,7 +597,6 @@
 	        break;
 	    
         case BATTERY_CHARGER_STATUS:
-/* TODO: Uncomment when battery charger is installed.
             if ( TRUE == getBatteryData( BATTERY_CHARGER_SLAVE_ADDRESS, BATTERY_CHARGER_STATUS_CMD, &BatteryLoggingData.BatteryChargerStatus ) )
             {
                 if ( 0 == ( BatteryLoggingData.BatteryChargerStatus & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) )
@@ -614,8 +614,8 @@
                     lostACPowerPersistentCount = 0;
                 }
             }
-*/
             break;
+
         case END_OF_LIST:
             current_BM_value = BEGINNING_OF_LIST;
             publishBatteryManagementData();