Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd -r12ee76519f69faba57247312569fb7e274d87e12
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 12ee76519f69faba57247312569fb7e274d87e12)
@@ -254,6 +254,7 @@
     // Convert speed ADC to RPM
     currentDrainPumpRPM = CONVERSION_COEFF / getFPGADrainPumpSpeed();
 
+    // TODO this is disabled until RPM is calculated propely.
     // The RPM is only checked in open loop state that the pump is run at a fixed RPM.
     // The persistent alarm waits for a couple of seconds before raising an alarm, this is supposed to cover
     // when the pump is turned on and it takes a while to ramp up to target RPM.
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r5e595c58d494cfd452a8a9e89aec3bb8def793e2 -r12ee76519f69faba57247312569fb7e274d87e12
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 5e595c58d494cfd452a8a9e89aec3bb8def793e2)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 12ee76519f69faba57247312569fb7e274d87e12)
@@ -114,7 +114,8 @@
     // run operation mode state machine
     execOperationModes();
 
-    // Run non-volatile data management calibration state machine
+    // Run non-volatile data management state machine that sends the data record
+    // to Dialin
     execNVDataMgmtProcessRecord();
 
     // manage data to be transmitted to other sub-systems
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r5e595c58d494cfd452a8a9e89aec3bb8def793e2 -r12ee76519f69faba57247312569fb7e274d87e12
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 5e595c58d494cfd452a8a9e89aec3bb8def793e2)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 12ee76519f69faba57247312569fb7e274d87e12)
@@ -62,7 +62,7 @@
     // monitor internal ADC channels
     execInternalADC();
 
-#ifndef RM46_EVAL_BOARD_TARGET
+#ifndef BOARD_WITH_NO_HARDWARE
     // monitor pressures
     execPressures();
 
@@ -71,7 +71,7 @@
 
 #ifndef DISABLE_HEATERS_AND_TEMPS
     // Temperature sensors read
-    //execTemperatureSensors();
+    execTemperatureSensors();
 #endif
 
     // conductivity sensors read
Index: firmware/source/sys_main.c
===================================================================
diff -u -ra6684f5a4c807bf27996b9521c6d0f9f7c85d9f5 -r12ee76519f69faba57247312569fb7e274d87e12
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision a6684f5a4c807bf27996b9521c6d0f9f7c85d9f5)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 12ee76519f69faba57247312569fb7e274d87e12)
@@ -173,6 +173,7 @@
     initInternalADC();
     initPressures();
     initLoadCell();
+    initNVDataMgmt();
     initValves();
     initHeaters();
     initTemperatureSensors();
@@ -190,7 +191,6 @@
     initSystemComm();
     initReservoirs();
     initOperationModes();
-    initNVDataMgmt();
 }
 
 /*************************************************************************