Index: sources/drydemo/DryDemoDefines.h =================================================================== diff -u -r3a1edf1c2dc6f68d32af3adeeee4a59bbac739c5 -r7094c1e2387d63fc7fb9d6d9a09ea0aee3c71420 --- sources/drydemo/DryDemoDefines.h (.../DryDemoDefines.h) (revision 3a1edf1c2dc6f68d32af3adeeee4a59bbac739c5) +++ sources/drydemo/DryDemoDefines.h (.../DryDemoDefines.h) (revision 7094c1e2387d63fc7fb9d6d9a09ea0aee3c71420) @@ -26,7 +26,6 @@ #define NUM_OF_COUNTS_TIMER_BC_EMIT (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS) #define NUN_OF_COUNTS_QART_BC_EMIT (PRORGESS_TIME_BC_QART_INT_MS / QOBJECT_TIMER_TIMEOUT_MS) #define NUM_OF_COUNTS_TIMER_2_CONTROL (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS) -#define NUM_OF_COUNTS_TO_BC_MSG 3 // TODO remove // Treatment params #define MIN_DIAL_RATE_MLPM 50 @@ -120,18 +119,22 @@ #define RECIRC_WARN_BEFORE_TIMEOUT_MIN 10 // Alarms -#define ALARM_TABLE_PRIORITY_INDEX 0 -#define ALARM_TABLE_PROPERTIES_INDEX 1 -#define ALARM_TABLE_TX_PAUSE_INDEX 2 -#define ALARM_TRANS_TO_TX_PAUSE 1 -#define ALARM_NOT_TRANS_TO_TX_PAUSE 0 -#define TRIG_LOW_VEN_ALARM_TIMEOUT_MS (5 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) -#define ALARM_NO_ALARM_PROPERTIES 0 -#define ALARM_STOP_TX_PROPERTIES 6 -#define ALARM_REPLACE_ACID_PROPERTIES 112 -#define ALARM_RECIRC_WARN_PROPERTIES 112 -#define ALARM_RECIR_TIMEOUT_RPOPERTIES 26 -#define ALARM_LOW_VENOUS_PROPERTIES 2 +#define ALARM_TABLE_PRIORITY_INDEX 0 +#define ALARM_TABLE_PROPERTIES_INDEX 1 +#define ALARM_TABLE_TX_PAUSE_INDEX 2 +#define ALARM_TRANS_TO_TX_PAUSE 1 +#define ALARM_NOT_TRANS_TO_TX_PAUSE 0 +#define TRIG_LOW_VEN_ALARM_TIMEOUT_MS (3 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) +#define CLEAR_DIAL_PROPOR_TIMEOUT_MS (10 * MILLISECONDS_PER_SECOND) +#define ALARM_NO_ALARM_PROPERTIES 0 +#define ALARM_STOP_TX_PROPERTIES 6 +#define ALARM_REPLACE_ACID_PROPERTIES 112 +#define ALARM_RECIRC_WARN_PROPERTIES 112 +#define ALARM_RECIR_TIMEOUT_RPOPERTIES 26 +#define ALARM_LOW_VENOUS_PROPERTIES 2 +#define ALARM_RECIRC_WARN_PROPERTIES 112 +#define ALARM_REPLACE_BICARB_PROPERTIES 112 +#define ALARM_DIAL_PROPOR_PROPERTIES 10 enum User_Command_ID { CMD_NONE = -1, @@ -223,6 +226,16 @@ TREATMENT_END_FLUID_BOLUS_STATE = 2, }; +enum Treatment_Pause_Sequential_Alarms { + SEQ_ALARM_NO_ALARM = 0, + SEQ_ALARM_TRIGGER_RPLC_ACID = 1, + SEQ_ALARM_TRIGGER_RPLC_BICARB = 2, + SEQ_ALARM_PROCESS_DRAIN_SCREEN = 3, + SEQ_ALARM_DRY_BICARB_CARTRIDGE = 4, + SEQ_ALARM_PROPORTIONING_IN_PROG = 5, + SEQ_ALARM_LOW_VENOUS = 6, +}; + // Pressure limits enum Pressure_Limits_States { PRESSURE_LIMITS_STATE_OFF = 0, @@ -266,12 +279,15 @@ }; enum Alarm_List { - ALARM_ID_NO_ALARM = 0, - ALARM_ID_TD_VENOUS_PRESSURE_LOW = 47, - ALARM_ID_TD_REPLACE_ACID_JUG = 88, - ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96, - ALARM_ID_TD_RECIRC_TIMEOUT_WARNING = 199, - ALARM_ID_TD_RECIRC_TIMEOUT = 200, + ALARM_ID_NO_ALARM = 0, + ALARM_ID_TD_VENOUS_PRESSURE_LOW = 47, + ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96, + ALARM_ID_TD_RECIRC_TIMEOUT_WARNING = 199, + ALARM_ID_TD_RECIRC_TIMEOUT = 200, + ALARM_ID_DD_BICARBONATE_CARTRIDGE_LOW_LEVEL = 244, + ALARM_ID_DD_REPLACE_BICARB_CARTRIDGE = 248, + ALARM_ID_DD_REPLACE_ACID_CONCENTRATE = 249, + ALARM_ID_TD_DIALYSATE_PROPORTIONING_IN_PROGRESS = 250, }; enum Generic_Confirm_Id {