Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r60648d9085c200d4bb707341f9ee14dbbc5d4c4e -re5d24f913e4f29d61c813cd1446ac22a368815f2
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 60648d9085c200d4bb707341f9ee14dbbc5d4c4e)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision e5d24f913e4f29d61c813cd1446ac22a368815f2)
@@ -7,8 +7,8 @@
 *
 * @file    Battery.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      18-Oct-2022
+* @author  (last)      Sean Nash
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  24-Feb-2021
@@ -135,7 +135,7 @@
 
 // ********** private data **********
 
-static OVERRIDE_F32_T batteryRemCapacity_mAh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mAh).
+static OVERRIDE_F32_T batteryRemCapacity_mWh = { 0.0, 0.0, 0.0, 0 };        ///< Battery pack remaining capacity (in mWh).
 static U32 lastBatteryMonitorTime;                                          ///< Previous battery monitor time.
 static U32 commFaultPersistentCount;                                        ///< Persistence count for battery comm fault.
 
@@ -215,17 +215,17 @@
  * @brief
  * The getBatteryRemainingCapacity_mWh function returns the latest battery
  * remaining capacity (in mWh).
- * @details Inputs: batteryRemCapacity_mAh
+ * @details Inputs: batteryRemCapacity_mWh
  * @details Outputs: none
  * @return battery remaining capacity (in mWh).
  *************************************************************************/
 static F32 getBatteryRemainingCapacity_mWh( void )
 {
-    F32 result = batteryRemCapacity_mAh.data;
+    F32 result = batteryRemCapacity_mWh.data;
 
-    if ( OVERRIDE_KEY == batteryRemCapacity_mAh.override )
+    if ( OVERRIDE_KEY == batteryRemCapacity_mWh.override )
     {
-        result = batteryRemCapacity_mAh.ovData;
+        result = batteryRemCapacity_mWh.ovData;
     }
 
     return result;
@@ -389,9 +389,7 @@
                 generateStopCondition();
                 if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
                 {
-#ifndef DISABLE_BATT_COMM
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
-#endif
                 }
             }
         }
@@ -450,9 +448,7 @@
     {
         if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
         {
-#ifndef DISABLE_BATT_COMM
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, dataPtr );
-#endif
             commFaultPersistentCount = 0;
         }
     }
@@ -467,7 +463,7 @@
  * the battery remaining capacity is stored, the battery status alarm is set
  * if necessary, and the loss of AC power alarm is set if necessary.
  * @details Inputs: current_BM_value, BatteryStatusData
- * @details Outputs: batteryRemCapacity_mAh, BatteryManagerData
+ * @details Outputs: batteryRemCapacity_mWh, BatteryManagerData
  * @return none
  *************************************************************************/
 static void getBatteryManagementData(void)
@@ -486,7 +482,7 @@
         case BATTERY_PACK_REMAINING_CAPACITY4:
         case BATTERY_PACK_REMAINING_CAPACITY5:    
             getBatteryData ( BATTERY_PACK_SLAVE_ADDRESS, BATTERY_PACK_ADDR_REMAINING_CAPACITY, &BatteryStatusData.RemainingCapacity );
-            batteryRemCapacity_mAh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR;
+            batteryRemCapacity_mWh.data = (F32)BatteryStatusData.RemainingCapacity * BATTERY_MAH_2_MWH_FACTOR;
             break;
 
         case BATTERY_PACK_BATTERY_STATUS1:
@@ -626,7 +622,6 @@
             {   // If A/C not present, trigger A/C lost alarm
                 if ( 0 == ( BatteryStatusData.BatteryChargerStatus & BATTERY_CHARGER_STATUS_AC_PRESENT_MASK ) )
                 {
-#ifndef DISABLE_BATT_COMM
                     // Pre-Treatment, Treatment, or Post-Treatment mode
                     if( opMode == MODE_PRET || opMode == MODE_TREA || opMode == MODE_POST )
                     {
@@ -637,7 +632,6 @@
                     {
                         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST, BatteryStatusData.BatteryChargerStatus );
                     }
-#endif
                 }
                 else
                 {
@@ -695,7 +689,7 @@
  * The testSetBatteryRemainingPercentOverride function overrides the battery
  * remaining percent value.
  * @details Inputs: none
- * @details Outputs: batteryRemCapacity_mAh
+ * @details Outputs: batteryRemCapacity_mWh
  * @param value override battery remaining percent
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
@@ -706,8 +700,8 @@
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        batteryRemCapacity_mAh.ovData = value;
-        batteryRemCapacity_mAh.override = OVERRIDE_KEY;
+        batteryRemCapacity_mWh.ovData = value;
+        batteryRemCapacity_mWh.override = OVERRIDE_KEY;
     }
 
     return result;
@@ -718,7 +712,7 @@
  * The testResetSetBatteryRemainingPercentOverride function resets the
  * override of the battery remaining percent value.
  * @details Inputs: none
- * @details Outputs: batteryRemCapacity_mAh
+ * @details Outputs: batteryRemCapacity_mWh
  * @return TRUE if reset successful, FALSE if not
  *************************************************************************/
 BOOL testResetSetBatteryRemainingPercentOverride( void )
@@ -728,8 +722,8 @@
     if ( TRUE == isTestingActivated() )
     {
         result = TRUE;
-        batteryRemCapacity_mAh.override = OVERRIDE_RESET;
-        batteryRemCapacity_mAh.ovData = batteryRemCapacity_mAh.ovInitData;
+        batteryRemCapacity_mWh.override = OVERRIDE_RESET;
+        batteryRemCapacity_mWh.ovData = batteryRemCapacity_mWh.ovInitData;
     }
 
     return result;