Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r9b262ba08e3180f121c3cf19d8d25e565183f87d -r108abddcbf729f7435073116191cd3903261df8f
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 108abddcbf729f7435073116191cd3903261df8f)
@@ -57,11 +57,11 @@
 #define DOP_MAX_CURR_WHEN_RUNNING_MA            1000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DOP_MAX_CURR_ERROR_DURATION_MS          2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
-#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.375           ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
-#define DOP_CURRENT_ADC_TO_MA_FACTOR            2.65            ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
-#define DOP_ADC_FULL_SCALE_V                    3.0             ///< DPo analog signals are 0-3V (while int. ADC ref V is 3.3V).
-#define DOP_ADC_MID_PT_BITS                     ( (F32)( INT_ADC_FULL_SCALE_BITS >> 1 ) * ( DOP_ADC_FULL_SCALE_V / INT_ADC_REF_V ) )  ///< Mid-point (zero) for ADC readings.
-#define SIGN_FROM_12_BIT_VALUE(v)               ( (S16)(v) - (S16)DOP_ADC_MID_PT_BITS )   ///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
+#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.280938        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
+#define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002           ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
+#define DOP_ADC_FULL_SCALE_V                    3.0             ///< DPo analog signals are 0-3V (while int. ADC ref V may be different).
+#define DOP_ADC_ZERO                            ( (F32)( INT_ADC_ZERO ) * ( DOP_ADC_FULL_SCALE_V / INT_ADC_REF_V ) )  ///< Mid-point (zero) for ADC readings.
+#define SIGN_FROM_12_BIT_VALUE(v)               ( (S16)(v) - (S16)DOP_ADC_ZERO )   ///< Macro converts a 12-bit ADC reading to a signed 16-bit value.
 
 
 /*** setDialOutFlowRxTotalVolumeAndRxTime ***/
@@ -93,8 +93,13 @@
 
 // pin assignments and macros for pump stop and direction outputs
 #define STOP_DO_PUMP_MIBSPI1_PORT_MASK          0x00000400   ///< MIBSPI1 SIMO[0] - re-purposed as GPIOoutput for pump controller run/stop pin.
-#define SET_DOP_STOP()                          {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;}  ///< Macro sets pump controller run/stop signal to stop.
-#define CLR_DOP_STOP()                          {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run.
+#ifndef BREADBOARD_TARGET
+    #define SET_DOP_STOP()                          {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;}  ///< Macro sets pump controller run/stop signal to stop.
+    #define CLR_DOP_STOP()                          {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run.
+#else
+    #define SET_DOP_STOP()                          {mibspiREG1->PC3 |= STOP_DO_PUMP_MIBSPI1_PORT_MASK;}  ///< Macro sets pump controller run/stop signal to stop.
+    #define CLR_DOP_STOP()                          {mibspiREG1->PC3 &= ~STOP_DO_PUMP_MIBSPI1_PORT_MASK;} ///< Macro sets pump controller run/stop signal to run.
+#endif
 #define STOP_DO_PUMP_GIO_PORT_PIN               6U           ///< GIO port A pin used for pump controller direction pin.
 #define SET_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )  ///< Macro sets pump controller direction to forward direction.
 #define CLR_DOP_DIR()                           gioSetBit( gioPORTA, STOP_DO_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )   ///< Macro sets pump controller direction to reverse direction.