Index: MsgDefs.h =================================================================== diff -u -r108761cd312e0b9b2c1cc73b1df1f07c883049a8 -r93b665b4269f9f1682e82d46e538964d647168e5 --- MsgDefs.h (.../MsgDefs.h) (revision 108761cd312e0b9b2c1cc73b1df1f07c883049a8) +++ MsgDefs.h (.../MsgDefs.h) (revision 93b665b4269f9f1682e82d46e538964d647168e5) @@ -192,6 +192,7 @@ MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE = 0xA0, ///< TD isolated UF confirm response MSG_ID_UI_ADJUST_START_TREATMENT_REQUEST = 0xA1, ///< UI adjust start treatment request MSG_ID_TD_ADJUST_START_TREATMENT_RESPONSE = 0xA2, ///< TD adjust start treatment response + MSG_ID_UI_WATER_SAMPLE_RESULT_REQUEST = 0xA3, ///< UI water sample result request // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID Index: TDDefs.h =================================================================== diff -u -rfadcc7abbe3635d8d6129115edc56ab278e90eb7 -r93b665b4269f9f1682e82d46e538964d647168e5 --- TDDefs.h (.../TDDefs.h) (revision fadcc7abbe3635d8d6129115edc56ab278e90eb7) +++ TDDefs.h (.../TDDefs.h) (revision 93b665b4269f9f1682e82d46e538964d647168e5) @@ -484,6 +484,8 @@ enum Blood_Prime_States { BLOOD_PRIME_RAMP_STATE = 0, ///< Ramp state of the blood prime sub-mode state machine + BLOOD_PRIME_RUN_STATE, ///< Run state of the blood prime sub-mode state machine + BLOOD_PRIME_PAUSED_STATE, ///< Paused state of the blood prime sub-mode state machine NUM_OF_BLOOD_PRIME_STATES ///< Number of blood prime sub-mode states }; /// Type for treatment end states enumeration. @@ -494,8 +496,6 @@ { REQUESTED_USER_ACTION_BLOOD_PRIME_PAUSE = 0, ///< User requests to pause blood prime operation REQUESTED_USER_ACTION_BLOOD_PRIME_RESUME = 1, ///< User requests to resume blood prime operation - REQUESTED_USER_ACTION_BLOOD_PRIME_DECREASE_RATE = 2, ///< User requests to decrease blood flow rate - REQUESTED_USER_ACTION_BLOOD_PRIME_INCREASE_RATE = 3, ///< User requests to increase blood flow rate NUM_OF_REQUESTED_BLOOD_PRIME_USER_ACTIONS ///< Number of requested blood prime user actions }; /// Type for requested user actions enumeration.