Index: NVDataMgmt.c =================================================================== diff -u -r849c5711fd473b374e3062f567548a4f2a837ffc -rca5ecaa1b072a4737b6e280a35dfa935cdc160ba --- NVDataMgmt.c (.../NVDataMgmt.c) (revision 849c5711fd473b374e3062f567548a4f2a837ffc) +++ NVDataMgmt.c (.../NVDataMgmt.c) (revision ca5ecaa1b072a4737b6e280a35dfa935cdc160ba) @@ -131,7 +131,7 @@ #define DEFAULT_BLOOD_LEAK_SET_POINT 20 ///< Blood leak default set point. #define DEFAULT_HEPARIN_PUMP_VOLTAGE 0.15F ///< Heparin pump default voltage. #define DEFAULT_ENABLE_CHEM_DISINFECT 0 ///< Disable chemical disinfect in institutional record. -#define DEFAULT_MAX_RO_REJECTION_RATIO 0.1F ///< Max RO rejection ratio. +#define DEFAULT_MAX_RO_REJECTION_RATIO_PCT 90 ///< Max RO rejection ratio in percent. #define DEFAULT_MIN_INLET_WATER_COND_ALARM_US_P_CM 200.0F ///< Min inlet water conductivity alarm limit in uS/cm. #endif @@ -1550,17 +1550,15 @@ /*********************************************************************//** * @brief - * The getMaxRORejectionRatioInInstitRecord returns the value of the max RO - * rejection ratio in institutional record + * The getMinRORejectionRatioInInstitRecordPCT returns the value of the min RO + * rejection ratio in institutional record in percent * @details Inputs: hdInstitutionalGroup * Output: none - * @return the max RO rejection ratio in institutional record + * @return the min RO rejection ratio in institutional record in percent *************************************************************************/ -F32 getMaxRORejectionRatioInInstitRecord( void ) +U32 getMinRORejectionRatioInInstitRecordPCT( void ) { - F32 maxRORejectionRatio = hdInstitutionalGroup.hdInstitutionalRecord.maxRORejectionRatio; - - return maxRORejectionRatio; + return hdInstitutionalGroup.hdInstitutionalRecord.minRORejectionRatioPCT; } /*********************************************************************//** @@ -1571,11 +1569,9 @@ * Output: none * @return the inlet water conductivity alarm limit in uS/cm in institutional record *************************************************************************/ -F32 getMinInletWaterConductivityLimitInstitRecord( void ) +F32 getMinInletWaterConductivityLimitInstitRecordUSPCM( void ) { - F32 minInletWaterCondLimitUSPCM = hdInstitutionalGroup.hdInstitutionalRecord.minInletWaterCondAlarmLimitUSPCM; - - return minInletWaterCondLimitUSPCM; + return hdInstitutionalGroup.hdInstitutionalRecord.minInletWaterCondAlarmLimitUSPCM; } #endif #ifdef _DG_ @@ -3975,7 +3971,7 @@ hdInstitutionalGroup.hdInstitutionalRecord.minHeparinBolusVolumeML = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, TRUE ); hdInstitutionalGroup.hdInstitutionalRecord.maxHeparinBolusVolumeML = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, FALSE ); hdInstitutionalGroup.hdInstitutionalRecord.enableChemicalDisinfect = DEFAULT_ENABLE_CHEM_DISINFECT; - hdInstitutionalGroup.hdInstitutionalRecord.maxRORejectionRatio = DEFAULT_MAX_RO_REJECTION_RATIO; + hdInstitutionalGroup.hdInstitutionalRecord.minRORejectionRatioPCT = DEFAULT_MAX_RO_REJECTION_RATIO_PCT; hdInstitutionalGroup.hdInstitutionalRecord.minInletWaterCondAlarmLimitUSPCM = DEFAULT_MIN_INLET_WATER_COND_ALARM_US_P_CM; hdInstitutionalGroup.hdInstitutionalRecord.calibrationTime = getRTCTimestamp(); hdInstitutionalGroup.hdInstitutionalRecord.crc = crc16 ( (U08*)&hdInstitutionalGroup.hdInstitutionalRecord,