Index: AlarmDefs.h =================================================================== diff -u -r91977fb1b5e651e6d29e25d2feebb0861427e079 -rb6a449af6ffb7d805badf84d1f216fb64110d0e9 --- AlarmDefs.h (.../AlarmDefs.h) (revision 91977fb1b5e651e6d29e25d2feebb0861427e079) +++ AlarmDefs.h (.../AlarmDefs.h) (revision b6a449af6ffb7d805badf84d1f216fb64110d0e9) @@ -195,6 +195,10 @@ ALARM_ID_FP_PERMEATE_FLOW_OUT_LOW_RANGE = 163, ///< FP permeate flow low fault ALARM_ID_FP_INLET_PRESSURE_LOW_RANGE = 164, ///< FP inlet pressure low fault ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT = 165, ///< TD air trap lower timeout + ALARM_ID_TD_INVALID_TUBE_SET = 166, ///< TD invalid tube set + ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET = 167, + ALARM_ID_TD_INSTALL_NEW_CARTRIDGE = 168, + ALARM_ID_TD_NO_CARTRIDGE_LOADED = 169, NUM_OF_ALARM_IDS ///< Number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration Index: MsgDefs.h =================================================================== diff -u -re796e71f91cc6ea609a2aca1a9afdeb96428d118 -rb6a449af6ffb7d805badf84d1f216fb64110d0e9 --- MsgDefs.h (.../MsgDefs.h) (revision e796e71f91cc6ea609a2aca1a9afdeb96428d118) +++ MsgDefs.h (.../MsgDefs.h) (revision b6a449af6ffb7d805badf84d1f216fb64110d0e9) @@ -273,6 +273,8 @@ MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x8045, ///< TD blood prime override. MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8046, ///< TD blood prime publish interval broadcast override. MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM = 0x8047, ///< TD enable venous bubble alarm. + MSG_ID_TD_NO_CART_SELF_TEST_PROGRESS_DATA = 0x8048, ///< TD No cart self test progress data + MSG_ID_TD_TUBE_SET_AUTHENTICATION_RESPONSE = 0x8049, ///< TD Tube set authentication response MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in Index: TDDefs.h =================================================================== diff -u -r413aa187b32921babc077451fb7c98578707497b -rb6a449af6ffb7d805badf84d1f216fb64110d0e9 --- TDDefs.h (.../TDDefs.h) (revision 413aa187b32921babc077451fb7c98578707497b) +++ TDDefs.h (.../TDDefs.h) (revision b6a449af6ffb7d805badf84d1f216fb64110d0e9) @@ -206,24 +206,26 @@ /// Enumeration of dry self-tests sub-mode states. enum TD_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_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check dry self-test state - DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check dry self-test state - DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE, ///< Seek syringe pumps state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE, ///< Pressure sensor setup state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE, ///< Venous pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS, ///< Venous pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE, ///< Arterial pressure sensor dry self-test setup valves and pump state - DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL, ///< Arterial pressure sensor dry self-test - DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE, ///< Pressure sensors verify pressure loss state - DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE, ///< Pressure sensors verify pressure stability state - DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE, ///< Pressure sensors verify normal pressure readings state - DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE, ///< Prime syringe pump state - DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE, ///< Occlusion detection 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 start state + DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door close state + DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Used cartridge check state + DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check state + DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE, ///< Tube set authentication state + DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE, ///< Syringe pump seek state + DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE, ///< Pressure sensor normal setup state + DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE, ///< Pressure venous setup state + DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE, ///< Venous pressure stabilization state + DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE, ///< Venous pressure leak check state + DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE, ///< Venous pressure relief state + DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE, ///< Pressure arterial setup state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE, ///< Arterial pressure stabilization state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE, ///< Arterial pressure leak check state + DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE, ///< Arterial pressure relief state + DRY_SELF_TESTS_SYRINGE_PRIME_STATE, ///< Syringe prime state + DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE, ///< Syringe pump occlusion check state + DRY_SELF_TESTS_COMPLETE_STATE, ///< Complete state + DRY_SELF_TESTS_STOPPED_STATE, ///< Stopped state + NUM_OF_DRY_SELF_TESTS_STATES ///< Number of dry self-tests states }; /// Type for dry self-tests enumeration. typedef enum TD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T;