Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r47c41046beba8affaaaa13a4f222a7b99bd193f1 -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 47c41046beba8affaaaa13a4f222a7b99bd193f1)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3)
@@ -1,24 +1,25 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file ModeInitPOST.c
+* @file    ModeInitPOST.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 27-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Jul-2022
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
 #include "Accel.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
 #include "CPLD.h"
+#include "DialysateFlow.h"
 #include "DrainPump.h"
 #include "Fans.h"
 #include "FPGA.h"
@@ -33,6 +34,7 @@
 #include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
+#include "TaskGeneral.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
 #include "UVReactors.h"
@@ -43,31 +45,40 @@
  *  @{
  */
 
+// ********** private definitions **********
+
+#define START_POST_DELAY_COUNT                  ( ( 1 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )          ///< Start POST delay in count.
+
 // ********** private data **********
 
-static DG_POST_STATE_T postState = DG_POST_STATE_START;     ///< Currently active initialize & POST state.
-static BOOL postCompleted = FALSE;                          ///< Flag indicating POST completed.
-static BOOL postPassed = FALSE;                             ///< Flag indicating all POST tests passed.
-static BOOL tempPOSTPassed = TRUE;                          ///< Temporary flag indicating all POST tests completed so far have passed.
+static DG_POST_STATE_T postState = DG_POST_STATE_START;                                                     ///< Currently active initialize & POST state.
+static BOOL postCompleted = FALSE;                                                                          ///< Flag indicating POST completed.
+static BOOL postPassed = FALSE;                                                                             ///< Flag indicating all POST tests passed.
+static BOOL tempPOSTPassed = TRUE;                                                                          ///< Temporary flag indicating all POST tests completed so far have passed.
+static U32 startPOSTDelayCounter = 0;                                                                       ///< Start POST delay counter.
 
 // ********** private function prototypes **********
 
 static DG_POST_STATE_T handlePOSTStatus( SELF_TEST_STATUS_T testStatus );
+static DG_POST_STATE_T handlePOSTStateStart( void );
 static SELF_TEST_STATUS_T execFWCompatibilityTest( void );
 
 /*********************************************************************//**
  * @brief
- * The initInitAndPOSTMode function initializes the Initialization and POST mode module.
+ * The initInitAndPOSTMode function initializes the Initialization and POST
+ * mode module.
  * @details Inputs: none
- * @details Outputs: Initialization and POST mode module initialized
+ * @details Outputs: postState, postCompleted, tempPOSTPassed,
+ * startPOSTDelayCounter
  * @return none
  *************************************************************************/
 void initInitAndPOSTMode( void )
 {
-    postState = DG_POST_STATE_START;
-    postCompleted = FALSE;
-    postPassed = FALSE;
-    tempPOSTPassed = TRUE;
+    postState             = DG_POST_STATE_START;
+    postCompleted         = FALSE;
+    postPassed            = FALSE;
+    tempPOSTPassed        = TRUE;
+    startPOSTDelayCounter = 0;
 }
 
 /*********************************************************************//**
@@ -76,11 +87,13 @@
  * initialization and POST mode.
  * @details Inputs: none
  * @details Outputs: none
- * @return none
+ * @return initial state
  *************************************************************************/
-void transitionToInitAndPOSTMode( void )
+U32 transitionToInitAndPOSTMode( void )
 {
-    // TODO - anything needed here?
+    initInitAndPOSTMode();
+
+    return postState;
 }
 
 /*********************************************************************//**
@@ -99,9 +112,9 @@
     switch ( postState )
     {
         case DG_POST_STATE_START:
-            postState = DG_POST_STATE_FW_COMPATIBILITY;
-#ifdef SKIP_POST
-            postState = DG_POST_STATE_COMPLETED;
+            postState = handlePOSTStateStart();
+#ifdef BOARD_WITH_NO_HARDWARE
+            postState = DG_POST_STATE_RTC;
 #endif
             break;
 
@@ -134,16 +147,27 @@
         // NVDataMgmt must load all the calibration data into RAM so the actuators
         // can query their corresponding calibration values successfully
         case DG_POST_STATE_TEMPERATURE_SENSORS:
+#ifndef BOARD_WITH_NO_HARDWARE
             testStatus = execTemperatureSensorsSelfTest();
             postState = handlePOSTStatus( testStatus );
+#else
+            postState = DG_POST_STATE_COMPLETED;
+#endif
             break;
 
         case DG_POST_STATE_ACCELEROMETER:
-#ifndef DISABLE_ACCELS
-            testStatus = execAccelTest();
-#else
-            testStatus = SELF_TEST_STATUS_PASSED;
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ACCELS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
+            {
+                testStatus = execAccelTest();
+            }
+#ifndef _RELEASE_
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
+#endif
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -178,7 +202,18 @@
             break;
 
         case DG_POST_STATE_UV_REACTORS:
-            testStatus = execUVReactorsSelfTest();
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UV_REACTORS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                testStatus = execUVReactorsSelfTest();
+            }
+#ifndef _RELEASE_
+            else
+            {
+                testStatus = SELF_TEST_STATUS_PASSED;
+            }
+#endif
             postState = handlePOSTStatus( testStatus );
             break;
 
@@ -192,6 +227,11 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        case DG_POST_STATE_DIALYSATE_FLOW_SENSOR:
+            testStatus = execDialysateFlowMeterSelfTest();
+            postState = handlePOSTStatus( testStatus );
+            break;
+
         case DG_POST_STATE_WATCHDOG:
             testStatus = execWatchdogTest();
             postState = handlePOSTStatus( testStatus );
@@ -282,15 +322,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
+    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
     {
-        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? TRUE : FALSE );
+        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
 
         // Broadcast passed POST result
         sendPOSTTestResult( (DG_POST_STATE_T)((int)postState), passed );
         // Move on to next POST test
         result = (DG_POST_STATE_T)((int)postState + 1);
-        if ( testStatus == SELF_TEST_STATUS_FAILED )
+        if ( SELF_TEST_STATUS_FAILED == testStatus )
         {
             tempPOSTPassed = FALSE;
         }
@@ -301,6 +341,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handlePOSTStateStart function handles the POST start state.
+ * @details Inputs: startPOSTDelayCounter
+ * @details Outputs: startPOSTDelayCounter
+ * @return next POST state
+ *************************************************************************/
+static DG_POST_STATE_T handlePOSTStateStart( void )
+{
+    DG_POST_STATE_T state = DG_POST_STATE_START;
+
+    // There is a delay before starting POST to make sure the CAN bus is up and listening so
+    // when the event data can be sent
+    if ( ++startPOSTDelayCounter > START_POST_DELAY_COUNT )
+    {
+        // Send the startup event
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_STARTUP, 0, 0 )
+        // Send the first submode change event. It is the mode Init and it does not start from a previous
+        // mode previous and current are both published as Init
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, DG_MODE_INIT, DG_MODE_INIT )
+        state = DG_POST_STATE_FW_COMPATIBILITY;
+        startPOSTDelayCounter = 0;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getCurrentInitAndPOSTState function returns the current state of the
  * initialization and POST mode.
  * @details Inputs: postState