Index: HDDefs.h =================================================================== diff -u -r4de0bef28fa0e7bec1f35280a205facdfc4bce0b -ra2acf043b65112d1689b300c51c4751e0709da2d --- HDDefs.h (.../HDDefs.h) (revision 4de0bef28fa0e7bec1f35280a205facdfc4bce0b) +++ HDDefs.h (.../HDDefs.h) (revision a2acf043b65112d1689b300c51c4751e0709da2d) @@ -731,10 +731,16 @@ HD_EVENT_STARTUP = 0, ///< HD startup event HD_EVENT_OP_MODE_CHANGE, ///< HD Op mode change event HD_EVENT_SUB_MODE_CHANGE, ///< HD Op sub-mode change event - HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< HD Pre-treatment dry self-test cartridge result - HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< HD Pre-treatment dry self-test pressure result - HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< HD Pre-treatment wet self-test displacement result - HD_EVENT_CPU_RAM_ERROR_STATUS, ///< HD single-bit Ram error event + HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT, ///< HD dry self test cartridge result + HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT, ///< HD dry self test pressure result + HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT, ///< HD wet self test displacement result + HD_EVENT_CPU_RAM_ERROR_STATUS, ///< HD CPU RAM error status + HD_EVENT_CAL_RECORD_UPDATE, ///< HD new calibration record updated + HD_EVENT_SYSTEM_RECORD_UPDATE, ///< HD new system record has been updated + 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_NO_EVENT, ///< HD no event has been updated NUM_OF_EVENT_IDS ///< Total number of HD events }; typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration @@ -770,4 +776,40 @@ /**@}*/ +/** + * @addtogroup UIUserConfirm + * @{ + */ + +/// Enumeration of generic confirmation. +enum Generic_Confirm_Command +{ + GENERIC_CONFIRM_CMD_REQUEST_OPEN = 0, ///< Generic Confirm command to display the confirmation + GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE = 1, ///< Generic Confirm command to hide the confirmation, due to timeout user confirmation + GENERIC_CONFIRM_CMD_REJECT = 2, ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore. + GENERIC_CONFIRM_CMD_ACCEPT_CLOSE = 3, ///< Generic Confirm command to hide the confirmation, due to accept user confirmation. + NUM_OF_GENERIC_CONFIRM_COMMAND , ///< Total number of generic confirm commands +}; +typedef enum Generic_Confirm_Command GENERIC_CONFIRM_COMMAND_T; ///< Type for generic confirm enumeration + +/**@}*/ + +/** + * @addtogroup UIUserConfirm + * @{ + */ + +/// Enumeration of generic confirmation. +enum Generic_Confirm_Id +{ + GENERIC_CONFIRM_ID_NONE = 0, ///< Generic Confirm None + GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH, ///< water flush stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT, ///< Heat disinfect stop user confirmation + GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL, ///< Chemical disinfect stop user confirmation + NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs +}; +typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration + +/**@}*/ + #endif Index: MsgDefs.h =================================================================== diff -u -r4de0bef28fa0e7bec1f35280a205facdfc4bce0b -ra2acf043b65112d1689b300c51c4751e0709da2d --- MsgDefs.h (.../MsgDefs.h) (revision 4de0bef28fa0e7bec1f35280a205facdfc4bce0b) +++ MsgDefs.h (.../MsgDefs.h) (revision a2acf043b65112d1689b300c51c4751e0709da2d) @@ -168,9 +168,9 @@ MSG_ID_DG_SERIAL_NUMBER = 0x88, ///< DG serial number MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data - MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data TODO is this needed? + MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data - MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data TODO is this needed? + MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E, ///< HD POST single test result MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F, ///< HD POST final test result MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0x90, ///< DG POST single test result @@ -195,7 +195,7 @@ MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< DG dialysate flow meter data (liter/minute) + MSG_ID____AVAILABLE_4 = 0xA6, ///< This message is available for use MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios @@ -214,6 +214,7 @@ MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info + MSG_ID_HD_REQUEST_DG_SERVICE_RECORD = 0xB9, ///< HD request DG service record MSG_ID_HD_REQUEST_UI_CONFIRMATION = 0xBA, ///< HD request UI confirmation MSG_ID_UI_CONFIRMATION_RESULT = 0xBB, ///< UI confirmation result response MSG_ID_REQUEST_DG_CPLD_STATUS = 0xBC, ///< Dialin request for DG CPLD Status @@ -357,6 +358,9 @@ MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082, ///< HD set blood leak embedded mode command MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083, ///< HD send blood leak embedded mode response MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084, ///< HD re-send trigger messages for all active alarms request + MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085, ///< HD set blood pump to specific PWM duty cycle request + MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086, ///< HD set dialysate inlet pump to specific PWM duty cycle request + MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087, ///< HD set dialysate outlet pump to specific PWM duty cycle 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 @@ -367,7 +371,7 @@ MSG_ID_PRESSURE_OVERRIDE = 0xA006, ///< Pressure sensor override request MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE = 0xA007, ///< Pressure data broadcast interval override request MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA008, ///< DG HD Communication Status override - MSG_ID_RO_MEASURED_FLOW_OVERRIDE = 0xA009, ///< RO measured flow rate override request + MSG_ID____AVAILABLE_6 = 0xA009, ///< Unused - this message ID is available for use MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00A, ///< RO pump data broadcast interval override request MSG_ID_DRAIN_PUMP_SET_RPM = 0xA00B, ///< Drain pump set RPM override request MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request @@ -391,7 +395,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E, ///< DG switches data publish interval override MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F, ///< DG operation mode publish interval override MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0xA020, ///< HD prevent transmission of given message(s) - MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE = 0xA021, ///< DG dialysate measured flow rate override request + MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE = 0xA021, ///< DG measured flow rate 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 MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024, ///< Concentrate pumps' target speed override request @@ -405,7 +409,7 @@ MSG_ID_DG_THERMISTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA02D, ///< DG thermistors data publish interval override MSG_ID_DG_THERMISTORS_VALUE_OVERRIDE = 0xA02E, ///< DG thermistors value override MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE = 0xA02F, ///< DG RO pump duty cycle override - MSG_ID_DG_RO_FLOW_RATE_OVERRIDE = 0xA030, ///< DG RO flow rate override + MSG_ID____AVAILABLE_5 = 0xA030, ///< Message available for use MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW = 0xA031, ///< DG set RO pump target flow rate MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032, ///< DG RO pump target pressure override MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033, ///< DG set calibration record that is received from Dialin @@ -425,7 +429,7 @@ MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042, ///< DG filter flush time period override MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043, ///< DG fans RPM override - MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE = 0xA044, ///< Dialysate flow data broadcast interval override request + MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044, ///< Flow data broadcast interval override request MSG_ID_DG_STOP_RTC_CLOCK = 0xA045, ///< DG stop RTC clock MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046, ///< DG drain pump measured RPM override MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047, ///< Clears all DG alarms (even if non-recoverable or fault) @@ -504,6 +508,9 @@ REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT = 43, ///< Syringe is not present REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN = 44, ///< Dialysate cap open REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN = 45, ///< Concentrate cap open + REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED = 46, ///< DG disinfect has been expired + REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE = 47, ///< DG service is due + REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE = 48, ///< HD service is due 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