Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -r313982ccc772f1bbe182877dff7e00381b04e0f4
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f7c714a1a09b10d85a8b013712532d37b4d7b97a)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 313982ccc772f1bbe182877dff7e00381b04e0f4)
@@ -18,19 +18,18 @@
 #include "reg_crc.h"       // Used to hold reset reason code at startup before bits get cleared
 #include "reg_system.h"    // Used to access exception status registers for reset reason code at startup
 
-//#include "ConcentratePumps.h"
-//#include "ConductivitySensors.h"
+#include "ConcentratePumps.h"
+#include "ConductivitySensors.h"
 #include "FpgaDD.h"
 //#include "Integrity.h"
 #include "Messaging.h"
 #include "ModeInitPOST.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
-//#include "Pressures.h"
+#include "Pressure.h"
 #include "SafetyShutdown.h"
 #include "TaskGeneral.h"
-//#include "TemperatureSensors.h"
-//#include "Thermistors.h"
+#include "Temperature.h"
 #include "WatchdogMgmt.h"
 
 /**
@@ -84,11 +83,11 @@
 U32 transitionToInitAndPOSTMode( void )
 {
     initInitAndPOSTMode();
-//    setCurrentSubState( NO_SUB_STATE );
+    setCurrentSubState( NO_SUB_STATE );
 //    resetNVDataMgmtPOSTState();
 //    resetPressuresPOSTState();
-//    resetWatchdogPOSTState();
-//    resetSafetyShutdownPOSTState();
+    resetWatchdogPOSTState();
+    resetSafetyShutdownPOSTState();
 
     return postState;
 }
@@ -107,7 +106,9 @@
  *************************************************************************/
 U32 execInitAndPOSTMode( void )
 {
-    SELF_TEST_STATUS_T testStatus = SELF_TEST_STATUS_IN_PROGRESS;
+//TODO : uncomment following when init mode updated with required tests
+//    SELF_TEST_STATUS_T testStatus = SELF_TEST_STATUS_IN_PROGRESS;
+    SELF_TEST_STATUS_T testStatus = SELF_TEST_STATUS_PASSED;
 
     // execute current POST state
     switch ( postState )
@@ -117,7 +118,7 @@
             break;
 
         case DD_POST_STATE_FW_COMPATIBILITY:
-            //testStatus = execFWCompatibilityTest();
+            testStatus = execFWCompatibilityTest();
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -127,7 +128,7 @@
             break;
 
         case DD_POST_STATE_FPGA:
-            //testStatus = execFPGATest();
+            testStatus = execFPGATest();
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -149,6 +150,11 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        case DD_POST_STATE_DIALYSATE_PUMPS:
+            //testStatus = execDialysatePumpsSelfTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case DD_POST_STATE_CONCENTRATE_PUMPS:
             //testStatus = execConcenratePumpsSelfTest();
             postState = handlePOSTStatus( testStatus );
@@ -159,11 +165,6 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
-        case DD_POST_STATE_THERMISTORS:
-            //testStatus = execThermistorsSelfTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         case DD_POST_STATE_WATCHDOG:
             //testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );
@@ -185,9 +186,9 @@
             break;
 
         case DD_POST_STATE_COMPLETED:
-            // Set overall HD POST status to "passed"
+            // Set overall DD POST status to "passed"
             postPassed = TRUE;
-            // Set overall HD POST completed status to TRUE
+            // Set overall DD POST completed status to TRUE
             postCompleted = TRUE;
             // Broadcast final POST passed
             //sendPOSTFinalResult( TRUE );