Index: firmware/App/Controllers/FlowSensors.c =================================================================== diff -u -r4e258399f9732bf6d36c89115fd96bf7a62834d1 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 4e258399f9732bf6d36c89115fd96bf7a62834d1) +++ firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2022-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2022-2024 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 FlowSensors.c * -* @author (last) Dara Navaei -* @date (last) 20-May-2023 +* @author (last) Sean Nash +* @date (last) 22-Sep-2023 * * @author (original) Dara Navaei * @date (original) 21-Jul-2022 @@ -144,8 +144,8 @@ flowSensorStatus[ i ].measuredFlowBeforeCalLPM.data = oldest2CurrentEdgeDiff * FLOW_SENSORS_LITERS_PER_PULSES * SEC_PER_MIN; flowSensorStatus[ i ].measuredROFlowWithCPsLPM.data = getCalibrationAppliedFlowLPM( i, flowSensorStatus[ i ].measuredFlowBeforeCalLPM.data ); measFlow = flowSensorStatus[ i ].measuredROFlowWithCPsLPM.data - - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) - - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER ); + ( getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) - + ( getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER ); flowSensorStatus[ i ].measuredFlowLPM.data = MAX( measFlow, 0.0F ); break; @@ -284,7 +284,7 @@ * flow sensors data publish interval. * @details Inputs: none * @details Outputs: flowSensorsDataPublishInterval - * @param: value override flow data publish interval with (in ms) + * @param value override flow data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetFlowDataPublishIntervalOverride( U32 value ) @@ -330,9 +330,9 @@ * flow rate. * @details Inputs: none * @details Outputs: flowSensorStatus - * @param: sensorId the Id of the sensor which its value is overridden. - * @param: value override measured flow rate in LPM - * @param: raw override pre-calibrated, raw value, or post-calibrated values. + * @param sensorId the Id of the sensor which its value is overridden. + * @param value override measured flow rate in LPM + * @param raw override pre-calibrated, raw value, or post-calibrated values. * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetMeasuredFlowRateOverride( U32 sensorId, F32 flowLPM, BOOL raw ) @@ -369,7 +369,7 @@ * of the measured flow rate. * @details Inputs: none * @details Outputs: flowSensorStatus - * @param: sensorId the Id of the sensor which its value is reset. + * @param sensorId the Id of the sensor which its value is reset. * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testResetMeasuredFlowRateOverride( U32 sensorId )