Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -r8543e4c79c6a95c8d36233aa9d3b59c82c6cc825 -r70b2c1d9ab087c24fc8114821c371652acf2801e
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 8543e4c79c6a95c8d36233aa9d3b59c82c6cc825)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 70b2c1d9ab087c24fc8114821c371652acf2801e)
@@ -329,6 +329,8 @@
  *************************************************************************/
 static void transitionToNewOperationMode( FP_OP_MODE_T newMode )
 {
+    SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_OP_MODE_CHANGE, lastMode, newMode )
+
     // Setup for new operating mode
     switch ( newMode )
     {
Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -r3e1af7cc2576e347ab8bdf2f400196b2301def07 -r70b2c1d9ab087c24fc8114821c371652acf2801e
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 3e1af7cc2576e347ab8bdf2f400196b2301def07)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 70b2c1d9ab087c24fc8114821c371652acf2801e)
@@ -173,7 +173,7 @@
         stateTransitioned = TRUE;
         calculateDutyCycleAvg( prevState );
         setModeGenPTransition( genPermeateState );
-        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_CHANGE, genPermeateState, prevState )
+        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_CHANGE, prevState, genPermeateState )
     }
 
     checkInletPressures();
Index: firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -r336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c -r70b2c1d9ab087c24fc8114821c371652acf2801e
--- firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c)
+++ firmware/App/Modes/FPModes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 70b2c1d9ab087c24fc8114821c371652acf2801e)
@@ -120,7 +120,7 @@
     if ( prevState != genPermeateDefState )
     {
         setModeGenPDefTransition( genPermeateDefState );
-        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_DEF_CHANGE, genPermeateDefState, prevState )
+        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_DEF_CHANGE, prevState, genPermeateDefState )
     }
 
     checkInletPressures();
Index: firmware/App/Modes/FPModes/ModePreGenPermeate.c
===================================================================
diff -u -r2d295ca85f19e95da42476a57ca6b4496baf980a -r70b2c1d9ab087c24fc8114821c371652acf2801e
--- firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 2d295ca85f19e95da42476a57ca6b4496baf980a)
+++ firmware/App/Modes/FPModes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 70b2c1d9ab087c24fc8114821c371652acf2801e)
@@ -152,7 +152,7 @@
     if ( previouspreGenPState != preGenPState )
     {
         setModePreGenPTransition( preGenPState );
-        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_CHANGE, preGenPState, previouspreGenPState )
+        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_CHANGE, previouspreGenPState, preGenPState )
     }
     //Publish pre Gen Permeate mode data
     publishPreGenPModeData();
Index: firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -r3e1af7cc2576e347ab8bdf2f400196b2301def07 -r70b2c1d9ab087c24fc8114821c371652acf2801e
--- firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 3e1af7cc2576e347ab8bdf2f400196b2301def07)
+++ firmware/App/Modes/FPModes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 70b2c1d9ab087c24fc8114821c371652acf2801e)
@@ -125,7 +125,7 @@
     if ( prevState != preGenPermeateDefState )
     {
         setModePreGenPDefTransition( preGenPermeateDefState );
-        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_GENP_DEF_CHANGE, preGenPermeateDefState, prevState )
+        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_PRE_GEN_DEF_CHANGE, prevState, preGenPermeateDefState )
     }
     //Publish Gen Permeate mode data
     publishPreGenPDefModeData();