Index: MsgDefs.h =================================================================== diff -u -r7b502f7e532b1b8c69b28f3dab7002cda4921990 -rb47b0595212ea00f1763bdc5bd9c7e7b7d340ddc --- MsgDefs.h (.../MsgDefs.h) (revision 7b502f7e532b1b8c69b28f3dab7002cda4921990) +++ MsgDefs.h (.../MsgDefs.h) (revision b47b0595212ea00f1763bdc5bd9c7e7b7d340ddc) @@ -84,9 +84,9 @@ MSG_ID_DG_ACCELEROMETER_DATA = 0x34, ///< DG broadcast of accelerometer data MSG_ID_UI_NEW_TREATMENT_PARAMS = 0x35, ///< UI request to validate new treatment parameter set MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE = 0x36, ///< HD response to new treatment parameters set - MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfection publish data - MSG_ID_UI_START_TREATMENT = 0x38, ///< UI user request to initiate a treatment - MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39, ///< HD response to user request to initiate a treatment + MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37, ///< DG heat disinfect publish data + MSG_ID_UI_INITIATE_TREATMENT_REQUEST = 0x38, ///< UI user request to initiate a treatment + MSG_ID_HD_INITIATE_TREATMENT_RESPONSE = 0x39, ///< HD response to user request to initiate a treatment MSG_ID_HD_VALVES_DATA = 0x3A, ///< HD broadcast of valves data MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B, ///< UI user confirmation of treatment parameters MSG_ID_UI_START_PRIME_REQUEST = 0x3C, ///< UI user has requested to start priming @@ -103,7 +103,7 @@ MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47, ///< HD response to change pressure limits request MSG_ID_DG_FANS_DATA = 0x48, ///< DG broadcast fans data MSG_ID_HD_TREATMENT_STOP_TIMER_DATA = 0x49, ///< HD broadcast of treatment stop timer (countdown to treatment stop - no rinseback alarm) - MSG_ID___AVAILABLE_5 = 0x4A, ///< This msg ID is available for use + MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM = 0x4A, ///< UI patient disconnection confirm MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B, ///< UI request to pause/resume Heparin delivery MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C, ///< HD response to pause/resume Heparing delivery request MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D, ///< HD broadcast of Heparin delivery data @@ -129,14 +129,25 @@ MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0x61, ///< HD broadcast of no cartridge self-tests progress MSG_ID_UI_INSTALLATION_CONFIRM = 0x62, ///< UI disposable installation user confirmation MSG_ID_HD_DRY_SELF_TEST_PROGRESS = 0x63, ///< HD broadcast of dry self-tests progress - MSG_ID_UI_CONTINUE_TO_TREATMENT_REQUEST = 0x64, ///< UI user has requested to continue to treatment - MSG_ID_HD_CONTINUE_TO_TREATMENT_RESPONSE = 0x65, ///< HD response to user request to continue to treatment + MSG_ID_UI_PATIENT_CONNECTION_BEGIN_REQUEST = 0x64, ///< UI user has requested to begin patient connection + MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE = 0x65, ///< HD response to user request to begin patient connection MSG_ID_UI_PATIENT_CONNECTION_CONFIRM = 0x66, ///< UI user has confirmed patient connection completed MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE = 0x67, ///< HD response to user confirmation of patient connection MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM = 0x68, ///< UI user has confirmed consumable install MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69, ///< HD broadcast of syringe pump data MSG_ID_HD_FLUID_LEAK_STATE = 0x6A, ///< HD broadcast of fluid leak state MSG_ID_DG_FLUID_LEAK_STATE = 0x6B, ///< DG broadcast of fluid leak state + MSG_ID_HD_BLOOD_LEAK_DATA = 0x6C, ///< HD broadcast of blood leak data + MSG_ID_UI_START_TREATMENT_REQUEST = 0x71, ///< UI user has requested to start treatment + MSG_ID_HD_START_TREATMENT_RESPONSE = 0x72, ///< HD response to user request to start treatment + MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM = 0x73, ///< UI user has confirmed disposable removal + MSG_ID_HD_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE = 0x74, ///< HD response to user confirmation of disposable removal + MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75, ///< UI request treatment log data message + MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76, ///< HD response to UI treatment log data request + MSG_ID_HD_POST_TREATMENT_STATE = 0x77, ///< HD broadcast of post-treatment state + MSG_ID___AVAILABLE_16 = 0x78, ///< This msg ID is available for use + MSG_ID_DG_START_STOP_FLUSH = 0x79, ///< DG start/stop flush mode + MSG_ID_DG_FLUSH_DATA = 0x7A, ///< DG flush data publish #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -215,11 +226,14 @@ MSG_ID_HD_SET_SERVICE_RECORD = 0x8044, ///< HD set service record that is received from Dialin MSG_ID_HD_SEND_SERVICE_RECORD = 0x8045, ///< HD send service record to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_HD_SET_OP_MODE_REQUEST = 0x8046, ///< HD set operation mode request - MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0x8047, ///< HD fluid leak state broadcast interval override request - MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0x8048, ///< HD fluid leak state detector override request + MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0x8047, ///< HD fluid leak detector state broadcast interval override request + MSG_ID_HD_FLUID_LEAK_STATE_OVERRIDE = 0x8048, ///< HD fluid leak detector state override request MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0x8049, ///< HD syringe pump measured home override request MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0x804A, ///< HD syringe pump measured position override request MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0x804B, ///< HD syringe pump measured volume delivered override request + MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE = 0x804C, ///< HD blood leak detector data broadcast interval override request + MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE = 0x804D, ///< HD blood leak detector status override request + MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST = 0x804E, ///< HD blood leak detector zero request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in @@ -248,10 +262,10 @@ MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019, ///< DG accelerometer data broadcast interval override request MSG_ID___AVAILABLE_11 = 0xA01A, ///< This msg ID is available for use MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override - MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D, ///< Heat disinfection recirculation path duration in minutes - MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E, ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes - MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F, ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes - MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020, ///< Heat disinfection number of cycles to run + MSG_ID___AVAILABLE_12 = 0xA01D, ///< This msg ID is available for use + MSG_ID___AVAILABLE_13 = 0xA01E, ///< This msg ID is available for use + MSG_ID___AVAILABLE_14 = 0xA01F, ///< This msg ID is available for use + MSG_ID___AVAILABLE_15 = 0xA020, ///< This msg ID is available for use MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021, ///< Heat disinfection data publish interval override request MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023, ///< DG concentrate pump measured speed override request @@ -283,6 +297,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E, ///< DG send scheduled runs to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F, ///< DG fluid leak state broadcast interval override request MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040, ///< DG fluid leak state detector override request + MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override 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 @@ -326,6 +341,10 @@ REQUEST_REJECT_REASON_RINSEBACK_MAX_VOLUME_REACHED = 27, ///< Rinseback volume maximum has been reached - no more additional rinsebacks allowed REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET = 28, ///< Ultrafiltration volume is not set yet REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29, ///< The user has not confirmed patient connection + REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30, ///< Heparin cannot be paused if not currently deliverying Heparin + REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 31, ///< Heparin cannot be resumed if not paused + REQUEST_REJECT_REASON_DG_COMM_LOST = 32, ///< Treatment cannot initiate if DG comm is lost + REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE = 33, ///< Post-treatment reservoirs drain not complete 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