Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r9081eeb6ba15f47f13551e147d7da88731746ecd -rb94b9b2eef71c1fae4d9a3320a13ef81d5790aac
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 9081eeb6ba15f47f13551e147d7da88731746ecd)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision b94b9b2eef71c1fae4d9a3320a13ef81d5790aac)
@@ -210,7 +210,7 @@
  *************************************************************************/
 BOOL isBatteryCharged( void )
 {
-    return TRUE;  // TODO - restore when I2C issue(s) resolved.     ( getBatteryRemainingCapacity_mWh() > BATTERY_MIN_CAPACITY_MWH ? TRUE : FALSE );
+    return ( getBatteryRemainingCapacity_mWh() > BATTERY_MIN_CAPACITY_MWH ? TRUE : FALSE );
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 -rb94b9b2eef71c1fae4d9a3320a13ef81d5790aac
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b94b9b2eef71c1fae4d9a3320a13ef81d5790aac)
@@ -1418,7 +1418,7 @@
                 handleTestSwitchesPublishIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE:
+            case MSG_ID_HD_BATTERY_REMAINING_CAP_MWH_OVERRIDE:
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;