Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -r886964fa2bf6a5bb61b33b8b5547f3d0c585b360 -rbf22769adf33cbf6bcd26bf01992234b082a38a1
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 886964fa2bf6a5bb61b33b8b5547f3d0c585b360)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision bf22769adf33cbf6bcd26bf01992234b082a38a1)
@@ -586,7 +586,7 @@
                     testChangeSubMode = TRUE;
                 }
                 // request submode change only as the requested operation mode is current mode and requested sub mode is not current sub mode
-                else if ( currentSubMode != testRequestedSubMode )
+                else if ( currentSubMode != reqSubMode )
                 {
                     testRequestedSubMode = reqSubMode;
                     testChangeSubMode = TRUE;
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -rbadf6cf12c8ee15d856a195dfacb8f84360f8e96 -rbf22769adf33cbf6bcd26bf01992234b082a38a1
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision badf6cf12c8ee15d856a195dfacb8f84360f8e96)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision bf22769adf33cbf6bcd26bf01992234b082a38a1)
@@ -609,9 +609,24 @@
         {
             // Require no special handling for now (update the comment if required in future)
             case FP_PRE_GENP_INLET_PRESSURE_CHECK:
+                resetInletPressureCheckSignals();
+                break;
+
             case FP_PRE_GENP_FILTER_FLUSH:
+                resetFilterFlushSignals();
+                signalStartFilterFlush();
+                break;
+
             case FP_PRE_GENP_PERMEATE_FLUSH:
+                resetPermeateFlushSignals();
+                signalStartPermeateFlush();
+                break;
+
             case FP_PRE_GENP_CONCENTRATE_FLUSH:
+                resetConcentrateFlushSignals();
+                signalStartConcentrateFlush();
+                break;
+
             case FP_PRE_GENP_VERIFY_WATER:
             case FP_PRE_GENP_PAUSED:
             default:
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -rbadf6cf12c8ee15d856a195dfacb8f84360f8e96 -rbf22769adf33cbf6bcd26bf01992234b082a38a1
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision badf6cf12c8ee15d856a195dfacb8f84360f8e96)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision bf22769adf33cbf6bcd26bf01992234b082a38a1)
@@ -428,7 +428,14 @@
         {
             // Any of these state require no special handling
             case FP_PRE_GENP_DEF_INLET_PRESSURE_CHECK:
+                resetInletPressureCheckSignals();
+                break;
+
             case FP_PRE_GENP_DEF_FLUSH:
+                resetFilterFlushDefSignals();
+                signalStartDefFilterFlush();
+                break;
+
             case FP_PRE_GENP_DEF_PAUSED:
             default:
                 break;
Index: firmware/App/Modes/FPModes/StateInletPressureCheck.c
===================================================================
diff -u -r70a0840cbf7c2455cb6b814cba1241c253f0e9e3 -rbf22769adf33cbf6bcd26bf01992234b082a38a1
--- firmware/App/Modes/FPModes/StateInletPressureCheck.c	(.../StateInletPressureCheck.c)	(revision 70a0840cbf7c2455cb6b814cba1241c253f0e9e3)
+++ firmware/App/Modes/FPModes/StateInletPressureCheck.c	(.../StateInletPressureCheck.c)	(revision bf22769adf33cbf6bcd26bf01992234b082a38a1)
@@ -158,6 +158,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The resetInletPressureCheckSignals function resets the signal values for
+ * FP inlet pressure checks.
+ * @details \b Inputs: none
+ * @details \b Outputs: isPressureCheckComplete
+ * @return none
+ *************************************************************************/
+void resetInletPressureCheckSignals( void )
+{
+    isPressureCheckComplete = FALSE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleInletPressureCheckProgressState handles the in progress
  * state of inlet pressure check
  * @details \b Inputs:  none
Index: firmware/App/Modes/FPModes/StateInletPressureCheck.h
===================================================================
diff -u -r70a0840cbf7c2455cb6b814cba1241c253f0e9e3 -rbf22769adf33cbf6bcd26bf01992234b082a38a1
--- firmware/App/Modes/FPModes/StateInletPressureCheck.h	(.../StateInletPressureCheck.h)	(revision 70a0840cbf7c2455cb6b814cba1241c253f0e9e3)
+++ firmware/App/Modes/FPModes/StateInletPressureCheck.h	(.../StateInletPressureCheck.h)	(revision bf22769adf33cbf6bcd26bf01992234b082a38a1)
@@ -44,6 +44,7 @@
 U32  transitionToInletPressureCheck( void );                                   // Transition to Inlet Pressure Check
 void execInletPressureCheck( void );                                           // Execute the Inlet Pressure Checks state machine
 BOOL isInletPressureCheckCompleted( void );                                    // returns if Inlet Pressure Check is complete
+void resetInletPressureCheckSignals( void );                                   // reset signals for Inlet Pressure Checks
 FP_INLET_PRES_CHECK_STATE_T getCurrentInletPressureCheckState( void );         // Get the current state of the Inlet Pressure Check
 
 BOOL testInletPressureCheckDataPublishIntervalOverride( MESSAGE_T *message );