Index: DGDefs.h =================================================================== diff -u -r3a8be92b72adc11e5b5045bf8921446d2d5e8e8a -rd82c9506c6d4993b087bb3baecd4ad50367d60f1 --- DGDefs.h (.../DGDefs.h) (revision 3a8be92b72adc11e5b5045bf8921446d2d5e8e8a) +++ DGDefs.h (.../DGDefs.h) (revision d82c9506c6d4993b087bb3baecd4ad50367d60f1) @@ -115,8 +115,10 @@ enum DG_Standby_Mode_States { DG_STANDBY_MODE_STATE_START = 0, ///< Start standby mode state - DG_STANDBY_MODE_STATE_IDLE, ///< Idle standby mode state - DG_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water standby mode state + DG_STANDBY_MODE_STATE_IDLE, ///< Idle standby mode state + DG_STANDBY_MODE_STATE_FLUSH_FILTER, ///< Sample water flush filter state + DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE, ///< Sample water flush filter idle state + DG_STANDBY_MODE_STATE_SAMPLE_WATER, ///< Sample water state NUM_OF_DG_STANDBY_MODE_STATES ///< Number of standby mode states }; typedef enum DG_Standby_Mode_States DG_STANDBY_MODE_STATE_T; ///< Type for DG standby mode states enumeration @@ -273,10 +275,22 @@ DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings + DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration +/// Enumeration of sample water command parameters. +enum Sample_Water_Commands +{ + SAMPLE_WATER_CMD_STOP = 0, ///< Stop sample water command + SAMPLE_WATER_CMD_START, ///< Start sample water command + SAMPLE_WATER_CMD_FLUSH, ///< Flush the filter sample water command + SAMPLE_WATER_CMD_END, ///< End sample water command + NUM_OF_SAMPLE_WATER_CMDS ///< Number of sample water command parameters +}; +typedef enum Sample_Water_Commands SAMPLE_WATER_CMD_T; ///< Type for sample water enum. + /**@}*/ /** Index: HDDefs.h =================================================================== diff -u -r1841f63f8a1715d14809a3edb4e15c5d12ebda86 -rd82c9506c6d4993b087bb3baecd4ad50367d60f1 --- HDDefs.h (.../HDDefs.h) (revision 1841f63f8a1715d14809a3edb4e15c5d12ebda86) +++ HDDefs.h (.../HDDefs.h) (revision d82c9506c6d4993b087bb3baecd4ad50367d60f1) @@ -137,6 +137,26 @@ NUM_OF_HD_PRE_TREATMENT_STATES ///< Number of pre-treatment mode states }; typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T; ///< Type for HD pre-treatment mode states enumeration + +/// Enumeration of sample water sub-mode states. +enum Sample_Water_States +{ + SAMPLE_WATER_SETUP_STATE = 0, ///< Sample water setup state of the sample water sub-mode state machine + SAMPLE_WATER_STATE, ///< Sample water state of the sample water sub-mode state machine + NUM_OF_SAMPLE_WATER_STATES ///< Number of sample water sub-mode states +}; +typedef enum Sample_Water_States SAMPLE_WATER_STATE_T; ///< Type for sample water states enumeration. + + +/// Enumeration of user actions that may be requested from sample water sub-mode. +enum Requested_Sample_Water_User_Actions +{ + REQUESTED_USER_ACTION_SAMPLE_WATER_STOP = 0, ///< User requests to stop sample water + REQUESTED_USER_ACTION_SAMPLE_WATER_START = 1, ///< User requests to start sample water + NUM_OF_REQUESTED_SAMPLE_WATER_USER_ACTIONS ///< Number of requested sample water user actions +}; +/// Type for requested user actions enumeration. +typedef enum Requested_Sample_Water_User_Actions REQUESTED_SAMPLE_WATER_USER_ACTIONS_T; /**@}*/ Index: MsgDefs.h =================================================================== diff -u -r045001177099f5da281ecdcc91b3dbf622e515a2 -rd82c9506c6d4993b087bb3baecd4ad50367d60f1 --- MsgDefs.h (.../MsgDefs.h) (revision 045001177099f5da281ecdcc91b3dbf622e515a2) +++ MsgDefs.h (.../MsgDefs.h) (revision d82c9506c6d4993b087bb3baecd4ad50367d60f1) @@ -88,8 +88,8 @@ 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 data MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B, ///< UI user confirmation of treatment parameters - MSG_ID___AVAILABLE_1 = 0x3C, ///< This msg ID is available for use - MSG_ID___AVAILABLE_2 = 0x3D, ///< This msg ID is available for use + MSG_ID_UI_START_PRIME_REQUEST = 0x3C, ///< UI user has requested to start priming + MSG_ID_HD_START_PRIME_REQUEST_RESPONSE = 0x3D, ///< HD response to user request to start priming MSG_ID_HD_AIR_TRAP_DATA = 0x3E, ///< HD broadcast of air trap data MSG_ID_ALARM_CONDITION_CLEARED = 0x3F, ///< Alarm condition cleared event MSG_ID_UI_ALARM_USER_ACTION = 0x40, ///< UI user has requested an alarm action @@ -120,6 +120,18 @@ MSG_ID_HD_BLOOD_PRIME_PROGRESS = 0x59, ///< HD broadcast of blood prime progress MSG_ID_HD_RECIRC_PROGRESS = 0x5A, ///< HD broadcast of treatment re-circulate progress MSG_ID_DG_CHANGE_VALVE_SETTING_CMD = 0x5B, ///< HD request to DG to change valve setting + MSG_ID_PRE_TREATMENT_STATE = 0x5C, ///< HD broadcast of pre-treatment state + MSG_ID_UI_SAMPLE_WATER_CMD = 0x5D, ///< UI sample water sub-mode user request + MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE = 0x5E, ///< HD sample water sub-mode request response + MSG_ID_UI_SAMPLE_WATER_RESULT = 0x5F, ///< UI sample water result message + MSG_ID_DG_FILTER_FLUSH_PROGRESS = 0x60, ///< DG broadcast of filter flush progress + 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_REQUEST_RESPONSE = 0x65, ///< HD response to user request to continue to treatment + 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -299,6 +311,8 @@ REQUEST_REJECT_REASON_INVALID_COMMAND = 25, ///< Requested user action invalid REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26, ///< The treatment has been completed 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 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