Index: AlarmDefs.h =================================================================== diff -u -r22e069cd4dbf1b8de8598fda2c09f2e91fcc609d -rf8100fa58fe0316429448727bd4e244a5581bc72 --- AlarmDefs.h (.../AlarmDefs.h) (revision 22e069cd4dbf1b8de8598fda2c09f2e91fcc609d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision f8100fa58fe0316429448727bd4e244a5581bc72) @@ -86,7 +86,8 @@ ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY = 60, ///< Inlet water conductivity too low. ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 61, ///< Inlet water conductivity too high. ALARM_ID_DG_SOFTWARE_FAULT = 62, ///< DG software fault. Software found itself in an unexpected state. - ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 63, ///< Conductivity sensor fault. + ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 63, ///< Conductivity sensor fault. + ALARM_ID_CRITICAL_DATA_ERROR = 64, ///< A critical data integrity check failed. NUM_OF_ALARM_IDS ///< Total # of alarms. }; /// Type for alarm list enumeration. Index: HDDefs.h =================================================================== diff -u -re9364058a5553af3c5ff14c02ebf5c4d78f528f6 -rf8100fa58fe0316429448727bd4e244a5581bc72 --- HDDefs.h (.../HDDefs.h) (revision e9364058a5553af3c5ff14c02ebf5c4d78f528f6) +++ HDDefs.h (.../HDDefs.h) (revision f8100fa58fe0316429448727bd4e244a5581bc72) @@ -28,16 +28,16 @@ /// Enumeration of operation modes. These are in order of priority (highest to lowest). enum HD_Op_Modes { - MODE_FAUL = 0, ///< Fault mode. - MODE_SERV, ///< Service mode. - MODE_INIT, ///< Initialization & POST mode. - MODE_STAN, ///< Standby mode. - MODE_TPAR, ///< Treatment Parameters mode. - MODE_PRET, ///< Pre-Treatment mode. - MODE_TREA, ///< Treatment mode. - MODE_POST, ///< Post-Treatment mode. - MODE_NLEG, ///< Not legal - an illegale mode transition occurred. - NUM_OF_MODES ///< Number of HD operation modes. + MODE_FAUL = 0, ///< Fault mode + MODE_SERV, ///< Service mode + MODE_INIT, ///< Initialization & POST mode + MODE_STAN, ///< Standby mode + MODE_TPAR, ///< Treatment Parameters mode + MODE_PRET, ///< Pre-Treatment mode + MODE_TREA, ///< Treatment mode + MODE_POST, ///< Post-Treatment mode + MODE_NLEG, ///< Not legal - an illegale mode transition occurred + NUM_OF_MODES ///< Number of HD operation modes }; typedef enum HD_Op_Modes HD_OP_MODE_T; @@ -77,8 +77,8 @@ /// Enumeration of fault mode states. enum HD_Fault_States { - HD_FAULT_STATE_START = 0, ///< Start fault state. - NUM_OF_HD_FAULT_STATES ///< Number of fault mode states. + HD_FAULT_STATE_START = 0, ///< Start fault state + NUM_OF_HD_FAULT_STATES ///< Number of fault mode states }; typedef enum HD_Fault_States HD_FAULT_STATE_T; @@ -98,7 +98,7 @@ STANDBY_WAIT_FOR_PRIME_STATE, ///< STANDBY_FILL_RESERVOIR_STATE, ///< STANDBY_WAIT_FOR_TREATMENT_STATE, ///< - NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes). + NUM_OF_STANDBY_STATES ///< Number of standby states (sub-modes) }; typedef enum HD_Standby_States HD_STANDBY_STATE_T; @@ -112,8 +112,10 @@ /// Enumeration of treatment parameters mode states. enum HD_Treatment_Parameters_Mode_States { - HD_TREATMENT_PARAMS_MODE_STATE_START = 0, ///< Start treatment params mode state. - NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES ///< Number of treatment params mode states. + HD_TREATMENT_PARAMS_MODE_STATE_START = 0, ///< Start treatment params mode state + HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND, ///< Wait for UI to send treatment params mode state + HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM, ///< Wait for UI to confirm treatment params mode state + NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES ///< Number of treatment params mode states }; typedef enum HD_Treatment_Parameters_Mode_States HD_TREATMENT_PARAMS_MODE_STATE_T; @@ -127,8 +129,8 @@ /// Enumeration of pre-treatment mode states. enum HD_Pre_Treatment_Mode_States { - HD_PRE_TREATMENT_STATE_START = 0, ///< Start pre-treatment mode state. - NUM_OF_HD_PRE_TREATMENT_STATES ///< Number of pre-treatment mode states. + HD_PRE_TREATMENT_STATE_START = 0, ///< Start pre-treatment mode state + 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; @@ -167,8 +169,8 @@ /// Enumeration of post-treatment mode states. enum HD_Post_Treatment_Mode_States { - HD_POST_TREATMENT_STATE_START = 0, ///< Start post-treatment mode state. - NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states. + HD_POST_TREATMENT_STATE_START = 0, ///< Start post-treatment mode state + NUM_OF_HD_POST_TREATMENT_STATES ///< Number of post-treatment mode states }; typedef enum HD_Post_Treatment_Mode_States HD_POST_TREATMENT_STATE_T; @@ -182,8 +184,8 @@ /// Enumeration of service mode states. enum HD_Service_States { - HD_SERVICE_STATE_START = 0, ///< Start service mode state. - NUM_OF_HD_SERVICE_STATES ///< Number of service mode states. + HD_SERVICE_STATE_START = 0, ///< Start service mode state + NUM_OF_HD_SERVICE_STATES ///< Number of service mode states }; typedef enum HD_Service_States HD_SERVICE_STATE_T; @@ -197,40 +199,40 @@ /// Enumeration of dialysis sub-mode states. enum Dialysis_States { - DIALYSIS_START_STATE = 0, ///< Start state of the dialysis sub-mode state machine. - DIALYSIS_UF_STATE, ///< Ultrafiltration state of the dialysis sub-mode state machine. - DIALYSIS_SOLUTION_INFUSION_STATE, ///< Solution infusion state of the dialysis sub-mode state machine. - NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states. + DIALYSIS_START_STATE = 0, ///< Start state of the dialysis sub-mode state machine + DIALYSIS_UF_STATE, ///< Ultrafiltration state of the dialysis sub-mode state machine + DIALYSIS_SOLUTION_INFUSION_STATE, ///< Solution infusion state of the dialysis sub-mode state machine + NUM_OF_DIALYSIS_STATES ///< Number of dialysis sub-mode states }; typedef enum Dialysis_States DIALYSIS_STATE_T; /// Enumeration of ultrafiltration states. enum UF_States { - UF_START_STATE = 0, ///< Start state of the ultrafiltration state machine. - UF_PAUSED_STATE, ///< Paused state of the ultrafiltration state machine. - UF_RUNNING_STATE, ///< Running state of the ultrafiltration state machine. - UF_OFF_STATE, ///< Completed/off state of the ultrafiltration state machine. - UF_COMPLETED_STATE, ///< Completed state of ultrafiltration state machine. - NUM_OF_UF_STATES ///< Number of ultrafiltration states. + UF_START_STATE = 0, ///< Start state of the ultrafiltration state machine + UF_PAUSED_STATE, ///< Paused state of the ultrafiltration state machine + UF_RUNNING_STATE, ///< Running state of the ultrafiltration state machine + UF_OFF_STATE, ///< Completed/off state of the ultrafiltration state machine + UF_COMPLETED_STATE, ///< Completed state of ultrafiltration state machine + NUM_OF_UF_STATES ///< Number of ultrafiltration states }; typedef enum UF_States UF_STATE_T; /// Enumeration of system message IDs. enum UF_Commands { - UF_CMD_PAUSE = 0, ///< Pause UF command. - UF_CMD_RESUME, ///< Resume UF command. - NUM_OF_UF_CMDS ///< Number of UF commands. + UF_CMD_PAUSE = 0, ///< Pause UF command + UF_CMD_RESUME, ///< Resume UF command + NUM_OF_UF_CMDS ///< Number of UF commands }; typedef enum UF_Commands UF_CMD_T; /// Enumeration of system message IDs. enum UF_Adjustments { - UF_ADJ_TREATMENT_TIME = 0, ///< Adjust treatment time to achieve new ultrafiltration volume. - UF_ADJ_UF_RATE, ///< Adjust UF rate to achieve new ultrafiltration volume. - NUM_OF_UF_ADJS ///< Number of UF adjustments. + UF_ADJ_TREATMENT_TIME = 0, ///< Adjust treatment time to achieve new ultrafiltration volume + UF_ADJ_UF_RATE, ///< Adjust UF rate to achieve new ultrafiltration volume + NUM_OF_UF_ADJS ///< Number of UF adjustments }; typedef enum UF_Adjustments UF_ADJ_T; Index: MsgDefs.h =================================================================== diff -u -re9364058a5553af3c5ff14c02ebf5c4d78f528f6 -rf8100fa58fe0316429448727bd4e244a5581bc72 --- MsgDefs.h (.../MsgDefs.h) (revision e9364058a5553af3c5ff14c02ebf5c4d78f528f6) +++ MsgDefs.h (.../MsgDefs.h) (revision f8100fa58fe0316429448727bd4e244a5581bc72) @@ -85,7 +85,8 @@ // service/test CAN messages MSG_ID_FIRST_TESTER_MESSAGE = 0x8000, ///< First HD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE, ///< HD tester log-in - MSG_ID_HD_MESSAGE = 0x8001, ///< HD message. TODO - needed? + MSG_ID_HD_MESSAGE = 0x8001, ///< Obsolete - TODO - remove when all references to this ID are deleted + MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001, ///< Dialysate outlet flow set point override request MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002, ///< Off button override request MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003, ///< Stop button override request MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE = 0x8004, ///< Alarm lamp pattern override request