Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r9b262ba08e3180f121c3cf19d8d25e565183f87d -r108abddcbf729f7435073116191cd3903261df8f
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 9b262ba08e3180f121c3cf19d8d25e565183f87d)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 108abddcbf729f7435073116191cd3903261df8f)
@@ -52,8 +52,8 @@
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         1000.0          // motor controller current should not exceed this when pump should be running
 #define DIP_MAX_CURR_ERROR_DURATION_MS       2000            // motor controller current errors persisting beyond this duration will trigger an alarm
 
-#define DIP_SPEED_ADC_TO_RPM_FACTOR          1.375           // conversion factor from ADC counts to RPM for dialIn pump motor
-#define DIP_CURRENT_ADC_TO_MA_FACTOR         2.65            // conversion factor from ADC counts to mA for dialIn pump motor
+#define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938        // conversion factor from ADC counts to RPM for dialIn pump motor
+#define DIP_CURRENT_ADC_TO_MA_FACTOR         3.002           // conversion factor from ADC counts to mA for dialIn pump motor
 
 #define DIP_REV_PER_LITER                    124.0           // rotor revolutions per liter
 #define DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR    ( DIP_REV_PER_LITER / ML_PER_LITER )
@@ -62,9 +62,9 @@
 #define DIP_PWM_ZERO_OFFSET                  0.1             // 10% PWM duty cycle = zero speed
 #define DIP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR + DIP_PWM_ZERO_OFFSET )
 
-#define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0             // BP analog signals are 0-3V (while int. ADC ref V is 3.3V)
-#define DIAL_IN_PUMP_ADC_MID_PT_BITS         ( (F32)( INT_ADC_FULL_SCALE_BITS >> 1 ) * ( DIAL_IN_PUMP_ADC_FULL_SCALE_V / INT_ADC_REF_V ) )
-#define SIGN_FROM_12_BIT_VALUE(v)            ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_MID_PT_BITS )
+#define DIAL_IN_PUMP_ADC_FULL_SCALE_V        3.0             // BP analog signals are 0-3V (while int. ADC ref V may be different)
+#define DIAL_IN_PUMP_ADC_ZERO                ( (F32)( INT_ADC_ZERO ) * ( DIAL_IN_PUMP_ADC_FULL_SCALE_V / INT_ADC_REF_V ) )
+#define SIGN_FROM_12_BIT_VALUE(v)            ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO )
 
 #define DIAL_IN_FLOW_SAMPLE_FREQ             ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )
 #define SIZE_OF_ROLLING_AVG                  ( DIAL_IN_FLOW_SAMPLE_FREQ * 2 )     // measured dialIn flow is filtered w/ moving average
@@ -92,9 +92,14 @@
 #define DIR_DI_PUMP_SPI5_PORT_MASK       0x00000100  // (ENA - re-purposed as output GPIO)
 // dialIn pump stop and direction macros
 #define SET_DIP_DIR()                    {mibspiREG5->PC3 |= DIR_DI_PUMP_SPI5_PORT_MASK;}
-#define SET_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
 #define CLR_DIP_DIR()                    {mibspiREG5->PC3 &= ~DIR_DI_PUMP_SPI5_PORT_MASK;}
-#define CLR_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )
+#ifndef BREADBOARD_TARGET
+    #define SET_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )
+    #define CLR_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
+#else
+    #define SET_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
+    #define CLR_DIP_STOP()                   gioSetBit( gioPORTA, STOP_DI_PUMP_GIO_PORT_PIN, PIN_SIGNAL_LOW )
+#endif
 
 // ********** private data **********