Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rc548570b37339819da825092dd07c7081437f30b -rc48a99d2d1c852adcc986253b6c420a90dab7bfe --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision c548570b37339819da825092dd07c7081437f30b) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision c48a99d2d1c852adcc986253b6c420a90dab7bfe) @@ -85,8 +85,8 @@ static OVERRIDE_U32_T roPumpDataPublishInterval = { 0, 0, 0, 0 }; ///< interval (in ms) at which to publish RO flow data to CAN bus. static OVERRIDE_U32_T targetROPumpPressure = { 0, 0, 0, 0 }; ///< Target RO pressure (in PSI). -static OVERRIDE_F32_T measuredROPumpPressure = { 0.0, 0.0, 0.0, 0 }; ///< measured RO pressure (in PSI). static OVERRIDE_F32_T measuredROFlowRateLPM = { 0.0, 0.0, 0.0, 0 }; ///< measured RO flow rate (in LPM). +static F32 measuredROPumpPressure = 0.0; ///< measured RO pressure (in PSI). static U32 roControlTimerCounter = 0; ///< determines when to perform control on ro pump @@ -185,20 +185,19 @@ void execROPumpMonitor( void ) { S32 roFlow = (S32)getFPGAROPumpFlowRate(); - F32 roPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); measuredROFlowRateLPM.data = (F32)(roFlow) * RO_FLOW_ADC_TO_LPM_FACTOR; - measuredROPumpPressure.data = (F32)((S16)roPressure); + measuredROPumpPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); // check RO flow // TODO - check flow // check pressure while RO pump is on if ( TRUE == isROPumpOn ) { - if ( roPressure < MIN_RO_PRESSURE || roPressure > MAX_RO_PRESSURE ) + if ( measuredROPumpPressure < MIN_RO_PRESSURE || measuredROPumpPressure > MAX_RO_PRESSURE ) { - SET_ALARM_WITH_1_F32_DATA( ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE, roPressure ) // TODO - add persistence + SET_ALARM_WITH_1_F32_DATA( ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE, measuredROPumpPressure ) // TODO - add persistence } } @@ -290,7 +289,7 @@ if ( roPumpControlModeSet == PUMP_CONTROL_MODE_CLOSED_LOOP ) { F32 tgtPres = (F32)getTargetROPumpPressure(); - F32 actPres = getMeasuredROPumpPressure(); + F32 actPres = measuredROPumpPressure; F32 newPWM; newPWM = runPIController( PI_CONTROLLER_ID_RO_PUMP, tgtPres, actPres ); @@ -387,28 +386,6 @@ /*********************************************************************//** * @brief - * The getMeasuredROPumpPressure function gets the measured RO pump \n - * pressure. - * @details - * Inputs : measuredROPumpPressure - * Outputs : none - * @param none - * @return the current RO pressure (in PSI). - *************************************************************************/ -F32 getMeasuredROPumpPressure( void ) -{ - F32 result = measuredROPumpPressure.data; - - if ( OVERRIDE_KEY == measuredROPumpPressure.override ) - { - result = measuredROPumpPressure.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief * The getMeasuredROFlowRate function gets the measured RO pump \n * flow rate. * @details