Index: AlarmDefs.h =================================================================== diff -u -rf3a8273b4f037e77350fd94d956a3f278bac526e -re87512aa721eae9ffdb1d3920a3572595dabb4fd --- AlarmDefs.h (.../AlarmDefs.h) (revision f3a8273b4f037e77350fd94d956a3f278bac526e) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e87512aa721eae9ffdb1d3920a3572595dabb4fd) @@ -8,7 +8,7 @@ * @file AlarmDefs.h * * @author (last) Sean Nash -* @date (last) 07-Mar-2023 +* @date (last) 15-Mar-2023 * * @author (original) Sean * @date (original) 11-Feb-2020 @@ -635,7 +635,7 @@ { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_INLET_WATER_PRESSURE_IN_LOW_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 36, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_COMPLETED_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NEW_DG_OPERATION_MODE_MESSAGE_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, @@ -700,7 +700,7 @@ { ALARM_PRIORITY_MEDIUM, 802, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_PRIME_COMPLETED_MEDIUM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, @@ -710,7 +710,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 803, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_BY_USER, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_LOW, 904, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_WARNING, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 904, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_END_OF_TREATMENT_WARNING, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 905, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_OUT_OF_TIME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_PRIME_SALINE_PURGE_AIR_TIME_OUT, 0, ALARM_ID_NO_ALARM }, Index: HDDefs.h =================================================================== diff -u -r2114d3eef5009ab52c4c49a1d75a1130be2eaa91 -re87512aa721eae9ffdb1d3920a3572595dabb4fd --- HDDefs.h (.../HDDefs.h) (revision 2114d3eef5009ab52c4c49a1d75a1130be2eaa91) +++ HDDefs.h (.../HDDefs.h) (revision e87512aa721eae9ffdb1d3920a3572595dabb4fd) @@ -7,8 +7,8 @@ * * @file HDDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 07-Feb-2023 +* @author (last) Sean Nash +* @date (last) 13-Mar-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -750,6 +750,8 @@ HD_EVENT_SUB_STATE_CHANGE, ///< HD Op sub-state change event HD_EVENT_SYRINGE_PUMP_STATE, ///< HD syringe pump state change event HD_EVENT_OCCLUSION_BASELINE, ///< HD event occlusion baseline event + HD_EVENT_RSRVR_UF_VOLUME_AND_TIME, ///< HD ultrafiltration volume and time for a reservoir use + HD_EVENT_RSRVR_UF_RATE, ///< HD ultrafiltration measured and expected rates NUM_OF_EVENT_IDS ///< Total number of HD events }; typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration @@ -781,6 +783,7 @@ GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL, ///< Chemical disinfect stop user confirmation GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH, ///< Chemical disinfect flush stop user confirmation GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL, ///< Chemical disinfect sample flush pass/fail + GENERIC_CONFIRM_ID_TREATMENT_END, ///< End treatment user confirmation NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs }; typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration