Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r5366722d2325ea93db0ad1f696db78597af3b7c6 -raaf0b2d7a81e5ff2d97e0e5b42e6cf7f1ca8fd7f
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 5366722d2325ea93db0ad1f696db78597af3b7c6)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision aaf0b2d7a81e5ff2d97e0e5b42e6cf7f1ca8fd7f)
@@ -37,7 +37,6 @@
 #include "OperationModes.h"
 #include "PAL.h"
 #include "Pressures.h"
-#include "RotaryValve.h"
 #include "StateTxBloodPrime.h"
 #include "StateTxDialysis.h"
 #include "StateTxPaused.h"
@@ -147,6 +146,7 @@
     { MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testPressuresDataPublishIntervalOverride },
     { MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST,                             &testSetAirPump },
     { MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testAirPumpDataPublishIntervalOverride },
+    { MSG_ID_TD_AIR_PUMP_RPM_OVERRIDE_REQUEST,                          &testAirPumpRPMOverride },
     { MSG_ID_TD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testSwitchesDataPublishIntervalOverride },
     { MSG_ID_TD_SWITCH_STATE_OVERRIDE_REQUEST,                          &testSwitchOverride },
     { MSG_ID_TD_OFF_BUTTON_OVERRIDE_REQUEST,                            &testOffButtonOverride },
@@ -160,9 +160,9 @@
     { MSG_ID_TD_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST,                    &testRawLevelSensorOverride },
     { MSG_ID_TD_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testAirTrapDataPublishIntervalOverride },
     { MSG_ID_TD_3_WAY_VALVE_SET_STATE_REQUEST,                          &testSet3WayValve },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,                     &testSetValve },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,             &testValveStatusOverride },
-    { MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,           &testValveEncoderPositionOverride },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,                     &testSetValve },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,             &testValveStatusOverride },
+    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,           &testValveEncoderPositionOverride },
     { MSG_ID_TD_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testValvesDataPublishIntervalOverride },
     { MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST,                       &testValveSetABCCmdPosition },
     { MSG_ID_TD_PINCH_VALVE_HOME_REQUEST,                               &testHomeValve },
@@ -199,6 +199,7 @@
     { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST,                  &testAirPumpPowerRaiseOverride },
     { MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST,                  &testAirPumpPowerLowerOverride },
+    { MSG_ID_TD_HARD_STOP_BLOOD_PUMP,                                   &testHardStopBloodPump },
     { MSG_ID_TD_BARO_MFG_CRC_OVERRIDE,                                  &testBaroPressureMFGCRCOverride },
     { MSG_ID_TD_BARO_PRESSURE_OVERRIDE,                                 &testBaroPressureOverride },
     { MSG_ID_TD_TEMPERATURE_OVERRIDE,                                   &testTemperatureOverride },