Index: firmware/App/Modes/Prime.c =================================================================== diff -u -r9a9770851a76fde14c967fcc8d492e6909595e6b -r8c93220d5ff830eeb95d683f67c5bc9a988bf315 --- firmware/App/Modes/Prime.c (.../Prime.c) (revision 9a9770851a76fde14c967fcc8d492e6909595e6b) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision 8c93220d5ff830eeb95d683f67c5bc9a988bf315) @@ -56,7 +56,9 @@ #define LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME ( 1 * MS_PER_SECOND ) ///< Time load cell reading steady state detection sampling time in seconds. //#define PRIME_DIALYSATE_DIALYZER_TIME_LIMIT ( 120 * MS_PER_SECOND ) ///< Time limit for priming dialysate dialyzer circuit. #define PRIME_DIALYSATE_BYPASS_TIME_LIMIT ( 15 * MS_PER_SECOND ) ///< Time limit for priming dialysate bypass circuit. -#define PRIME_SALINE_DIALYZER_TIME_LIMIT ( 7 * MS_PER_SECOND ) ///< Time limit for priming saline dialyzer path. +#define PRIME_SALINE_DIALYZER_BLOOD_VOLUME_ML 120 ///< The volume of the blood channel in mL. +#define PRIME_SALINE_DIALYZER_TIME_SEC ( ( PRIME_SALINE_DIALYZER_BLOOD_VOLUME_ML * SEC_PER_MIN ) / BLOOD_PUMP_FLOW_RATE_SALINE_DIALYZER_ML_MIN ) ///< Time for priming saline dialyzer path. +#define PRIME_SALINE_DIALYZER_TIME_LIMIT ( PRIME_SALINE_DIALYZER_TIME_SEC * MS_PER_SECOND ) ///< Time limit for priming saline dialyzer path. /// States of the treatment reservoir management state machine. typedef enum PrimeReservoirMgmt_States @@ -277,6 +279,7 @@ F32 getDialyzerBloodVolume( void ) { U32 dialyzerType = getTreatmentParameterU32( TREATMENT_PARAM_DIALYZER_TYPE ); + return dialyzerVolumeTable[ dialyzerType ].bloodVolume; } @@ -291,6 +294,7 @@ F32 getDialyzerDialysateVolume( void ) { U32 dialyzerType = getTreatmentParameterU32( TREATMENT_PARAM_DIALYZER_TYPE ); + return dialyzerVolumeTable[ dialyzerType ].dialysateVolume; }