Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -ra7a7874f47ccddc122af67273851881477880ff9 -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision a7a7874f47ccddc122af67273851881477880ff9) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) @@ -8,7 +8,7 @@ * @file DrainPump.c * * @author (last) Dara Navaei -* @date (last) 20-Apr-2022 +* @date (last) 28-Aug-2022 * * @author (original) Sean * @date (original) 08-Apr-2020 @@ -34,9 +34,6 @@ #include "TaskPriority.h" #include "Timers.h" #include "Valves.h" -#ifdef EMC_TEST_BUILD -#include "Heaters.h" -#endif /** * @addtogroup DrainPump @@ -58,7 +55,7 @@ FLOAT_TO_INT_ROUNDUP_OFFSET ) ///< RPM to DAC conversion equation. #define TOGGLE_PERIOD_RESOLUTION_SECONDS 0.000005F ///< Toggle period to resolution in seconds. -#define ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION 4 ///< Rotational to toggle period conversion coefficient. +#define ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION 4.0F ///< Rotational to toggle period conversion coefficient. #define DRAIN_PUMP_P_COEFFICIENT 0.5F ///< P term for drain pump delta pressure control. #define DRAIN_PUMP_I_COEFFICIENT 1.0F ///< I term for drain pump delta pressure control. @@ -123,7 +120,7 @@ static DG_DRAIN_PUMP_CAL_RECORD_T drainPumpCalRecord; ///< Drain pump calibration record. /// ADC to RPM conversion coefficient or RPM to ADC conversion. -static const F32 CONVERSION_COEFF = SEC_PER_MIN / ( 2 * TOGGLE_PERIOD_RESOLUTION_SECONDS * ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION ); +static const F32 CONVERSION_COEFF = (F32) SEC_PER_MIN / ( 2.0F * TOGGLE_PERIOD_RESOLUTION_SECONDS * ROTATIONAL_TO_TOGGLE_PERIOD_CONVERSION ); // ********** private function prototypes **********