Index: Common.h
===================================================================
diff -u -r4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe -r2f7217131cfe6d5c53a7df934a6f202b00177811
--- Common.h	(.../Common.h)	(revision 4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe)
+++ Common.h	(.../Common.h)	(revision 2f7217131cfe6d5c53a7df934a6f202b00177811)
@@ -257,21 +257,56 @@
 
 // **** Common Broadcast Data ****
 
+#pragma pack(push,1)
 /// Heaters data structure.
 typedef struct
 {
-    F32 mainPrimayHeaterDC;                 ///< Main primary heater DC
-    F32 smallPrimaryHeaterDC;               ///< Small primary heater DC
-    F32 trimmerHeaterDC;                    ///< Trimmer heater DC
-    F32 primaryTargetTemp;                  ///< Primary heater target temperature
-    F32 trimmerTargetTemp;                  ///< Trimmer heater target temperature
-    U32 primaryHeaterState;                 ///< Primary heater state
-    U32 trimmerHeaterState;                 ///< Trimmer heater state
-    F32 primaryEfficiency;                  ///< Primary heater efficiency
-    F32 primaryCalcTargetTemp;              ///< Primary heater calculated target temperature
-    F32 trimmerCalcCurrentTemp;             ///< Trimmer heater calculated current temperature
+    F32 mainPrimayHeaterDC;                     ///< Main primary heater DC
+    F32 smallPrimaryHeaterDC;                   ///< Small primary heater DC
+    F32 trimmerHeaterDC;                        ///< Trimmer heater DC
+    F32 primaryTargetTemp;                      ///< Primary heater target temperature
+    F32 trimmerTargetTemp;                      ///< Trimmer heater target temperature
+    U32 primaryHeaterState;                     ///< Primary heater state
+    U32 trimmerHeaterState;                     ///< Trimmer heater state
+    F32 primaryEfficiency;                      ///< Primary heater efficiency
+    F32 primaryCalcTargetTemp;                  ///< Primary heater calculated target temperature
+    F32 trimmerCalcCurrentTemp;                 ///< Trimmer heater calculated current temperature
 } HEATERS_DATA_T;
 
+/// Temperature sensors data.
+typedef struct
+{
+    F32 inletPrimaryHeater;                     ///< Inlet primary heater temperature sensor
+    F32 heatDisinfect;                          ///< Heat Disinfect 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
+} TEMPERATURE_SENSORS_DATA_T;
+
+/// Loadcell measurements struct.
+typedef struct
+{
+    F32 loadCellA1inGram;                       ///< Loadcell A1 measurement in gram
+    F32 loadCellA2inGram;                       ///< Loadcell A2 measurement in gram
+    F32 loadCellB1inGram;                       ///< Loadcell B1 measurement in gram
+    F32 loadCellB2inGram;                       ///< Loadcell B2 measurement in gram
+} LOAD_CELL_DATA_T;
+#pragma pack(pop)
+
 // **** VectorCAST Definitions ****
 
 #ifdef _VECTORCAST_
Index: NVDataMgmt.c
===================================================================
diff -u -r0164cd187647ce322bb19f5075387732af38d09a -r2f7217131cfe6d5c53a7df934a6f202b00177811
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0164cd187647ce322bb19f5075387732af38d09a)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2f7217131cfe6d5c53a7df934a6f202b00177811)
@@ -1170,7 +1170,7 @@
             break;
 
         default:
-            // TODO software fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_NV_RECORD_SELECTED, nvData );
             break;
 #endif
     }
@@ -1689,7 +1689,7 @@
                 }
             }
         }
-        // TODO add the log queue later in Phase 1B.
+        // Add the log queue later in Phase 1B.
     }
 
     // Check if a queue job is available
@@ -1725,7 +1725,7 @@
         else if ( ( NVDATAMGMT_READ == ops ) && ( NVDATAMGMT_RTC == location ) )
         {
             readFromRAM( startAddress, maxBufferLength );
-            //currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS; // TODO Phase 1B for logging
+            //currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS; // Phase 1B for logging
 
             currentTime = getMSTimerCount();
             state       = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
@@ -1795,7 +1795,6 @@
     // If timed out, get back to Idle
     else if ( timeoutStatus == TRUE )
     {
-        // TODO schedule another write?
         recordAddressOffset = 0;
         state = NVDATAMGMT_EXEC_STATE_IDLE;
     }
@@ -1974,7 +1973,6 @@
    // If timed out, get back to Idle
    else if ( timeoutStatus == TRUE )
    {
-       // TODO schedule another write?
        recordAddressOffset = 0;
        state = NVDATAMGMT_EXEC_STATE_IDLE;
    }