Index: firmware/App/Drivers/Battery.c =================================================================== diff -u -r71a7f0933979567e138791eab4783d9cb76447be -r9081eeb6ba15f47f13551e147d7da88731746ecd --- firmware/App/Drivers/Battery.c (.../Battery.c) (revision 71a7f0933979567e138791eab4783d9cb76447be) +++ firmware/App/Drivers/Battery.c (.../Battery.c) (revision 9081eeb6ba15f47f13551e147d7da88731746ecd) @@ -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. @@ -346,10 +347,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; } } @@ -607,7 +608,6 @@ case BATTERY_CHARGER_STATUS3: case BATTERY_CHARGER_STATUS4: case BATTERY_CHARGER_STATUS5: -/* TODO: Uncomment when battery charger is installed. if ( TRUE == getBatteryData( BATTERY_CHARGER_SLAVE_ADDRESS, BATTERY_CHARGER_STATUS_CMD, &BatteryStatusData.BatteryChargerStatus ) ) { if ( 0 == ( BatteryStatusData.BatteryChargerStatus & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) ) @@ -625,7 +625,7 @@ lostACPowerPersistentCount = 0; } } -*/ + publishBatteryStatusData(); break;