Index: MsgDefs.h =================================================================== diff -u -rc1fdf15635fe8d34501b4c7198ee206002710ea9 -rb411660d10ee64e9f132fae1af0dafe9d43c33a5 --- MsgDefs.h (.../MsgDefs.h) (revision c1fdf15635fe8d34501b4c7198ee206002710ea9) +++ MsgDefs.h (.../MsgDefs.h) (revision b411660d10ee64e9f132fae1af0dafe9d43c33a5) @@ -75,8 +75,8 @@ MSG_ID_DG_HEATERS_DATA = 0x2C, ///< DG broadcast of the heaters data MSG_ID_DG_TEMPERATURE_DATA = 0x2D, ///< DG broadcast of the temperature sensors data MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x2E, ///< HD response to user selection of ultrafiltration settings change option selection - MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x2F, ///< HD request to start or stop DG heat disinfection - MSG_ID_SALINE_BOLUS_DATA = 0x30, ///< HD broadcast of saline bolus data + MSG_ID_SALINE_BOLUS_DATA = 0x2F, ///< HD broadcast of saline bolus data + MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0x30, ///< HD request to start or stop DG heat disinfection MSG_ID_DG_CONDUCTIVITY_DATA = 0x31, ///< DG broadcast of the conductivity sensors data MSG_ID_USER_REQUEST_ALARM_SILENCE = 0x32, ///< UI request alarm silence (or cancel) MSG_ID_HD_ACCELEROMETER_DATA = 0x33, ///< HD broadcast of accelerometer data @@ -86,12 +86,15 @@ 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_HD_VALVES_DATA = 0x3A, ///< HD broadcast of valves + 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_TREATMENT_END_REQUEST = 0x3C, ///< UI user treatment end request MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D, ///< HD response to user request to end treatment + MSG_ID_HD_AIR_TRAP_DATA = 0x3E, ///< HD broadcast of air trap data + MSG_ID_UI_ALARM_USER_ACKNOWLEDGE = 0x3F, ///< UI user has acknowledged alarm + MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action + MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41, ///< HD response to user request to pause or resume ultrafiltration - MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER = 0x6D, ///< TODO REMOVE FOR FAST TESING ONLY #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing #endif @@ -147,8 +150,16 @@ MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D, ///< Set a treatment parameter (will change actual setting, not an override) MSG_ID_HD_VALVES_HOME = 0x802E, ///< Home an HD Valve MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F, ///< Set an HD valve to a position in counts - MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030, ///< Set the HD blood trap valve status + MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030, ///< Set the HD blood trap valve status MSG_ID_HD_VALVES_SET_PWM_OVERRIDE = 0x8031, ///< Set an HD valve PWM + MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE = 0x8032, ///< HD air trap data broadcast interval override request + MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033, ///< HD air trap level sensor override request + MSG_ID_HD_SOFTWARE_RESET_REQUEST = 0x8034, ///< HD reset request + MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE = 0x8035, ///< Blood flow signal strength override request + MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE = 0x8036, ///< Dialysate flow signal strength override request + MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037, ///< Blood pump home command + MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038, ///< Dialysate inlet pump home command + MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039, ///< Dialysate outlet pump home command 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 @@ -184,6 +195,7 @@ 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_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_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 @@ -196,27 +208,28 @@ enum Request_Reject_Reasons { REQUEST_REJECT_REASON_NONE = 0, ///< Used when there is no rejection - REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE, ///< Request is not allowed in the current operating mode - REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM, ///< Validated request was not confirmed by user in reasonable time - REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE, ///< Request is not allowed if not in treatment mode - REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE, ///< Request is not allowed in current treatment state - REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED, ///< Request is not allowed so near end of treatment - REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE, ///< Treatment duration is out of range - REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT, ///< Treatment time change is less than currently elapsed treatment time - REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE, ///< Blood flow is out of range - REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE, ///< Dialysate flow is out of range - REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE, ///< Dialysate flow rate or treatment duration causes dialysate volume to exceed limit - REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE, ///< Ultrafiltration volume is out of range - REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE, ///< Ultrafiltration rate is out of range - REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM, ///< Treatment time change is less than minimum treatment time - REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS, ///< Ultrafiltration is not currently in progress - REQUEST_REJECT_REASON_UF_NOT_PAUSED, ///< Ultrafiltration is not currently paused - REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS, ///< A saline bolus is in progress - REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE, ///< A treatment parameter is out of range - REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION, ///< The Heparin pre-stop setting is greater than the treatment duration - REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH, ///< Arterial pressure low and high alarm limits are not inconsistent - REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH, ///< Venous pressure low and high alarm limits are inconsistent - REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED, ///< Saline bolus volume maximum has been reached - no more saline allowed + REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE = 1, ///< Request is not allowed in the current operating mode + REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM = 2, ///< Validated request was not confirmed by user in reasonable time + REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE = 3, ///< Request is not allowed if not in treatment mode + REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE = 4, ///< Request is not allowed in current treatment state + REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED = 5, ///< Request is not allowed so near end of treatment + REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE = 6, ///< Treatment duration is out of range + REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT = 7, ///< Treatment time change is less than currently elapsed treatment time + REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE = 8, ///< Blood flow is out of range + REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE = 9, ///< Dialysate flow is out of range + REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE = 10, ///< Dialysate flow rate or treatment duration causes dialysate volume to exceed limit + REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE = 11, ///< Ultrafiltration volume is out of range + REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE = 12, ///< Ultrafiltration rate is out of range + REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13, ///< Treatment time change is less than minimum treatment time + REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14, ///< Ultrafiltration is not currently in progress + REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15, ///< Ultrafiltration is not currently paused + REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16, ///< A saline bolus is in progress + REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range + REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18, ///< The Heparin pre-stop setting is greater than the treatment duration + REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH = 19, ///< Arterial pressure low and high alarm limits are not inconsistent + REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH = 20, ///< Venous pressure low and high alarm limits are inconsistent + REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21, ///< Saline bolus volume maximum has been reached - no more saline allowed + REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22, ///< A saline bolus is not in progress 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