Index: sources/drydemo/DryDemoDefines.h =================================================================== diff -u -rb13dd2b30889640ebf03f54414f536ca5c8d2dc7 -rbf271a558491a83b39eb30748784f1b744736dd2 --- sources/drydemo/DryDemoDefines.h (.../DryDemoDefines.h) (revision b13dd2b30889640ebf03f54414f536ca5c8d2dc7) +++ sources/drydemo/DryDemoDefines.h (.../DryDemoDefines.h) (revision bf271a558491a83b39eb30748784f1b744736dd2) @@ -12,7 +12,7 @@ #define ACCEPT_VALUE 1 #define REJECT_VALUE 0 #define NEARLY_ZERO 0.00000001 -#define DEVICE_ID 1234 +#define ONE_HUNDRED_PCT 100 #define UI_CONFIRM_RESP_TIMOUT_MS (SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) #define RCVD_MSG_MSG_ID_INDEX 0 #define RCVD_MSG_SQNC_INDEX 1 @@ -54,9 +54,6 @@ #define DEF_TX_PARAM_VEN_PRES_LIMIT_ASYM_WIN_MMHG 20 #define DEF_TX_PARAM_DIA_TEMPERATURE_C 37.0 #define DEF_TX_PARAM_BLOOD_PRES_INTERVAL_MIN (30 * MINUTES_PER_HOUR * MILLISECONDS_PER_SECOND) -#define DEF_TX_SYSTOLIC_PRES 120 -#define DEF_TX_DIASTOLIC_PRES 80 -#define DEF_TX_HEART_BEAT 100 // Arterial /Venous limits & Baro #define DEF_BARO_PRES_PSI 14.2 @@ -74,52 +71,58 @@ #define PRES_LIMIT_STABE_TIME_MS (60 * MILLISECONDS_PER_SECOND) #define PRES_LIMIT_RESTABILIZE_TIME_MS (15 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) #define ART_PRES_LIMIT_WINDOW_MMHG 50 -#define VEN_PRES_LIMIT_WINDOW_MMHG 50 -#define VEN_PRES_LIMIT_ASYMM_MMHG 35 +#define VEN_PRES_HIGH_LIMIT_WINDOW_MMHG 50 +#define VEN_PRES_LOW_LIMIT_WINDOW_MMHG 35 #define TMP_PRES_LIMIT_WINDOW_MMHG 20 #define PRES_LIMIT_MIN_STABE_TIME_MS (PRES_LIMIT_STABE_TIME_MS - PRES_LIMIT_SHORT_STABE_TIME_MS) +// Vitals +#define DEF_TX_SYSTOLIC_PRES_MMHG 120 +#define DEF_TX_DIASTOLIC_PRES_MMHG 80 +#define DEF_TX_HEART_BEAT 100 +#define VITALS_MEAS_TIME_INT_INDEX 16 + // Initiate treatment -#define INITIATE_TREATMENT 1 -#define ALLOW_DIALYSATE_DELIVER 1 -#define BYPASS_DIALYSATE_DELIVER 0 -#define TRIGGER_STOP_ALARM_TIME_MS (2 * MILLISECONDS_PER_SECOND) +#define INITIATE_TREATMENT 1 +#define ALLOW_DIALYSATE_DELIVER 1 +#define BYPASS_DIALYSATE_DELIVER 0 +#define TRIGGER_STOP_ALARM_TIME_MS (2 * MILLISECONDS_PER_SECOND) // Treatment defines -#define BLOOD_PRIME_VOLUME_ML (106.6 + 40) -#define BLOOD_PRIME_START_FLOW_MLPM 250 -#define BLOOD_PRIME_FLOW_INTEGRATOR (1.0 / (SECONDS_PER_MINUTE * (MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS))) -#define BLOOD_PRIME_PAUSE_TIMEOUT_S (5 * SECONDS_PER_MINUTE) -#define BLOOD_PRIME_RESUME 1 +#define BLOOD_PRIME_VOLUME_ML (106.6 + 40) +#define BLOOD_PRIME_START_FLOW_MLPM 250 +#define BLOOD_PRIME_FLOW_INTEGRATOR (1.0 / (SECONDS_PER_MINUTE * (MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS))) +#define BLOOD_PRIME_PAUSE_TIMEOUT_S (5 * SECONDS_PER_MINUTE) +#define BLOOD_PRIME_RESUME 1 // Heparin substates -#define HEPARIN_OFF_SUBSTATE 0 -#define HEPARIN_PAUSED_SUBSTATE 2 -#define HEPARIN_DISPENSING_SUBSTATE 4 -#define HEPARIN_COMPLETED_SUBSTATE 5 +#define HEPARIN_OFF_SUBSTATE 0 +#define HEPARIN_PAUSED_SUBSTATE 2 +#define HEPARIN_DISPENSING_SUBSTATE 4 +#define HEPARIN_COMPLETED_SUBSTATE 5 // Ultrafiltration substates -#define UF_PAUSESD_STATE 0 -#define UF_RUNNING_STATE 1 +#define UF_PAUSESD_STATE 0 +#define UF_RUNNING_STATE 1 // Rinseback defines -#define RINSEBACK_FLOW_INTEGRATOR 1.0 / (SECONDS_PER_MINUTE * (MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS)) -#define RINSEBACK_MIN_FLOW_RATE_MLPM 100 -#define RINSEBACK_MAX_RLOW_RATE_MLPM 500 -#define RINSEBACK_ADJ_FLOW_RATE_MLPM 10 -#define RINSEBACK_BACK_MAX_TIME_MS (5 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) -#define RINSEBACK_ADDITION_VOL_ML 50 -#define RINSEBACK_MAX_ADDITION_TIME_MS (25 * MILLISECONDS_PER_SECOND) +#define RINSEBACK_FLOW_INTEGRATOR 1.0 / (SECONDS_PER_MINUTE * (MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS)) +#define RINSEBACK_MIN_FLOW_RATE_MLPM 100 +#define RINSEBACK_MAX_RLOW_RATE_MLPM 500 +#define RINSEBACK_ADJ_FLOW_RATE_MLPM 10 +#define RINSEBACK_BACK_MAX_TIME_MS (5 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND) +#define RINSEBACK_ADDITION_VOL_ML 50 +#define RINSEBACK_MAX_ADDITION_TIME_MS (25 * MILLISECONDS_PER_SECOND) // Fluid Bolus defines -#define FLUID_BOLUS_START_CMD 1 -#define ENABLE_BOLUS 1 +#define FLUID_BOLUS_START_CMD 1 +#define ENABLE_BOLUS 1 // Recirc defines -#define RECIRC_TIMEOUT_MIN 30 -#define RECIRC_WARN_BEFORE_TIMEOUT_MIN 10 +#define RECIRC_TIMEOUT_MIN 30 +#define RECIRC_WARN_BEFORE_TIMEOUT_MIN 10 -// Alarms +// Alarm defines #define ALARM_TABLE_PRIORITY_INDEX 0 #define ALARM_TABLE_PROPERTIES_INDEX 1 #define ALARM_TABLE_TX_PAUSE_INDEX 2 @@ -136,7 +139,17 @@ #define ALARM_RECIRC_WARN_PROPERTIES 112 #define ALARM_REPLACE_BICARB_PROPERTIES 112 #define ALARM_DIAL_PROPOR_PROPERTIES 10 +#define ALARM_TX_MOD_CHNG_PROPERTIES 2 +// Dry bicart defines +#define DRY_BICART_DRIN_IN_PROGRESS 1 +#define DRY_BICART_DEPRES_IN_PROGRESS 1 +#define DRY_BICART_DRIN_NOT_IN_PROGRESS 0 +#define DRY_BICART_DEPRES_NOT_IN_PROGRESS 0 +#define DRY_BICART_CLOSE_SCREEN 0 +#define DRY_BICART_OPEN_SCREEN 1 +#define DRY_BICART_PCT_PROG_TIME_MS (20 * MILLISECONDS_PER_SECOND) + enum User_Command_ID { CMD_NONE = -1, CMD_STAND_BY = 0, @@ -202,9 +215,11 @@ REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE = 2, REQUESTED_USER_ACTION_RINSEBACK_PAUSE = 3, REQUESTED_USER_ACTION_RINSEBACK_RESUME = 4, - REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 5, - REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE = 6, - REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 7, + REQUESTED_USER_ACTION_RINSEBACK_END = 5, + REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL = 6, + REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE = 7, + REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT = 8, + REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT = 9, }; enum Recirculate_States { @@ -231,11 +246,12 @@ 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, + SEQ_ALARM_PROPORTIONING_ACID_IN_PROG = 2, + SEQ_ALARM_DRY_BICARB_CARTRIDGE = 3, + SEQ_ALARM_PROCESS_DRAIN_SCREEN = 4, + SEQ_ALARM_TRIGGER_RPLC_BICARB = 5, + SEQ_ALARM_PROPORTIONING_BICARB_IN_PROG = 6, + SEQ_ALARM_LOW_VENOUS = 7, }; enum Treatment_Modality_Types @@ -261,6 +277,21 @@ USE_NORMAL_STABILIZATION_PERIOD = 2, }; +// HDF states +enum HDF_States { + HDF_UF_STATE = 0, + HDF_UF_PAUSED_STATE = 1, + HDF_UF_FLUID_BOLUS_STATE = 2, +}; + +// Dry bicart status +enum Dry_Bicart_Action { + DRY_BICART_ACTION_DRAIN = 0, + DRY_BICART_ACTION_DEPRESSURIZE = 1, + DRY_BICART_ACTION_CANCEL = 2, + DRY_BICART_ACTION_DONE = 3, +}; + enum State_Status { STATE_ON_ENTRY = 0, STATE_ON_ACTION, @@ -295,6 +326,7 @@ ALARM_ID_TD_RECIRC_TIMEOUT_WARNING = 199, ALARM_ID_TD_RECIRC_TIMEOUT = 200, ALARM_ID_DD_BICARBONATE_CARTRIDGE_LOW_LEVEL = 244, + ALARM_ID_TD_TREATMENT_MODALITY_CHANGE = 247, ALARM_ID_DD_REPLACE_BICARB_CARTRIDGE = 248, ALARM_ID_DD_REPLACE_ACID_CONCENTRATE = 249, ALARM_ID_TD_DIALYSATE_PROPORTIONING_IN_PROGRESS = 250,