Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -r6a348c6ca6ace52afa68d680422c2714251cf84e -r7fe065949ae95d4151a6075ff2522a707b42784c --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 6a348c6ca6ace52afa68d680422c2714251cf84e) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 7fe065949ae95d4151a6075ff2522a707b42784c) @@ -43,8 +43,7 @@ #define NO_HEPARIN_TYPE_SET 0xFFFFFFFF ///< UI will send this value for Heparin type if Heparin not used #define INSTIT_CHEM_DISINFECT_ENABLE_RANGE 1 ///< Institutional record chemical disinfect enable/disable allowable range -#define INSTIT_MAX_RO_REJECTION_RATIO_MIN 0.0F ///< Institutional record max RO rejection ratio minimum -#define INSTIT_MAX_RO_REJECTION_RATIO_MAX 1.0F ///< Institutional record max RO rejection ratio maximum +#define INSTIT_MIN_RO_REJECTION_RATIO_MAX_PCT 99 ///< Institutional record min RO rejection ratio maximum in percent. #define INSTIT_MAX_INLET_WATER_COND_ALARM_USPCM 300.0F ///< Institutional record max inlet water conductivity alarm in uS/cm. /// Record for range and default of treatment parameters. @@ -1029,8 +1028,8 @@ ( nvInstRcrd->maxHeparinBolusVolumeML <= TREAT_PARAMS_PROPERTIES[ TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME ].max.sFlt ) ? TRUE : FALSE ); result &= ( ( nvInstRcrd->minHeparinBolusVolumeML <= nvInstRcrd->maxHeparinBolusVolumeML ) ? TRUE : FALSE ); result &= ( ( nvInstRcrd->enableChemicalDisinfect <= INSTIT_CHEM_DISINFECT_ENABLE_RANGE ) ? TRUE : FALSE ); - result &= ( ( nvInstRcrd->maxRORejectionRatio >= INSTIT_MAX_RO_REJECTION_RATIO_MIN ) && - ( nvInstRcrd->maxRORejectionRatio <= INSTIT_MAX_RO_REJECTION_RATIO_MAX ) ? TRUE : FALSE ); + // NOTE: min RO rejection ratio is not needed to be >= 0 because it is a U32 + result &= ( ( nvInstRcrd->minRORejectionRatioPCT <= INSTIT_MIN_RO_REJECTION_RATIO_MAX_PCT ) ? TRUE : FALSE ); result &= ( ( nvInstRcrd->minInletWaterCondAlarmLimitUSPCM >= 0.0F ) && ( nvInstRcrd->minInletWaterCondAlarmLimitUSPCM <= INSTIT_MAX_INLET_WATER_COND_ALARM_USPCM ) ? TRUE : FALSE ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r6a348c6ca6ace52afa68d680422c2714251cf84e -r7fe065949ae95d4151a6075ff2522a707b42784c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6a348c6ca6ace52afa68d680422c2714251cf84e) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7fe065949ae95d4151a6075ff2522a707b42784c) @@ -93,7 +93,7 @@ F32 minHeparinBolusVolumeML; ///< Min heparin bolus volume in mL. F32 maxHeparinBolusVolumeML; ///< Max heparin bolus volume in mL. U32 enableChemicalDisinfect; ///< Enable/disable chemical disinfect. - F32 maxRORejectionRatio; ///< Max RO rejection ratio. + U32 minRORejectionRatioPCT; ///< Min RO rejection ratio in percent. F32 minInletWaterCondAlarmLimitUSPCM; ///< Min inlet water conductivity alarm limit in uS/cm. } HD_INSTITUTIONAL_LOCAL_RECORD_T; @@ -3776,8 +3776,8 @@ MESSAGE_T msg; DG_INSTITUTIONAL_VALUES_T dgInstitValues; - dgInstitValues.maxRORejectionRatio = getMaxRORejectionRatioInInstitRecord(); - dgInstitValues.minInletWaterCondAlarmLimitUSPCM = getMinInletWaterConductivityLimitInstitRecord(); + dgInstitValues.minRORejectionRatioPCT = getMinRORejectionRatioInInstitRecordPCT(); + dgInstitValues.minInletWaterCondAlarmLimitUSPCM = getMinInletWaterConductivityLimitInstitRecordUSPCM(); // Create a message record blankMessage( &msg );