Index: firmware/App/Controllers/ConductivitySensors.h =================================================================== diff -u -r5109bb981cab2025fcb9de33e303d046085efa18 -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 5109bb981cab2025fcb9de33e303d046085efa18) +++ firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -100,9 +100,6 @@ BOOL testSetConductivityOverride( U32 sensorId, F32 value ); BOOL testResetConductivityOverride( U32 sensorId ); -BOOL testSetRawConductivityOverride( U32 sensorId, F32 value ); -BOOL testResetRawConductivityOverride( U32 sensorId ); - BOOL testSetConductivityDataPublishIntervalOverride( U32 interval_ms ); BOOL testResetConductivityDataPublishIntervalOverride( void ); BOOL testSetConductivitySensorCalibrationTable( CONDUCTIVITY_SENSOR_CAL_TABLE_T* data ); Index: firmware/App/Controllers/FlowSensors.c =================================================================== diff -u -r8ebab816fadec93b2f3c6a42f15a07c26b3a4f59 -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 8ebab816fadec93b2f3c6a42f15a07c26b3a4f59) +++ firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -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 ) Index: firmware/App/Controllers/FluidLeak.c =================================================================== diff -u -rfc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6 -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision fc78b1e5af6d7ab8f7656b410c4cacdfd76a49e6) +++ firmware/App/Controllers/FluidLeak.c (.../FluidLeak.c) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -113,7 +113,6 @@ * leak detector. * @details Inputs: fluidLeakState * @details Outputs: none - * @param none * @return the current fluid leak state. *************************************************************************/ FLUID_LEAK_STATES_T getFluidLeakState( void ) @@ -208,7 +207,6 @@ * of the fluid leak detector. * @details Inputs: none * @details Outputs: fluidLeakState - * @param none * @param state override fluid leak detector with this * @return TRUE if override successful, FALSE if not *************************************************************************/ @@ -235,7 +233,6 @@ * fluid leak detector. * @details Inputs: none * @details Outputs: fluidLeakState - * @param none * @return TRUE if reset successful, FALSE if not *************************************************************************/ BOOL testResetFluidLeakStateOverride( void ) Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 9b8889b096ae02246e939468fc843f467de8c6bb) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -315,7 +315,7 @@ * roPumpPWMDutyCyclePctSet, roPumpControlMode * @details Outputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct, * roPumpPWMDutyCyclePctSet, roPumpControlMode - * @param: duty which is the duty cycle + * @param duty which is the duty cycle * @return none *************************************************************************/ BOOL setROPumpTargetDutyCycle( F32 duty ) @@ -932,7 +932,7 @@ * RO pump data publish interval. * @details Inputs: roPumpDataPublishInterval * @details Outputs: roPumpDataPublishInterval - * @param: value : override RO pump data publish interval with (in ms) + * @param value : override RO pump data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetROPumpDataPublishIntervalOverride( U32 value ) Index: firmware/App/Controllers/ROPump.h =================================================================== diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision 9b8889b096ae02246e939468fc843f467de8c6bb) +++ firmware/App/Controllers/ROPump.h (.../ROPump.h) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -31,6 +31,7 @@ */ // ********** public definitions ********** + #define MAX_RO_FLOWRATE_LPM 1.8F ///< Maximum target RO flow rate in L/min. #define MIN_RO_FLOWRATE_LPM 0.0F ///< Minimum target RO flow rate in L/min. #define CLEANING_MODE_HIGH_TEMP_MAX_RO_PRESSURE_PSI 30 ///< Cleaning mode high temperature maximum RO pressure in psi. @@ -39,14 +40,14 @@ /// Enumerations of RO pump PI controller profiles. typedef enum { - RO_PI_FLOW_PROFILE_FLUSH = 0, - RO_PI_FLOW_PROFILE_GEN_IDLE, - RO_PI_FLOW_PROFILE_FILL, - RO_PI_FLOW_PROFILE_DRAIN, - RO_PI_FLOW_PROFILE_HEAT, - RO_PI_FLOW_PROFILE_OPEN_LOOP, - NUM_OF_RO_PI_FLOW_PROFILES, -}RO_PI_FLOW_PROFILES_T; + RO_PI_FLOW_PROFILE_FLUSH = 0, ///< RO pump control profile for flush mode + RO_PI_FLOW_PROFILE_GEN_IDLE, ///< RO pump control profile for generate idle mode + RO_PI_FLOW_PROFILE_FILL, ///< RO pump control profile for fill mode + RO_PI_FLOW_PROFILE_DRAIN, ///< RO pump control profile for drain mode + RO_PI_FLOW_PROFILE_HEAT, ///< RO pump control profile for heat disinfect mode + RO_PI_FLOW_PROFILE_OPEN_LOOP, ///< RO pump control profile for oppen loop control + NUM_OF_RO_PI_FLOW_PROFILES, ///< Number of RO pump control profiles +} RO_PI_FLOW_PROFILES_T; /// RO pump data struct. typedef struct Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rbd1f452097afa4da0f60f64ecc6b6aab0a341d8c -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision bd1f452097afa4da0f60f64ecc6b6aab0a341d8c) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -382,12 +382,11 @@ return status; } -/************************************************************************* +/*********************************************************************//** * @brief * The alarmUserNotify function activates Fault LED and Audio if FAULT exists. * @details Inputs: none * @details Outputs: LED and Audio control - * @param none * @return none *************************************************************************/ static void alarmUserNotify( void ) @@ -427,13 +426,12 @@ } } -/************************************************************************* +/*********************************************************************//** * @brief * The isTransitionToFaultRequired function checks whether the alarm management * should request a transition to fault mode immediately or it should be deferred * @details Inputs: none * @details Outputs: none - * @param none * @return TRUE if transition to fault is required otherwise, FALSE *************************************************************************/ static BOOL isTransitionToFaultRequired( void ) Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rbd1f452097afa4da0f60f64ecc6b6aab0a341d8c -rd2ec7bf847131ad0f044fc122aef360d726a2dc5 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision bd1f452097afa4da0f60f64ecc6b6aab0a341d8c) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision d2ec7bf847131ad0f044fc122aef360d726a2dc5) @@ -1224,7 +1224,7 @@ * @details Outputs: acidConcentrateCalRecord, bicarbConcentrateCalRecord * @param acid which is the acid dialysate mixing ratio * @param bicarb which is the bicarb dialysate mixing ratio - * @return TRUE if tare successful, FALSE if not + * @return TRUE if set successful, FALSE if not *************************************************************************/ BOOL testSetDialysateMixingRatios( F32 acid, F32 bicarb ) { @@ -1246,7 +1246,7 @@ * reservoir data publish interval. * @details Inputs: reservoirDataPublishInterval * @details Outputs: reservoirDataPublishInterval - * @param: value override reservoir data publish interval with (in ms) + * @param value override reservoir data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ BOOL testSetReservoirDataPublishIntervalOverride( U32 value )