Index: HDDefs.h =================================================================== diff -u -r60c4fa2a77d4dfedad7db877649d69d035cfe46a -r3e6579c4e3bced7ce17946c3a48031b58858bb9c --- HDDefs.h (.../HDDefs.h) (revision 60c4fa2a77d4dfedad7db877649d69d035cfe46a) +++ HDDefs.h (.../HDDefs.h) (revision 3e6579c4e3bced7ce17946c3a48031b58858bb9c) @@ -7,8 +7,8 @@ * * @file HDDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 19-Jan-2023 +* @author (last) Sean Nash +* @date (last) 02-Feb-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 @@ -139,8 +139,7 @@ /// Enumeration of treatment parameters mode states. enum HD_Treatment_Parameters_Mode_States { - HD_TREATMENT_PARAMS_MODE_STATE_START = 0, ///< Start treatment params mode state - HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND, ///< Wait for UI to send treatment params mode state + HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND = 0, ///< Wait for UI to send treatment params mode state HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM, ///< Wait for UI to confirm treatment params mode state NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES ///< Number of treatment params mode states }; @@ -156,8 +155,7 @@ /// Enumeration of pre-treatment mode states (sub-mode). enum HD_Pre_Treatment_Mode_States { - HD_PRE_TREATMENT_START_STATE = 0, ///< Start pre-treatment mode state - HD_PRE_TREATMENT_WATER_SAMPLE_STATE, ///< Water sample state + HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0, ///< Water sample 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 @@ -208,8 +206,7 @@ enum HD_Pre_Treatment_Consumable_Self_Test_States { CONSUMABLE_SELF_TESTS_INSTALL_STATE = 0, ///< Consumable self-tests install state - CONSUMABLE_SELF_TESTS_FILL_CMD_STATE, ///< Send command to DG to fill reservoir state - CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE, ///< Consumable self-tests water quality check state + CONSUMABLE_SELF_TESTS_PRIME_STATE, ///< Consumable self-tests prime concentrate lines 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 CONSUMABLE_SELF_TESTS_COMPLETE_STATE, ///< Consumable self-tests complete state @@ -228,8 +225,7 @@ /// 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_WAIT_FOR_DOOR_CLOSE_STATE = 0, ///< Wait for door to be closed before running self-tests NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE, ///< No cartridge pressure sensors self-test state NO_CART_SELF_TESTS_HOME_VALVES_STATE, ///< No cartridge home valves state NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE, ///< No cartridge home syringe pump state @@ -248,7 +244,7 @@ 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_OCCLUSION_SENSORS_STATE, ///< Occlusion sensors dry self-test state + DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE, ///< Cartridge loaded check dry self-test 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 @@ -270,8 +266,8 @@ enum Wet_Self_Tests_States { WET_SELF_TESTS_START_STATE = 0, ///< Wet self-tests starting state. - WET_SELF_TESTS_SETUP_STATE, ///< Setup reservoirs for wet self-tests. - WET_SELF_TESTS_BUBBLES_STATE, ///< Wet self-test air bubble detectors state. + WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE, ///< Setup for wet air bubble self-test state. + WET_SELF_TESTS_BUBBLE_CHECK_STATE, ///< Wet self-test air bubble detectors state. WET_SELF_TESTS_PRIME_CHECK_STATE, ///< Prime check wet self-tests state, checks for primed patient lines. WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE, ///< Blood leak detector self-test state. WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE, ///< Setup valve and start dialysate pump for first displacement. @@ -297,8 +293,7 @@ /// Enumeration of prime sub-mode states. enum HD_Pre_Treatment_Prime_States { - HD_PRIME_START_STATE = 0, ///< Prime start state - HD_PRIME_WAIT_FOR_USER_START_STATE, ///< Wait for user to start prime state + HD_PRIME_WAIT_FOR_USER_START_STATE = 0, ///< Wait for user to start prime state HD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state HD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state @@ -406,8 +401,7 @@ /// Enumeration of ultrafiltration states. enum UF_States { - UF_START_STATE = 0, ///< Start state of the ultrafiltration state machine - UF_PAUSED_STATE, ///< Paused state of the ultrafiltration state machine + UF_PAUSED_STATE = 0, ///< Paused state of the ultrafiltration state machine UF_RUNNING_STATE, ///< Running state of the ultrafiltration state machine NUM_OF_UF_STATES ///< Number of ultrafiltration states }; @@ -747,6 +741,8 @@ HD_EVENT_SERVICE_UPDATE, ///< HD new service record has been updated HD_EVENT_USAGE_INFO_UPDATE, ///< HD new usage information has been updated HD_EVENT_SW_CONFIG_UPDATE, ///< HD new software configuration has been updated + HD_EVENT_BUTTON, ///< HD button pressed/released + HD_EVENT_SAFETY_LINE, ///< HD safety line pulled/released HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES, ///< HD reservoir 1 load cells start values HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES, ///< HD reservoir 2 load cells end values HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES, ///< HD reservoir 2 load cells start values Index: MsgDefs.h =================================================================== diff -u -rd2e5e9dba92b9b0b0245e3cb8b5f33250f875c7d -r3e6579c4e3bced7ce17946c3a48031b58858bb9c --- MsgDefs.h (.../MsgDefs.h) (revision d2e5e9dba92b9b0b0245e3cb8b5f33250f875c7d) +++ MsgDefs.h (.../MsgDefs.h) (revision 3e6579c4e3bced7ce17946c3a48031b58858bb9c) @@ -9,7 +9,7 @@ * @file MsgDefs.h * * @author (last) Dara Navaei -* @date (last) 11-Jan-2023 +* @date (last) 03-Feb-2023 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -475,6 +475,7 @@ MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE = 0xA061, ///< DG heaters duty cycle override request MSD_ID_DG_RTC_CTL_REG1_STATUS_OVERRIDE = 0xA062, ///< DG RTC control register 1 status override MSD_ID_DG_RTC_CTL_REG3_STATUS_OVERRIDE = 0xA063, ///< DG RTC control register 3 status override + MSG_ID_DG_NELSON_DISINFECT_SUPPORT = 0xA064, ///< DG Nelson labs disinfect support message MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log @@ -539,6 +540,7 @@ REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED = 49, ///< DG chemical flush is not complete REQUEST_REJECT_REASON_DG_RO_FILTER_TEMPERATURE_OUT_OF_RANGE = 50, ///< DG RO filter temperature out of range + REQUEST_REJECT_REASON_DG_INCOMPATIBLE = 51, ///< DG firmware version is not compatible with HD firmware NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes }; typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T; ///< Type for settings change rejection reason codes enumeration