Index: AlarmDefs.h =================================================================== diff -u -rd8678680589c49e902d8ab0282de729d52978cb7 -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0 --- AlarmDefs.h (.../AlarmDefs.h) (revision d8678680589c49e902d8ab0282de729d52978cb7) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0) @@ -129,8 +129,8 @@ ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91, ///< FPGA reports failure reading arterial pressure sensor ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92, ///< FPGA reports failure reading venous pressure sensor ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93, ///< UV reactor not healthy (either inlet or outlet) - ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94, ///< Post-acid concentrate conductivity out of range - ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95, ///< Post-bicarb concentrate conductivity out of range + ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94, ///< Concentrate conductivity after adding acid out of range alarm + ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95, ///< Concentrate conductivity after adding bicarb out of range alarm ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96, ///< RO pump flow rate out of range ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97, ///< DG thermistors/sensors temperature out of range ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98, ///< DG fan RPM out of range @@ -181,6 +181,7 @@ ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 143, ///< DG/HD NV data management individual record time invalid ALARM_ID_HD_AC_POWER_LOST = 144, ///< HD AC power lost alarm ALARM_ID_DG_RESTARTED_FAULT = 145, ///< HD reports DG restarted fault + ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -432,6 +433,7 @@ { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID { ALARM_PRIORITY_HIGH, 15, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE }, // ALARM_ID_HD_AC_POWER_LOST { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_RESTARTED_FAULT + { ALARM_PRIORITY_LOW, 30, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: DGDefs.h =================================================================== diff -u -rd078fbc5daad3b2a2dbe39c4b4b57019fa16f9ba -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0 --- DGDefs.h (.../DGDefs.h) (revision d078fbc5daad3b2a2dbe39c4b4b57019fa16f9ba) +++ DGDefs.h (.../DGDefs.h) (revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0) @@ -153,6 +153,8 @@ { DG_FILL_MODE_STATE_START = 0, ///< Start fill mode state DG_FILL_MODE_STATE_CHECK_INLET_WATER, ///< Check inlet water quality state + DG_FILL_MODE_STATE_BICARB_PUMP_CHECK, ///< Run bicarb concentrate pump and check conductivity range + DG_FILL_MODE_STATE_ACID_PUMP_CHECK, ///< Run acid concentrate pump and check conductivity range DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION, ///< Dialysate production state DG_FILL_MODE_STATE_DELIVER_DIALYSATE, ///< Deliver dialysate state NUM_OF_DG_FILL_MODE_STATES ///< Number of fill mode states Index: HDDefs.h =================================================================== diff -u -ra000b2f3853b15600868922976d6db1c22970184 -ra1162deed63c9b2d4b5f756495ebc0aea09b0ef0 --- HDDefs.h (.../HDDefs.h) (revision a000b2f3853b15600868922976d6db1c22970184) +++ HDDefs.h (.../HDDefs.h) (revision a1162deed63c9b2d4b5f756495ebc0aea09b0ef0) @@ -128,9 +128,10 @@ { HD_PRE_TREATMENT_START_STATE = 0, ///< Start pre-treatment mode state HD_PRE_TREATMENT_WATER_SAMPLE_STATE, ///< Water sample state - HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE, ///< Self tests with no cartridge state + HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE, ///< Consumable self-tests state + HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE, ///< No cartridge self-tests state HD_PRE_TREATMENT_CART_INSTALL_STATE, ///< Consumable and cartridge installation state - HD_PRE_TREATMENT_SELF_TEST_DRY_STATE, ///< Self tests dry state + HD_PRE_TREATMENT_SELF_TEST_DRY_STATE, ///< Self-tests when the cartridge is dry state HD_PRE_TREATMENT_PRIME_STATE, ///< Prime blood and dialysate circuits and run wet self-tests state HD_PRE_TREATMENT_RECIRCULATE_STATE, ///< Re-circulate blood and dialysate circuits state HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE, ///< Patient connection state @@ -168,45 +169,64 @@ /**@}*/ /** + * @addtogroup SelfTestConsumable + * @{ + */ + +/// Enumeration of consumable self-tests sub-mode states. +enum HD_Pre_Treatment_Consumable_Self_Tests_States +{ + CONSUMABLE_SELF_TESTS_INSTALL_STATE = 0, ///< Consumable self-tests install state + CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE, ///< Consumable self-tests water quality check state + CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE, ///< Consumable self-tests bicarbonate concentrate pump check state + CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE, ///< Consumable self-tests acid concentrate pump check state + NUM_OF_CONSUMABLE_SELF_TESTS_STATES ///< Number of consumable install sub-mode states +}; +/// Type for consumable self-tests states enumeration. +typedef enum HD_Pre_Treatment_Consumable_Self_Test_States CONSUMABLE_SELF_TESTS_STATE_T; + +/**@}*/ + +/** * @addtogroup SelfTests * @{ */ /// Enumeration of no cartridge self-tests sub-mode states. enum HD_Pre_Treatment_No_Cart_Self_Tests_States { - NO_CART_SELF_TESTS_START_STATE = 0, ///< No cartridge self-tests starting state. - NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to be closed before running self-tests. - NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< No cartridge occlusion sensors self-test state. - NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE, ///< No cartridge blood flow meter self-test state. - NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE, ///< No cartridge dialysate flow meter self-test state. - NO_CART_SELF_TESTS_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state. - NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state. - NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state. - NO_CART_SELF_TESTS_DOOR_SWITCH_STATE, ///< No cartridge door switch self-test state. - NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE, ///< No cartridge home valves and pumps self-test state. - NO_CART_SELF_TESTS_HOME_IDLE_STATE, ///< Wait for valves and pumps finish homing state. - NO_CART_SELF_TESTS_STOPPED_STATE, ///< No cart self-test stopped state. - NO_CART_SELF_TESTS_COMPLETE_STATE, ///< No cartridge self-test complete state. - NUM_OF_NO_CART_SELF_TESTS_STATES ///< Number of no cartridge self-tests states. + NO_CART_SELF_TESTS_START_STATE = 0, ///< No cartridge self-tests starting state + NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to be closed before running self-tests + NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< No cartridge occlusion sensors self-test state + NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE, ///< No cartridge blood flow meter self-test state + NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE, ///< No cartridge dialysate flow meter self-test state + NO_CART_SELF_TESTS_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state + NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state + NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state + NO_CART_SELF_TESTS_DOOR_SWITCH_STATE, ///< No cartridge door switch self-test state + NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE, ///< No cartridge home valves and pumps self-test state + NO_CART_SELF_TESTS_HOME_IDLE_STATE, ///< Wait for valves and pumps finish homing state + NO_CART_SELF_TESTS_STOPPED_STATE, ///< No cart self-test stopped state + NO_CART_SELF_TESTS_COMPLETE_STATE, ///< No cartridge self-test complete state + NUM_OF_NO_CART_SELF_TESTS_STATES ///< Number of no cartridge self-tests states }; /// Type for no cartridge self-tests enumeration. typedef enum HD_Pre_Treatment_No_Cart_Self_Tests_States NO_CART_SELF_TESTS_STATE_T; /// Enumeration of dry self-tests sub-mode states. enum HD_Pre_Treatment_Dry_Self_Tests_States { - DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests starting state. - DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to close before executing self-tests. - DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE, ///< Bubble detectors dry self-test state. - DRY_SELF_TESTS_AIR_TRAP_STATE, ///< Air trap fill level ultrasonic sensor dry self-test state. - DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< Occlusion sensors dry self-test state. - DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE, ///< Pressure sensors dry self-test setup valves and pump state. - DRY_SELF_TESTS_PRESSURE_SENSORS_STATE, ///< Pressure sensors verify pressure readings state. - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Preassure sensors verify normal pressure readings state. - DRY_SELF_TESTS_STOPPED_STATE, ///< Dry self-test stopped state. - DRY_SELF_TESTS_COMPLETE_STATE, ///< Dry self-test complete state. - NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states. + DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests starting state + DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to close before executing self-tests + DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE, ///< Bubble detectors dry self-test state + DRY_SELF_TESTS_AIR_TRAP_STATE, ///< Air trap fill level ultrasonic sensor dry self-test state + DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< Occlusion sensors dry self-test state + DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE, ///< Pressure sensors dry self-test setup valves and pump state + DRY_SELF_TESTS_PRESSURE_SENSORS_STATE, ///< Pressure sensors verify pressure readings state + DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Preassure sensors verify normal pressure readings state + DRY_SELF_TESTS_STOPPED_STATE, ///< Dry self-test stopped state + DRY_SELF_TESTS_COMPLETE_STATE, ///< Dry self-test complete state + NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states }; /// Type for dry self-tests enumeration. typedef enum HD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T; @@ -247,9 +267,9 @@ /// Enumeration of pre-treatment recirculate states. enum HD_Pre_Treatment_Recirc_States { - PRE_TREATMENT_RECIRC_STATE = 0, ///< Pre-treatment recirculate state. - PRE_TREATMENT_RECIRC_STOPPED_STATE, ///< Pre-treatment recirculate stopped state. - NUM_OF_PRE_TREATMENT_RECIRC_STATES ///< Number of pre-treatment recirculate states. + PRE_TREATMENT_RECIRC_STATE = 0, ///< Pre-treatment recirculate state + PRE_TREATMENT_RECIRC_STOPPED_STATE, ///< Pre-treatment recirculate stopped state + NUM_OF_PRE_TREATMENT_RECIRC_STATES ///< Number of pre-treatment recirculate states }; ///< Type for HD pre-treatment recirculate sub-mode states enumeration typedef enum HD_Pre_Treatment_Recirc_States HD_PRE_TREATMENT_RECIRC_STATE_T;