Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -247,11 +247,10 @@
  * a new Gen Permeate sub mode.
  * @details \b Inputs: none
  * @details \b Outputs: none
- * @return TRUE if request successful, FALSE if not
+ * @return none
  *************************************************************************/
-BOOL signalNewGenPermeateSubMode( U32 newSubMode )
+void signalNewGenPermeateSubMode( U32 newSubMode )
 {
-    BOOL result = FALSE;
     FP_GENP_MODE_STATE_T reqSubMode = (FP_GENP_MODE_STATE_T)newSubMode;
 
     if ( reqSubMode < NUM_OF_FP_GENP_MODE_STATES )
@@ -270,10 +269,7 @@
             default:
                 break;
         }
-        result = TRUE;
     }
-
-    return result;   // TODO can this be a void function
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/FPModes/ModeGenPermeate.h
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModeGenPermeate.h	(.../ModeGenPermeate.h)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.h	(.../ModeGenPermeate.h)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -46,7 +46,7 @@
 U32  execGenPermeateMode( void );                                           // Execute the gen permeate mode state machine (call from OperationModes)
 BOOL requestGenWaterStart( void );                                          // Request to start gen water and transition modes
 BOOL requestGenWaterStop( void );                                           // Request to stop gen water and transition.
-BOOL signalNewGenPermeateSubMode( U32 newSubMode );                         // Signal transition to a new gen permeate sub mode
+void signalNewGenPermeateSubMode( U32 newSubMode );                         // Signal transition to a new gen permeate sub mode
 FP_GENP_MODE_STATE_T getCurrentGenPermeateState( void );                    // Get the current state of the gen water mode
 
 BOOL testGenPermeateDataPublishIntervalOverride( MESSAGE_T *message );      // override broadcast interval for gen permeate
Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -278,11 +278,10 @@
  * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if given new sub mode is invalid.
  * @details \b Inputs: none
  * @details \b Outputs: none
- * @return TRUE if request successful, FALSE if not
+ * @return none
  *************************************************************************/
-BOOL signalNewGenPDefeaturedSubMode( U32 newSubMode )
+void signalNewGenPDefeaturedSubMode( U32 newSubMode )
 {
-    BOOL result = FALSE;
     FP_GENP_DEF_MODE_STATE_T reqSubMode = (FP_GENP_DEF_MODE_STATE_T)newSubMode;
 
     if ( reqSubMode < NUM_OF_FP_GENP_DEF_MODE_STATES )
@@ -302,10 +301,7 @@
             default:
                 break;
         }
-        result = TRUE;  // TODO can this be a void function
     }
-
-    return result;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.h	(.../ModeGenPermeateDefeatured.h)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -46,7 +46,7 @@
 BOOL requestGenWaterDefStart( void );                                                // request to start gen permeate in defeatured mode
 BOOL requestGenWaterDefStop( void );                                                 // request to stop gen permeate in defeatured mode
 BOOL getGenPermeateRequest( void );                                                  // get function to retrieve request status
-BOOL signalNewGenPDefeaturedSubMode( U32 newSubMode );                               // Signal transition to a new defeatured gen permeate sub mode
+void signalNewGenPDefeaturedSubMode( U32 newSubMode );                               // Signal transition to a new defeatured gen permeate sub mode
 FP_GENP_DEF_MODE_STATE_T getCurrentGenPermeateDefState( void );                      // Get the current state of the gen water mode
 
 BOOL testGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );            // override broadcast interval for defeatued gen permeate
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -452,11 +452,10 @@
  * PreGen Permeate sub mode.
  * @details \b Inputs: none
  * @details \b Outputs: none
- * @return TRUE if request successful, FALSE if not
+ * @return none
  *************************************************************************/
-BOOL signalNewPreGenPSubMode( U32 newSubMode )
+void signalNewPreGenPSubMode( U32 newSubMode )
 {
-    BOOL result = FALSE;
     FP_PRE_GENP_MODE_STATE_T reqSubMode = (FP_PRE_GENP_MODE_STATE_T)newSubMode;
     LEVEL_STATE_T level = getLevelStatus( P25_LEVL );
 
@@ -467,19 +466,16 @@
             case FP_PRE_GENP_INLET_PRESSURE_CHECK:
                 preGenPState = FP_PRE_GENP_INLET_PRESSURE_CHECK;
                 setModePreGenPTransition( reqSubMode );
-                result = TRUE;
                 break;
 
             case FP_PRE_GENP_FILTER_FLUSH:
                 preGenPState = FP_PRE_GENP_FILTER_FLUSH;
                 setModePreGenPTransition( reqSubMode );
-                result = TRUE;
                 break;
 
             case FP_PRE_GENP_PERMEATE_FLUSH:
                 preGenPState = FP_PRE_GENP_PERMEATE_FLUSH;
                 setModePreGenPTransition( reqSubMode );
-                result = TRUE;
                 break;
 
             case FP_PRE_GENP_CONCENTRATE_FLUSH:
@@ -494,17 +490,13 @@
             case FP_PRE_GENP_VERIFY_WATER:
                 preGenPState = FP_PRE_GENP_VERIFY_WATER;
                 setModePreGenPTransition( reqSubMode );
-                result = TRUE;
                 break;
 
             case FP_PRE_GENP_PAUSED:
             default:
-                result = FALSE;
                 break;
         }
     }
-
-    return result;  // TODO can this be a void function
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.h
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModePreGenPermeate.h	(.../ModePreGenPermeate.h)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.h	(.../ModePreGenPermeate.h)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -47,7 +47,7 @@
 BOOL requestPreGenStop( void );                                         // Stop pre gen permeate request
 BOOL getPreGenRequest( void );                                          // Get the pre gen permeate request status
 FP_PRE_GENP_MODE_STATE_T getCurrentPreGenPState( void );                // Get the current state of the pre gen permeate mode
-BOOL signalNewPreGenPSubMode( U32 newSubMode );                         // Signal transition to a new pre gen permeate sub mode
+void signalNewPreGenPSubMode( U32 newSubMode );                         // Signal transition to a new pre gen permeate sub mode
 
 BOOL testPreGenDataPublishIntervalOverride( MESSAGE_T *message );
 
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -322,11 +322,10 @@
  * @details \b Alarm: ALARM_ID_FP_SOFTWARE_FAULT if given new sub mode is invalid.
  * @details \b Inputs: none
  * @details \b Outputs: none
- * @return TRUE if request successful, FALSE if not
+ * @return none
  *************************************************************************/
-BOOL signalNewPreGenPDefeaturedSubMode( U32 newSubMode )
+void signalNewPreGenPDefeaturedSubMode( U32 newSubMode )
 {
-    BOOL result = FALSE;
     FP_PRE_GENP_DEF_MODE_STATE_T reqSubMode = (FP_PRE_GENP_DEF_MODE_STATE_T)newSubMode;
 
     if ( reqSubMode < NUM_OF_FP_PRE_GENP_DEF_MODE_STATES )
@@ -350,10 +349,7 @@
             default:
                 break;
         }
-        result = TRUE;
     }
-
-    return result;   // TODO can this be a void function
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h
===================================================================
diff -u -rcb8619fdf8690885708071d34b0e87e6657ecd62 -r64acabc33ab795591768801f8b443f0da9ee2b98
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision cb8619fdf8690885708071d34b0e87e6657ecd62)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.h	(.../ModePreGenPermeateDefeatured.h)	(revision 64acabc33ab795591768801f8b443f0da9ee2b98)
@@ -46,7 +46,7 @@
 BOOL requestPreGenDefStart( void );                                                     // Request to start pre generate
 BOOL requestPreGenDefStop( void );                                                      // Request to stop pre generate
 BOOL getPreGenPermeateRequest( void );                                                  // Retrieve pre gen request
-BOOL signalNewPreGenPDefeaturedSubMode( U32 newSubMode );                               // Signal transition to a new defeatured pre gen permeate sub mode
+void signalNewPreGenPDefeaturedSubMode( U32 newSubMode );                               // Signal transition to a new defeatured pre gen permeate sub mode
 FP_PRE_GENP_DEF_MODE_STATE_T getCurrentPreGenPermeateDefState( void );                  // Get the current state of the Pre gen water mode
 
 BOOL testPreGenPermeateDefDataPublishIntervalOverride( MESSAGE_T *message );            // override broadcast interval for Pre gen permeate