Index: AlarmDefs.h =================================================================== diff -u -r8219c9f20e276239665c0e1ba6ae573c1085aa7d -r68a17e52574cb3864d68d683b0b549fe79cd1178 --- AlarmDefs.h (.../AlarmDefs.h) (revision 8219c9f20e276239665c0e1ba6ae573c1085aa7d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 68a17e52574cb3864d68d683b0b549fe79cd1178) @@ -1,6 +1,6 @@ /**********************************************************************//** * - * Copyright (c) 2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. Index: MsgDefs.h =================================================================== diff -u -rf5d21b7903611d07724a9133628df44670ffdb9d -r68a17e52574cb3864d68d683b0b549fe79cd1178 --- MsgDefs.h (.../MsgDefs.h) (revision f5d21b7903611d07724a9133628df44670ffdb9d) +++ MsgDefs.h (.../MsgDefs.h) (revision 68a17e52574cb3864d68d683b0b549fe79cd1178) @@ -46,8 +46,13 @@ MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE = 0x15, ///< User confirmation of ultrafiltration settings change. MSG_ID_USER_TREATMENT_TIME_CHANGE_REQUEST = 0x16, ///< User request to change treatment duration. MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_REQUEST = 0x17, ///< User request to change blood and dialysate rates. - MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE = 0x18, ///< HD response to user to change blood and dialysate rates. + MSG_ID_USER_BLOOD_DIAL_RATE_CHANGE_RESPONSE = 0x18, ///< HD response to user request to change blood and dialysate rates. MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS = 0x19, ///< HD provides DG with dialysate temperature set points. + MSG_ID_TREATMENT_PARAM_CHANGE_RANGES = 0x1A, ///< HD provides several parameter change ranges as they evolve over treatment duration + MSG_ID_USER_TREATMENT_TIME_CHANGE_RESPONSE = 0x1B, ///< HD response to user request to change treatment duration. + MSG_ID_REQUEST_FW_VERSIONS = 0x1C, ///< UI request for f/w versions. + MSG_ID_HD_VERSION = 0x1D, ///< HD f/w version. + MSG_ID_DG_VERSION = 0x1E, ///< DG f/w version. // service/test CAN messages @@ -96,18 +101,14 @@ MSG_ID_DG_MESSAGE = 0xA001, MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002, MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004, - MSG_ID_LOAD_CELL_A1_OVERRIDE = 0xA005, - MSG_ID_LOAD_CELL_A2_OVERRIDE = 0xA006, - MSG_ID_LOAD_CELL_B1_OVERRIDE = 0xA007, - MSG_ID_LOAD_CELL_B2_OVERRIDE = 0xA008, - + MSG_ID_LOAD_CELL_OVERRIDE = 0xA005, END_OF_MSG_IDS ///< # of system message IDs. } MSG_ID_T; /// Settings change rejection reason codes. typedef enum Request_Reject_Reasons { - REQUEST_REJECT_REASON_NONE = 0, ///< No reason. + 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.