Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rf416391a93d78ea154b43afd09a8764e2573fd9a -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f416391a93d78ea154b43afd09a8764e2573fd9a)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
@@ -49,18 +49,18 @@
 #define MAX_DIAL_OUT_FLOW_RATE                  650             ///< Maximum dialysate outlet pump flow rate in mL/min.
 #define MIN_DIAL_OUT_FLOW_RATE                  100             ///< Minimum dialysate outlet pump flow rate in mL/min.
 
-#define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.0133          ///< Maximum duty cycle change when ramping up ~ 200 mL/min/s.
-#define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.02            ///< Maximum duty cycle change when ramping down ~ 300 mL/min/s.
-#define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.89            ///< Controller will error if PWM duty cycle > 90%, so set max to 89%.
-#define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.10            ///< Controller will error if PWM duty cycle < 10%, so set min to 10%.
-#define MAX_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL    0.4             ///< Maximum PWM offset (added to DPi PWM duty cycle).
-#define MIN_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL   -0.4             ///< Minimum PWM offset (added to DPi PWM duty cycle).
+#define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.0133F         ///< Maximum duty cycle change when ramping up ~ 200 mL/min/s.
+#define MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE    0.02F           ///< Maximum duty cycle change when ramping down ~ 300 mL/min/s.
+#define MAX_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.89F           ///< Controller will error if PWM duty cycle > 90%, so set max to 89%.
+#define MIN_DIAL_OUT_PUMP_PWM_DUTY_CYCLE        0.10F           ///< Controller will error if PWM duty cycle < 10%, so set min to 10%.
+#define MAX_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL    0.4F            ///< Maximum PWM offset (added to DPi PWM duty cycle).
+#define MIN_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL   -0.4F            ///< Minimum PWM offset (added to DPi PWM duty cycle).
 
-#define P_VOL                                   0.001           ///< P term for volume error feedback into dialysate outlet pump control.
-#define P_UF                                    0.001           ///< P term for UF rate error feedback into dialysate outlet pump control.
-#define P_CORR                                  0.1666          ///< P term for volume error feedback into dialysate outlet pump flow estimate correction offset.
+#define P_VOL                                   0.001F          ///< P term for volume error feedback into dialysate outlet pump control.
+#define P_UF                                    0.001F          ///< P term for UF rate error feedback into dialysate outlet pump control.
+#define P_CORR                                  0.1666F         ///< P term for volume error feedback into dialysate outlet pump flow estimate correction offset.
 
-#define RPM_2_ML_MIN_CONVERSION                 0.215964        ///< Conversion factor for estimating flow rate from pump motor RPM.
+#define RPM_2_ML_MIN_CONVERSION                 0.215964F       ///< Conversion factor for estimating flow rate from pump motor RPM.
 #define SIZE_OF_ROLLING_AVG                     100             ///< Number of samples in DPo flow estimation moving average.
 
 #define DOP_HOME_RATE                           100             ///< Target pump speed (in estimate mL/min) for homing.
@@ -73,9 +73,9 @@
 
 #define DOP_HALL_EDGE_COUNTS_PER_REV            48              ///< Number of hall sensor edge counts per motor revolution.
 
-#define DOP_MAX_MOTOR_SPEED_WHILE_OFF_RPM       100.0           ///< Maximum motor speed (RPM) while motor is commanded off.
-#define DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM         5.0             ///< Maximum difference in speed between motor and rotor (in rotor RPM).
-#define DOP_MAX_MOTOR_SPEED_ERROR_RPM           300.0           ///< Maximum difference in speed between measured and commanded RPM.
+#define DOP_MAX_MOTOR_SPEED_WHILE_OFF_RPM       100.0F          ///< Maximum motor speed (RPM) while motor is commanded off.
+#define DOP_MAX_ROTOR_VS_MOTOR_DIFF_RPM         5.0F            ///< Maximum difference in speed between motor and rotor (in rotor RPM).
+#define DOP_MAX_MOTOR_SPEED_ERROR_RPM           300.0F          ///< Maximum difference in speed between measured and commanded RPM.
 
 /// Persist time (task intervals) for motor off error condition.
 static const U32 DOP_OFF_ERROR_PERSIST          = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
@@ -86,27 +86,27 @@
 /// Persist time (task intervals) pump direction error condition.
 static const U32 DOP_DIRECTION_ERROR_PERSIST    = (250 / TASK_PRIORITY_INTERVAL);
 
-#define DOP_MAX_CURR_WHEN_STOPPED_MA            150.0           ///< Motor controller current should not exceed this when pump should be stopped.
-#define DOP_MAX_CURR_WHEN_RUNNING_MA            2000.0          ///< Motor controller current should not exceed this when pump should be running.
+#define DOP_MAX_CURR_WHEN_STOPPED_MA            150.0F          ///< Motor controller current should not exceed this when pump should be stopped.
+#define DOP_MAX_CURR_WHEN_RUNNING_MA            2000.0F         ///< 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_ADC_FULL_SCALE_V                    3.0             ///< DPo analog signals are 0-3V (while int. ADC ref V may be different).
+#define DOP_ADC_FULL_SCALE_V                    3.0F            ///< DPo analog signals are 0-3V (while int. ADC ref V may be different).
 #define DOP_ADC_ZERO                            1998            ///< 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.
 
 #define DOP_SPEED_ADC_TO_RPM_FACTOR             1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor (3500 RPM/1998 counts).
-#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000238        ///< ~42 BP motor RPM = 1% PWM duty cycle
-#define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002           ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
+#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000238F       ///< ~42 BP motor RPM = 1% PWM duty cycle
+#define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002F          ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
 
-#define DOP_REV_PER_LITER                       146.84          ///< Rotor revolutions per liter.
+#define DOP_REV_PER_LITER                       146.84F         ///< Rotor revolutions per liter.
 #define DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR       ( DOP_REV_PER_LITER / ML_PER_LITER )   ///< Conversion factor from mL/min to pump motor RPM.
-#define DOP_GEAR_RATIO                          32.0            ///< Pump motor to pump gear ratio.
+#define DOP_GEAR_RATIO                          32.0F           ///< Pump motor to pump gear ratio.
 #define DOP_PWM_ZERO_OFFSET                     0.1F            ///< 10% PWM duty cycle = zero speed.
 
 /// Macro converts a flow rate to an estimated PWM duty cycle %.
 #define DOP_PWM_FROM_ML_PER_MIN(rate)           ( (rate) * DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DOP_GEAR_RATIO * DOP_MOTOR_RPM_TO_PWM_DC_FACTOR + DOP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
-#define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)         ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 4000.0 )
+#define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)         ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 4000.0F )
 
 #define PUMP_DIR_ERROR_COUNT_MASK                0x3F           ///< Bit mask for pump direction error counter.
 #define DATA_PUBLISH_COUNTER_START_COUNT         40             ///< Data publish counter start count.