Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -r3d5431d5aebe0c88c38a8732455a6dcf004fe6c2 -r095cedf971998ff768a7f983228fb6f7ad679edc
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 3d5431d5aebe0c88c38a8732455a6dcf004fe6c2)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision 095cedf971998ff768a7f983228fb6f7ad679edc)
@@ -82,19 +82,31 @@
 /// Payload record structure for DG temperature sensors data message.
 typedef struct
 {
-    F32 TPi;                                        ///< Inlet primary heaters temperature sensor
-    F32 TPo;                                        ///< Outlet primary heaters temperature sensor
-    F32 TD1;                                        ///< Conductivity sensor 1 temperature sensor
-    F32 TD2;                                        ///< Conductivity sensor 2 temperature sensor
-    F32 TRo;                                        ///< Outlet redundant temperature sensor
-    F32 TDi;                                        ///< Inlet dialysate temperature sensor
-    F32 HtrPrimThermo;                              ///< Primary heaters internal temperature sensor
-    F32 HtrTrimThermo;                              ///< Trimmer heater internal temperature sensor
-    F32 HtrPrimColdJunc;                            ///< Primary heaters cold junction temperature sensor
-    F32 HtrTrimColdJunc;                            ///< Trimmer heater cold junction temperature sensor
-    F32 HtrPrimInternal;                            ///< Primary heaters internal temperature
-    F32 HtrTrimInternal;                            ///< Trimmer heater internal temperature
-} DG_TEMPERATURES_T;
+    F32 inletPrimaryHeater;                     ///< Inlet primary heater temperature sensor
+    F32 outletPrimaryHeater;                    ///< Outlet primary heater temperature sensor
+    F32 conductivitySensor1;                    ///< Conductivity sensor 1 temperature sensor
+    F32 conductivitySensor2;                    ///< Conductivity sensor 2 temperature sensor
+    F32 outletRedundant;                        ///< Outlet redundant temperature sensor
+    F32 inletDialysate;                         ///< Inlet dialysate temperature sensor
+    F32 primaryHeaterThermocouple;              ///< Primary heaters thermocouple sensor
+    F32 trimmerHeaterThermocouple;              ///< Trimmer heater thermocouple sensor
+    F32 priamyHeaterColdjunction;               ///< Primary heaters cold junction temperature sensor
+    F32 trimmerHeaterColdjunction;              ///< Trimmer heater cold junction temperature sensor
+    F32 primaryHeaterInternal;                  ///< Primary heaters internal temperature (calculated from thermocouple and cold junction)
+    F32 trimmerHeaterInternal;                  ///< Trimmer heater internal temperature (calculated from thermocouple and cold junction)
+    F32 fpgaBoard;                              ///< FPGA board temperature sensor
+    F32 loadCellA1B1;                           ///< Load cell A1/B1 temperature sensor
+    F32 loadCellA2B2;                           ///< Load cell A2/B2 temperature sensor
+    F32 internalTHDORTD;                        ///< THDo RTD channel temperature sensor
+    F32 internalTDIRTD;                         ///< TDI RTD channel temperature sensor
+    F32 internalCondSnsrTemp;                   ///< Conductivity Sensor internal temperature sensor
+    U32 primaryThermoCoupleRaw;                 ///< Primary heaters thermocouple raw ADC value
+    U32 primaryColdjuncRaw;                     ///< Primary heaters cold junction raw ADC value
+    U32 trimmerThermoCoupleRaw;                 ///< Trimmer heater thermocouple raw ADC value
+    U32 trimmerColdjuncRaw;                     ///< Trimmer heater cold junction raw ADC value
+    S32 cond1Raw;                               ///< Conductivity sensor 1 raw temperature ADC value
+    S32 cond2Raw;                               ///< Conductivity sensor 2 raw temperature ADC value
+} TEMPERATURE_SENSORS_DATA_T;
 
 /// Payload record structure for a drain reservoir command message.
 typedef struct
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6f2218c22e666aec059afbd60f3d0d268b305ad0 -r095cedf971998ff768a7f983228fb6f7ad679edc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6f2218c22e666aec059afbd60f3d0d268b305ad0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 095cedf971998ff768a7f983228fb6f7ad679edc)
@@ -2818,12 +2818,11 @@
  *************************************************************************/
 void handleDGTemperatureData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(DG_TEMPERATURES_T) )
+    if ( message->hdr.payloadLen == sizeof( TEMPERATURE_SENSORS_DATA_T ) )
     {
-        DG_TEMPERATURES_T payload;
+        TEMPERATURE_SENSORS_DATA_T * payloadPtr = (TEMPERATURE_SENSORS_DATA_T *)message->payload;
 
-        memcpy( &payload, message->payload, sizeof(DG_TEMPERATURES_T) );
-        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
+        setDialysateTemperatureReadings( payloadPtr->inletDialysate, payloadPtr->outletRedundant );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?