Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r88662452040aa91ce9a7da032e9ed1865517bdd5 -r228773fa681489a62db5c47807a4794e5761d4f5
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 88662452040aa91ce9a7da032e9ed1865517bdd5)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
@@ -20,22 +20,35 @@
 #include "reg_system.h"
 #include "BalancingChamber.h"
 #include "BloodLeak.h"
+#include "BoostPump.h"
 #include "Conductivity.h"
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
-#include "Heaters.h"
+#include "FluidPump.h"
+#include "FlushConcentrate.h"
+#include "FlushFilter.h"
+#include "FlushPermeate.h"
 #include "FpgaDD.h"
+#include "FPModeFault.h"
+#include "FPModeInitPOST.h"
+#include "FPModeStandby.h"
+#include "FPOperationModes.h"
+#include "Heaters.h"
+#include "InletPressureCheck.h"
 #include "Level.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
 #include "ModeGenDialysate.h"
+#include "ModeGenPermeate.h"
 #include "ModePreGenDialysate.h"
+#include "ModePreGenPermeate.h"
 #include "ModePostGenDialysate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressure.h"
+#include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SpentChamberFill.h"
 #include "SystemCommDD.h"
@@ -174,7 +187,25 @@
     { MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST,                     &testBloodLeakEmbeddedModeInfoOverride },
     { MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST,               &testBloodLeakIntensityMovingAverageOverride },
     { MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST,                 &testBloodLeakZeroingIntervalInMillisecondsOverride },
-    { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest }
+    { MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST,                                            &testBloodLeakZeroSequenceRequest },
+    { MSG_ID_FP_TESTER_LOGIN_REQUEST,                                               &handleTesterFPLogInRequest },
+    { MSG_ID_FP_SET_OPERATION_MODE_REQUEST,                                         &testSetFPOperationMode },
+    { MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                   &testSetFPOpModePublishIntervalOverride },
+    { MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testPreGenDataPublishIntervalOverride },
+    { MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                       &testInletPressureCheckDataPublishIntervalOverride },
+    { MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST,                             &testInletPressureCheckTimerOverride },
+    {  MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testBoostPumpDataPublishIntervalOverride },
+    {  MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST,                       &testBoostPumpTargetPressureOverride },
+    {  MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,                           &testBoostPumpTargetFlowOverride },
+    {  MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST,                            &testBoostPumpTargetDutyCycleOverride },
+    {  MSG_ID_FP_BOOST_PUMP_STOP_REQUEST,                                           &testBoostPumpHardStop },
+    {  MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST,                                        &testSetFluidPumpPWM },
+    {  MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST,                              &testFluidPumpPWMOverride },
+    {  MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST,                                 &testFluidPumpRPMOverride },
+    {  MSG_ID_FP_RO_PUMP_STOP_REQUEST,                                              &testROPumpHardStop },
+    {  MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST,                          &testROPumpTargetPressureOverride },
+    {  MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST,                              &testROPumpTargetFlowOverride },
+    {  MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST,                               &testROPumpTargetDutyCycleOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -714,6 +745,32 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTesterFPLogInRequest function handles a request to login as a tester.
+ * @details \b Inputs: none
+ * @details \b Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+BOOL handleTesterFPLogInRequest( MESSAGE_T *message )
+{
+    // verify pass code
+    // TODO - placeholder - how do we want to authenticate tester?
+    if ( ( 3 == message->hdr.payloadLen ) && ( 0x31 == message->payload[ 0 ] ) && ( 0x32 == message->payload[ 1 ] ) && ( 0x33 == message->payload[ 2 ] ) )
+    {
+        testerLoggedIn = TRUE;
+        // The user logged in, so the set the dialin expiration date until the first check in from dialin is received
+        setDialinCheckInTimeStamp();
+    }
+    else
+    {
+        testerLoggedIn = FALSE;
+    }
+
+    return testerLoggedIn;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTDSoftwareResetRequest function handles a request to reset the
  * TD firmware processor.
  * @details \b Inputs: none