Index: AlarmDefs.h =================================================================== diff -u -r602bee35fe4e9947633785af91fef3f95f230a6d -rb0bfee161ca5f77cb3dfe82f5ad6509c3916c4dc --- AlarmDefs.h (.../AlarmDefs.h) (revision 602bee35fe4e9947633785af91fef3f95f230a6d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision b0bfee161ca5f77cb3dfe82f5ad6509c3916c4dc) @@ -122,17 +122,17 @@ ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84, ///< HD venous pressure sensor not being read ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 85, ///< HD venous pressure sensor temperature out of range error ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86, ///< HD BP occlusion sensor not being read - ALARM_ID____AVAILABLE_10 = 87, ///< HD DPi occlusion sensor not being read - ALARM_ID____AVAILABLE_11 = 88, ///< HD DPo occlusion sensor not being read + ALARM_ID____AVAILABLE_10 = 87, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_11 = 88, ///< This alarm ID is available for use ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error - ALARM_ID____AVAILABLE_12 = 90, ///< HD DPi occlusion sensor error - ALARM_ID____AVAILABLE_13 = 91, ///< HD DPo occlusion sensor error - ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92, ///< HD blood flow sensor not being read TODO remove this alarm when FMB fully removed - ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93, ///< HD blood flow sensor error TODO remove this alarm when FMB fully removed - ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94, ///< HD dialysate flow sensor not being read TODO remove this alarm when FMD fully removed - ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 95, ///< HD dialysate flow sensor error TODO remove this alarm when FMD fully removed - ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 96, ///< HD blood flow sensor not being read - slow packet TODO remove this alarm when FMB fully removed - ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 97, ///< HD dialysate flow sensor not being read - slow packet TODO remove this alarm when FMD fully removed + ALARM_ID____AVAILABLE_12 = 90, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_13 = 91, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_14 = 92, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_15 = 93, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_16 = 94, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_17 = 95, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_18 = 96, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_19 = 97, ///< This alarm ID is available for use ALARM_ID_HD_BATTERY_COMM_FAULT = 98, ///< HD battery communication fault ALARM_ID_HD_SYRINGE_PUMP_STALL = 99, ///< HD syringe pump stall alarm ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100, ///< HD no cartridge self-test timeout @@ -537,12 +537,12 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DP_FLOW_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_14, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_15, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_16, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_17, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_18, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_19, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BATTERY_COMM_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_STALL, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To @@ -669,7 +669,7 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , 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, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 901, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIALYSATE_TEMPERATURE_HIGH, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, @@ -851,12 +851,12 @@ { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, { 3, ALARM_ID____AVAILABLE_12 }, { 3, ALARM_ID____AVAILABLE_13 }, - { 3, ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_BP_FLOW_SENSOR_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_SENSOR_ERROR }, - { 3, ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR }, + { 3, ALARM_ID____AVAILABLE_14 }, + { 3, ALARM_ID____AVAILABLE_15 }, + { 3, ALARM_ID____AVAILABLE_16 }, + { 3, ALARM_ID____AVAILABLE_17 }, + { 3, ALARM_ID____AVAILABLE_18 }, + { 3, ALARM_ID____AVAILABLE_19 }, { 3, ALARM_ID_HD_BATTERY_COMM_FAULT }, { 3, ALARM_ID_HD_SYRINGE_PUMP_STALL }, { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT }, @@ -989,6 +989,7 @@ { 799, ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT }, { 799, ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, + { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 800, ALARM_ID_BLOOD_SITTING_WARNING }, { 801, ALARM_ID_END_OF_TREATMENT_ALARM }, { 802, ALARM_ID_PRIME_COMPLETED_MEDIUM }, @@ -997,7 +998,6 @@ { 899, ALARM_ID_END_TREATMENT_TIMEOUT_ALARM }, { 899, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE }, { 899, ALARM_ID_HD_SYRINGE_DETECTED }, - { 899, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, { 899, ALARM_ID_HD_BATTERY_PACK_CHARGE_TOO_LOW }, { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING }, Index: MsgDefs.h =================================================================== diff -u -r0efc49e171561e371f452f470c8380f7915e881b -rb0bfee161ca5f77cb3dfe82f5ad6509c3916c4dc --- MsgDefs.h (.../MsgDefs.h) (revision 0efc49e171561e371f452f470c8380f7915e881b) +++ MsgDefs.h (.../MsgDefs.h) (revision b0bfee161ca5f77cb3dfe82f5ad6509c3916c4dc) @@ -256,8 +256,8 @@ MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE = 0x8032, ///< HD air trap data broadcast interval override request MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033, ///< HD air trap level sensor override request MSG_ID_HD_SOFTWARE_RESET_REQUEST = 0x8034, ///< HD reset request - MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE = 0x8035, ///< Blood flow signal strength override request - MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE = 0x8036, ///< Dialysate flow signal strength override request + MSG_ID___AVAILABLE_3 = 0x8035, ///< This message ID is available for use + MSG_ID___AVAILABLE_4 = 0x8036, ///< This message ID is available for use MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037, ///< Blood pump home command MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038, ///< Dialysate inlet pump home command MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039, ///< Dialysate outlet pump home command @@ -299,7 +299,7 @@ MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0x805E, ///< HD air bubble detector status override request MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x805F, ///< HD blood prime volume override request MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0x8060, ///< HD air bubble detector self-test request - MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE = 0x8061, ///< HD blood prime safety volume override request + MSG_ID___AVAILABLE_1 = 0x8061, ///< This message ID is available for use MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062, ///< HD switches status override request MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request @@ -308,7 +308,7 @@ MSG_ID_HD_FANS_PUBLISH_INTERVAL_OVERRIDE = 0x8067, ///< HD fans data publish override request MSG_ID_HD_FANS_RPM_OVERRIDE = 0x8068, ///< HD fans RPM override request MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE = 0x8069, ///< HD rinseback volume override request - MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE = 0x806A, ///< HD rinseback safety volume override request + MSG_ID___AVAILABLE_2 = 0x806A, ///< This message ID is available for use MSG_ID_HD_ALARM_STATUS_PUBLISH_INTERVAL_OVERRIDE = 0x806B, ///< HD alarm status publish interval override request MSG_ID_HD_TREATMENT_TIME_DATA_PUBLISH_INTERVAL_OVERRIDE = 0x806C, ///< HD treatment time data publish interval override request MSG_ID_HD_TREATMENT_RANGES_PUBLISH_INTERVAL_OVERRIDE = 0x806D, ///< HD treatment param adjustment ranges publish interval override request