Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb36fc8801adfc9d2f402450abffe721e71f9a5e5 -r068f4f4de69017a1d9d24c6c67bf7d3e46b8caed
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b36fc8801adfc9d2f402450abffe721e71f9a5e5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 068f4f4de69017a1d9d24c6c67bf7d3e46b8caed)
@@ -2336,13 +2336,13 @@
     {
         TEMPERATURE_SENSORS_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
-    }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
-}
-
+        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
+    }
+    // TODO - what to do if invalid payload length?
+    // TODO - how to know if DG stops sending these?
+}
+
 /*********************************************************************//**
  * @brief
  * The handleDialysateFlowData function handles dialysate flow data broadcast
@@ -5164,6 +5164,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.u32 );