Index: firmware/App/Controllers/DrainPump.h
===================================================================
diff -u -rfcdecd8b2c6b086ddf4700ecc1892bd47aef08c1 -r7fe3d2932b501e323a6fb0eb47964b32da6798d9
--- firmware/App/Controllers/DrainPump.h	(.../DrainPump.h)	(revision fcdecd8b2c6b086ddf4700ecc1892bd47aef08c1)
+++ firmware/App/Controllers/DrainPump.h	(.../DrainPump.h)	(revision 7fe3d2932b501e323a6fb0eb47964b32da6798d9)
@@ -41,7 +41,7 @@
 {
     DRAIN_PUMP_HALL_SNSR_FB = 0,         ///< Drain pump hall sensor feedback.
     DRAIN_PUMP_MAXON_SNSR_FB,            ///< Drain pump Maxon sensor feedback.
-    NUM_OF_DRAIN_PUMP_FB                 ///< Number of drain pump feedbacks.
+    NUM_OF_DRAIN_PUMP_SNSR_FB            ///< Number of drain pump sensor feedbacks.
 } DRAIN_PUMP_SPEED_FB_SNSR_T;
 
 /// Drain pump data publish
@@ -50,10 +50,11 @@
     U32 rpmSetPoint;                     ///< Drain pump speed set point (for open loop).
     U32 pumpDACSet;                      ///< Drain pump DAC set value.
     U32 drainPumpState;                  ///< Drain pump state machine state.
-    U32 drainPumpRPM;                    ///< Drain pump current RPM.
+    U32 drainPumpHallRPM;                ///< Drain pump current RPM from Hall sensor.
     F32 trgtOutletFlowLPM;               ///< Drain pump target outlet flow in L/min.
     F32 drainPumpCurrentA;               ///< Drain pump current in amps.
     U32 drainPumpDirection;              ///< Drain pump direction.
+    U32 drainPumpMaxonRPM;               ///< Drain pump current RPM from Maxon board.
 } DRAIN_PUMP_DATA_T;
 
 // ********** public function prototypes **********
@@ -73,7 +74,7 @@
 void signalDrainPumpHardStop( void );
 
 U32 getDrainPumpTargetRPM( void );
-U32 getDrainPumpMeasuredRPM( DRAIN_PUMP_SPEED_FB_SNSR_T speed );
+U32 getDrainPumpMeasuredRPM( DRAIN_PUMP_SPEED_FB_SNSR_T sensor );
 
 BOOL isDrainPumpOn( void );
 
@@ -85,10 +86,8 @@
 BOOL testSetTargetDrainPumpRPM( U32 value );
 BOOL testSetTargetDrainPumpOutletFlowLPM( F32 value );
 
-BOOL testSetDrainPumpMeasuredRPMOverride( U32 value );
-BOOL testResetDrainPumpMeasuredRPMOverride( void );
-BOOL testSetDrainPumpMeasuredCurrentOverride( F32 value );
-BOOL testResetDrainPumpMeasuredCurrentOverride( void );
+BOOL testSetDrainPumpMeasuredRPMOverride( U32 sensor, U32 value );
+BOOL testResetDrainPumpMeasuredRPMOverride( U32 sensor );
 
 BOOL testSetDrainPumpMeasuredCurrentOverride( F32 value );
 BOOL testResetDrainPumpMeasuredCurrentOverride( void );