Index: firmware/App/Controllers/ConductivitySensors.h =================================================================== diff -u -rdf0a0b9ce1414b00b381e516714f9089d8e4ae21 -re6f3a632890f96a5aa282922d11df148bdd06587 --- firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision df0a0b9ce1414b00b381e516714f9089d8e4ae21) +++ firmware/App/Controllers/ConductivitySensors.h (.../ConductivitySensors.h) (revision e6f3a632890f96a5aa282922d11df148bdd06587) @@ -32,6 +32,17 @@ // ********** public definitions ********** +#define MIN_ACID_CONCENTRATE_CONDUCTIVITY 11000 ///< Minimum conductivity for acid concentrate. +#define MAX_ACID_CONCENTRATE_CONDUCTIVITY 11850 ///< Maximum conductivity for acid concentrate. + +#define MIN_BICARB_CONCENTRATE_CONDUCTIVITY 2000 ///< Minimum conductivity for bicarbonate concentrate. +#define MAX_BICARB_CONCENTRATE_CONDUCTIVITY 3000 ///< Maximum conductivity for bicarbonate concentrate. + +///< Minimum conductivity value for dialysate solution. +#define MIN_DIALYSATE_CONDUCTIVITY ( MIN_ACID_CONCENTRATE_CONDUCTIVITY + MIN_BICARB_CONCENTRATE_CONDUCTIVITY ) +///< Maximum conductivity value for dialysate solution. +#define MAX_DIALYSATE_CONDUCTIVITY ( MAX_ACID_CONCENTRATE_CONDUCTIVITY + MAX_BICARB_CONCENTRATE_CONDUCTIVITY ) + /// Enumeration of conductivity sensors. typedef enum ConductivitySensors { @@ -62,10 +73,6 @@ void checkInletWaterConductivity( void ); void checkRORejectionRatio( void ); -BOOL isAcidConductivityInRange( void ); -BOOL isBicarbConductivityInRange( void ); -BOOL isDialysateConductivityInRange( void ); - F32 getConductivityValue( U32 sensorId ); BOOL testSetConductivityOverride( U32 sensorId, F32 value );