Index: Common.h =================================================================== diff -u -re8ecb7368ebfeb64b8664a06ead7968d408dcba2 -r4419915f36401435db029feebcac40a7d5e07b2d --- Common.h (.../Common.h) (revision e8ecb7368ebfeb64b8664a06ead7968d408dcba2) +++ Common.h (.../Common.h) (revision 4419915f36401435db029feebcac40a7d5e07b2d) @@ -456,7 +456,7 @@ /// DG institutional values structure. typedef struct { - 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. } DG_INSTITUTIONAL_VALUES_T; Index: NVDataMgmt.c =================================================================== diff -u -r43ddd7ecafbcf173e276fa058a0af2897f055381 -r4419915f36401435db029feebcac40a7d5e07b2d --- NVDataMgmt.c (.../NVDataMgmt.c) (revision 43ddd7ecafbcf173e276fa058a0af2897f055381) +++ NVDataMgmt.c (.../NVDataMgmt.c) (revision 4419915f36401435db029feebcac40a7d5e07b2d) @@ -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, Index: NVDataMgmt.h =================================================================== diff -u -re8ecb7368ebfeb64b8664a06ead7968d408dcba2 -r4419915f36401435db029feebcac40a7d5e07b2d --- NVDataMgmt.h (.../NVDataMgmt.h) (revision e8ecb7368ebfeb64b8664a06ead7968d408dcba2) +++ NVDataMgmt.h (.../NVDataMgmt.h) (revision 4419915f36401435db029feebcac40a7d5e07b2d) @@ -148,8 +148,8 @@ BOOL setTxTimeHours( F32 hours ); BOOL setTxLastStartTimeEpoch( U32 epoch ); BOOL isChemDisinfectEnabledInInstitRecord( void ); -F32 getMaxRORejectionRatioInInstitRecord( void ); -F32 getMinInletWaterConductivityLimitInstitRecord( void ); +U32 getMinRORejectionRatioInInstitRecordPCT( void ); +F32 getMinInletWaterConductivityLimitInstitRecordUSPCM( void ); #endif BOOL setServiceTime( void ); Index: NVDataMgmtHDRecords.h =================================================================== diff -u -re8ecb7368ebfeb64b8664a06ead7968d408dcba2 -r4419915f36401435db029feebcac40a7d5e07b2d --- NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision e8ecb7368ebfeb64b8664a06ead7968d408dcba2) +++ NVDataMgmtHDRecords.h (.../NVDataMgmtHDRecords.h) (revision 4419915f36401435db029feebcac40a7d5e07b2d) @@ -294,7 +294,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. U32 calibrationTime; ///< Calibration time in epoch. U16 crc; ///< CRC of the institutional record.