Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rffef40f212d885498157395a1a3375542747a603 -r02d6de097fc53e769c4851a8f1f6438c5ff5e280 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision ffef40f212d885498157395a1a3375542747a603) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 02d6de097fc53e769c4851a8f1f6438c5ff5e280) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file DialInFlow.c * -* @author (last) Sean Nash -* @date (last) 13-Oct-2020 +* @author (last) H. Nguyen +* @date (last) 28-Oct-2021 * * @author (original) Sean * @date (original) 16-Dec-2019 @@ -108,8 +108,12 @@ ///< Macro converts a 12-bit ADC reading to a signed 16-bit value. #define SIGN_FROM_12_BIT_VALUE(v) ( (S16)(v) - (S16)DIAL_IN_PUMP_ADC_ZERO ) +#ifdef USE_FMD_FLOW_SENSOR /// Measured dialIn flow is filtered w/ moving average. -#define SIZE_OF_ROLLING_AVG ( ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) * DIP_CONTROL_INTERVAL_SEC ) +#define SIZE_OF_ROLLING_AVG ( ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) * DIP_CONTROL_INTERVAL_SEC ) +#else +#define SIZE_OF_ROLLING_AVG 10 +#endif #ifdef USE_FMD_FLOW_SENSOR /// Dialysate flow sensor signal strength low alarm persistence. @@ -486,7 +490,7 @@ dialInFlowSignalStrength.data = getFPGADialysateFlowSignalStrength(); #else - dipFlow = 0.0; // TODO - get dialysate flow from DG + dipFlow = getDGDialysateFlowRateMlMin(); // get dialysate flow from DG #endif adcDialInPumpMCSpeedRPM.data = (F32)(SIGN_FROM_12_BIT_VALUE(dipRPM)) * DIP_SPEED_ADC_TO_RPM_FACTOR;