Index: MsgDefs.h =================================================================== diff -u -r9c6f9c0dc74d57ab0350ee19974e72de930876e9 -r1ebd6f2a4f4b1c9d3edd0727422495b471c9429f --- MsgDefs.h (.../MsgDefs.h) (revision 9c6f9c0dc74d57ab0350ee19974e72de930876e9) +++ MsgDefs.h (.../MsgDefs.h) (revision 1ebd6f2a4f4b1c9d3edd0727422495b471c9429f) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Sameer Kalliadan Poyil -* @date (last) 16-Jun-2026 +* @author (last) Praneeth Bunne +* @date (last) 02-Jul-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -402,10 +402,10 @@ MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D, ///< DD conductivity sensor resistance override request MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E, ///< DD conductivity sensor version request MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F, ///< DD conductivity sensor version response - MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060, ///< DD bicarb mix volume control kp gain - MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061, ///< DD bicarb mix volume control ki gain - MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062, ///< DD acid mix volume control kp gain - MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063, ///< DD acid mix volume control kp gain + MSG_ID_DD_BICARB_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060, ///< DD bicarb mix volume control kp gain + MSG_ID_DD_BICARB_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061, ///< DD bicarb mix volume control ki gain + MSG_ID_DD_ACID_MIX_VOL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062, ///< DD acid mix volume control kp gain + MSG_ID_DD_ACID_MIX_VOL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063, ///< DD acid mix volume control kp gain MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064, ///< DD acid mix volume override MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065, ///< DD bicarb mix volume override MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066, ///< DD bicarb target conductivity override @@ -421,6 +421,8 @@ MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070, ///< DD conductivity sensor cal request MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071, ///< DD conductivity sensor cal response MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072, ///< DD mixing control publish data + MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073, ///< DD DD mixing control broadcast data overrride request + MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074, ///< DD dry bicart depressurise overrride request MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in @@ -578,6 +580,7 @@ REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED = 58, ///< Confirmation received without prior validation REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH = 59, ///< Confirmed value does not match validated value REQUEST_REJECT_REASON_INVALID_TREATMENT_SUB_STATE = 60, ///< Request is not allowed in current treatment sub-state + REQUEST_REJECT_REASON_MODALITY_MISMATCH = 61, ///< Mismatched modality (Rx entered vs reatment initiation modality ) 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 Index: TDDefs.h =================================================================== diff -u -r84d7a7d65610fd1f187dd472d5758d66c5359d4b -r1ebd6f2a4f4b1c9d3edd0727422495b471c9429f --- TDDefs.h (.../TDDefs.h) (revision 84d7a7d65610fd1f187dd472d5758d66c5359d4b) +++ TDDefs.h (.../TDDefs.h) (revision 1ebd6f2a4f4b1c9d3edd0727422495b471c9429f) @@ -8,7 +8,7 @@ * @file TDDefs.h * * @author (last) Praneeth Bunne -* @date (last) 04-Jun-2026 +* @date (last) 26-Jun-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -410,8 +410,7 @@ { FLUID_BOLUS_IDLE_STATE = 0, ///< No fluid bolus delivery is in progress FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE, ///< Wait for pumps to stop before starting bolus - FLUID_BOLUS_SALINE_IN_PROGRESS_STATE, ///< A saline bolus delivery is in progress - FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE, ///< A substitute bolus delivery is in progress + FLUID_BOLUS_IN_PROGRESS_STATE, ///< A fluid bolus delivery is in progress NUM_OF_FLUID_BOLUS_STATES ///< Number of fluid bolus states }; typedef enum Fluid_Bolus_States FLUID_BOLUS_STATE_T; ///< Type for fluid bolus state enumeration @@ -699,8 +698,9 @@ /// Enumeration of treatment modality type enum Treatment_Modality_Types { - TREATMENT_MODALITY_HD = 0, ///< Treatment modality Hemodialysis - TREATMENT_MODALITY_HDF, ///< Treatment modality Hemodiafiltration + TREATMENT_MODALITY_HD_SALINE_FLUID = 0, ///< Treatment modality Hemodialysis with saline fluid + TREATMENT_MODALITY_HDF_ONLINE_FLUID, ///< Treatment modality Hemodiafiltration online fluid + TREATMENT_MODALITY_HD_ONLINE_FLUID, ///< Treatment modality Hemodialysis with online fluid // TREATMENT_MODALITY_ISOLATED_UF, ///< Treatment modality Isolated UF // TODO uncomment in phase 3 when ISO UF feature is required NUM_OF_TREATMENT_MODALITY_TYPES ///< Total number of treatment modality types }; @@ -878,6 +878,28 @@ }; typedef enum Confirmation_Status CONFIRMATION_REQUEST_STATUS_T; +///< Enumeration of tube set types. +enum Tube_Set_Types +{ + TUBE_SET_TYPE_UNKNOWN = 0, ///< Unknown tube set type + TUBE_SET_TYPE_HD, ///< HD tubing set + TUBE_SET_TYPE_HDF, ///< HDF tubing set + NUM_OF_TUBE_SET_TYPES ///< Number of tube set types +}; +///< Type for tube set types enumeration +typedef enum Tube_Set_Types TUBE_SET_TYPE_T; + +///< Enumeration of fluid types +enum Fluid_Types +{ + FLUID_TYPE_UNKNOWN = 0, ///< Unknown fluid type + FLUID_TYPE_SALINE, ///< Saline fluid type + FLUID_TYPE_SUBSTITUTE, ///< Substitution fluid type + NUM_OF_FLUID_TYPES +}; +///< Type for fluid types enumeration +typedef enum Fluid_Types FLUID_TYPE_T; + /**@}*/ #endif