Index: AlarmDefs.h
===================================================================
diff -u -rf82d5490b34b79f8410b1852139f7f3748b38e61 -rec3513b4b94dc88a677fd42667dcca3491a5e54d
--- AlarmDefs.h (.../AlarmDefs.h) (revision f82d5490b34b79f8410b1852139f7f3748b38e61)
+++ AlarmDefs.h (.../AlarmDefs.h) (revision ec3513b4b94dc88a677fd42667dcca3491a5e54d)
@@ -7,8 +7,8 @@
*
* @file AlarmDefs.h
*
-* @author (last) Varshini Nagabooshanam
-* @date (last) 18-Jun-2026
+* @author (last) Santhosh Reddy
+* @date (last) 07-Jul-2026
*
* @author (original) Sean Nash
* @date (original) 01-Aug-2024
@@ -229,7 +229,8 @@
ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE = 197, ///< DD D92 pump rpm out of range
ALARM_ID_TD_PRIME_COMPLETED_MEDIUM = 198, ///< TD prime completed medium priority alarm
ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS = 199, ///< TD repeated air trap lower events
- ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE = 200, ///< TD Pre-Treatment Load Heparin Syringe
+ ALARM_ID_TD_TUBE_SET_MISMATCH = 200, ///< TD tubeset mismatch alarm
+ ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE = 201, ///< TD Pre-Treatment Load Heparin Syringe
NUM_OF_ALARM_IDS ///< Number of alarms
};
typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration
@@ -322,6 +323,30 @@
/**@}*/
+/// Alarm properties request payload for CAN broadcast
+struct AlarmTableResponsePayload
+{
+ U08 alarmPriority; ///< Priority of alarm
+ U16 alarmSubRank; ///< Alarm's rank within it's priority
+ U08 alarmSource; ///< Alarm's sub system source
+ U08 alarmIsFault; ///< Alarm is a system fault?
+ U08 alarmIsDDFault; ///< Alarm is a fault for DD?
+ U08 alarmStops; ///< Alarm activation should cause a controlled stop
+ U08 alarmConditionClearImmed; ///< Alarm condition is cleared immediately (does not persist after alarm triggered)
+ U08 alarmNoClear; ///< Alarm cannot be cleared (unrecoverable)?
+ U08 alarmNoResume; ///< Alarm prevents treatment resume
+ U08 alarmNoRinseback; ///< Alarm prevents rinseback
+ U08 alarmNoEndTreatment; ///< Alarm prevents ending treatment
+ U08 alarmBlockRinseback; ///< Alarm should not trigger while in rinseback states
+ U08 alarmBlockEndTx; ///< Alarm should not trigger while in post-treatment mode
+ U08 alarmNoBloodRecirc; ///< Alarm prevents blood re-circulation
+ U08 alarmNoDialysateRecirc; ///< Alarm prevents dialysate re-circulation
+ U08 alarmAutoResume; ///< Alarm should resume automatically once the condition is cleared
+ U08 alarmClearOnly; ///< Clear only this alarm on user acknowledgment
+ U08 alarmTreatmentLog; ///< Log alarm to treatment log if active during treatment
+ U16 alarmID; ///< Alarm ID
+};
+typedef struct AlarmTableResponsePayload ALARM_PROP_T;
#if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__)
@@ -355,6 +380,8 @@
};
typedef struct AlarmsStateRecord ALARM_T;
+
+
/// Record defining the ranking of each individual alarm.
struct AlarmsRankRecord
{
@@ -363,6 +390,7 @@
};
typedef struct AlarmsRankRecord ALARM_RANK_T;
+
#endif
#ifdef __ALARM_MGMT_C__
@@ -561,7 +589,6 @@
{ ALARM_PRIORITY_LOW, 745, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_DETECTED },
{ ALARM_PRIORITY_LOW, 715, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM },
{ ALARM_PRIORITY_LOW, 716, ALM_SRC_TD, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION },
- { ALARM_PRIORITY_LOW, 717, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE },
{ ALARM_PRIORITY_HIGH, 10, ALM_SRC_TD, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, ALARM_ID_TD_SYRINGE_PUMP_PRIME_TIMEOUT },
{ ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_P9_COND_SENSOR_FPGA_FAULT },
{ ALARM_PRIORITY_HIGH, 110, ALM_SRC_FP, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_FP_P18_COND_SENSOR_FPGA_FAULT },
@@ -578,6 +605,8 @@
{ ALARM_PRIORITY_HIGH, 110, ALM_SRC_DD, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE },
{ ALARM_PRIORITY_MEDIUM, 590, ALM_SRC_TD, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_TD_PRIME_COMPLETED_MEDIUM },
{ ALARM_PRIORITY_HIGH, 17, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS },
+ { ALARM_PRIORITY_MEDIUM, 300, ALM_SRC_TD, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TD_TUBE_SET_MISMATCH },
+ { ALARM_PRIORITY_LOW, 717, ALM_SRC_TD, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE },
}; // Priority Rank Source Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr AutoRes ClrOnly TxLog ID
/// Table of alarms and their rank.
@@ -744,6 +773,7 @@
{ 291, ALARM_ID_TD_BLOOD_PRIME_PAUSE_TIMEOUT },
{ 292, ALARM_ID_TD_BLOOD_PRIME_PAUSE_WARNING },
{ 300, ALARM_ID_TD_TREATMENT_STOPPED_BY_USER },
+ { 300, ALARM_ID_TD_TUBE_SET_MISMATCH },
{ 401, ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP },
{ 401, ALARM_ID_DD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP },
{ 402, ALARM_ID_DD_DIALYSATE_TEMP_BELOW_TARGET_TEMP },
@@ -1013,7 +1043,8 @@
{ 197 , ALARM_ID_DD_D92_PUMP_RPM_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Subtitution Pump Fault | DD substitution pump RPM out of range | If the substitution pump RPM > 20.0 of the target RPM. | "},
{ 198 , ALARM_ID_TD_PRIME_COMPLETED_MEDIUM , "TD | Prime Complete - 30 MIN WARNING | The priming process completed 90 minutes ago. \n- Treatment must begin within 30 minutes or the\npre-treatment process will be terminated.\n- Press Resume/OK to continue. | Process: Pre-Tx Prime Complete | TD prime completed medium priority alarm | In Pre-Treatment Recirculation for 90 minutes | "},
{ 199 , ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS , "TD | Blood Pump Stopped: Venous Air Detector | The air trap level required repeated lowering events. \n- Confirm blood tubing connections are secure.\n- Inspect the air trap for abnormal fluid levels. \n- Resume treatment if the condition has been corrected. | Blood Stop: Repeated Air Trap Lower | Repeated air trap lower events detected during treatment | If 5 air trap lower events occur within 5 minutes during treatment. | "},
- { 200 , ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE , "UI TD | Load Syringe | Fill syringe with 4mL of heparin.\n- Connect heparin filled syringe to infusion port.\n- Insert syringe into the syringe pump.\n- Lock heparin syringe in place.\n- Unclamp heparin pinch clamp. | Process: Pre-Tx Load Syringe | User must load the heparin syringe before continuing heparin setup. | While in Pre-Treatment: Heparin Setup: Await Syringe Load Confirmation state. | "},
+ { 200 , ALARM_ID_TD_TUBE_SET_MISMATCH , "TD | Wrong Tube Set Installed | The installed tube set does not match the selected treatment type. \n- Remove the current tube set.\n- Install the correct tube set for the selected treatment:\n HD or HD with Online Fluid requires an HD tube set.\n HDF requires an HDF tube set. | TD Tube Set Mismatch | TD installed tube set type does not match the selected treatment modality | If the scanned tube set type does not match the tube set type required for the selected treatment modality. | "},
+ { 201 , ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE , "UI TD | Load Syringe | Fill syringe with 4mL of heparin.\n- Connect heparin filled syringe to infusion port.\n- Insert syringe into the syringe pump.\n- Lock heparin syringe in place.\n- Unclamp heparin pinch clamp. | Process: Pre-Tx Load Syringe | User must load the heparin syringe before continuing heparin setup. | While in Pre-Treatment: Heparin Setup: Await Syringe Load Confirmation state. | "},
};
#endif // manual alarms
Index: DDDefs.h
===================================================================
diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -rec3513b4b94dc88a677fd42667dcca3491a5e54d
--- DDDefs.h (.../DDDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3)
+++ DDDefs.h (.../DDDefs.h) (revision ec3513b4b94dc88a677fd42667dcca3491a5e54d)
@@ -7,8 +7,8 @@
*
* @file DDDefs.h
*
-* @author (last) Sameer Kalliadan Poyil
-* @date (last) 24-Jun-2026
+* @author (last) Santhosh Reddy
+* @date (last) 06-Jul-2026
*
* @author (original) Sean Nash
* @date (original) 01-Aug-2024
@@ -333,7 +333,12 @@
DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES, ///< DD blood leak number of setpoint check failures
DD_EVENT_CPU_RAM_ERROR_STATUS, ///< DD CPU RAM error
DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD blood leak self test result
- DD_EVENT_LAST = DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, ///< DD last event in list
+ DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE, ///< DD Balancing Chamber Switching Only status event
+ DD_EVENT_BC_STATE_CHANGE, ///< Balancing chamber state switch event
+ DD_EVENT_HEATER_STATE_CHANGE, ///< DD heater state change event
+ DD_EVENT_DRY_BICART_STATE_CHANGE, ///< DD Dry Bicart State change event
+ DD_EVENT_UF_PUMP_ON_OFF, ///< DD UltraFiltration State change event
+ DD_EVENT_LAST = DD_EVENT_UF_PUMP_ON_OFF, ///< DD last event in list
FP_EVENT_STARTUP, ///< FP startup event
FP_EVENT_FIRST = FP_EVENT_STARTUP, ///< FP first event in list
FP_EVENT_OP_MODE_CHANGE, ///< FP Op mode change event
@@ -472,22 +477,6 @@
/**@}*/
/**
- * @addtogroup Ultrafiltraion
- * @{
- */
-
-/// Enumeration of ultra filtration exec states.
-enum Ultra_filtration_Exec_States
-{
- DD_UF_PAUSED = 0, ///< Ultrafiltration pasued state
- DD_UF_RUNNING, ///< Ultrafiltration running state
- NUM_OF_UF_EXEC_STATES ///< Number of ultrafiltration exec states
-};
-typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T; ///< Type for ultrafiltration exec state enumeration
-
-/**@}*/
-
-/**
* @addtogroup SpentChamberFill
* @{
*/
Index: MsgDefs.h
===================================================================
diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -rec3513b4b94dc88a677fd42667dcca3491a5e54d
--- MsgDefs.h (.../MsgDefs.h) (revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3)
+++ MsgDefs.h (.../MsgDefs.h) (revision ec3513b4b94dc88a677fd42667dcca3491a5e54d)
@@ -8,8 +8,8 @@
*
* @file MsgDefs.h
*
-* @author (last) Sameer Kalliadan Poyil
-* @date (last) 24-Jun-2026
+* @author (last) Santhosh Reddy
+* @date (last) 08-Jul-2026
*
* @author (original) Sean Nash
* @date (original) 01-Aug-2024
@@ -114,8 +114,8 @@
MSG_ID_DD_SERIAL_RESPONSE = 0x52, ///< DD response to UI serial request
MSG_ID_TD_TEMPERATURE_DATA = 0x53, ///< TD Temperature broadcast data
MSG_ID_TD_BATTERY_DATA = 0x54, ///< TD Battery broadcast data
- MSG_ID_FP_FILTER_FLUSH_DATA = 0x55, ///< FP Filter Flush broadcast data
- MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56, ///< FP Permeate Flush broadcast data
+ MSG_ID_UI_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0x55, ///< UI requests patient disconnect confirmation.
+ MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0x56, ///< TD response to patient disconnect confirmation request.
MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57, ///< FP Concentrate Flush broadcast data
MSG_ID_FP_GENP_DEF_DATA = 0x58, ///< FP Generate Permeate Defeatured broadcast data
MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59, ///< FP Pre Generate Permeate Defeatured broadcast data
@@ -200,20 +200,27 @@
MSG_ID_TD_RECIRCULATE_DATA = 0xA8, ///< TD recirculate data
MSG_ID_UI_ADJUST_TREATMENT_LOGS_REQUEST = 0xA9, ///< UI adjust treatment logs request.
MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA, ///< TD adjust treatment logs response
- MSG_ID_UI_ADJUST_PATIENT_DISCONNECT_CONFIRM_REQUEST = 0xAB, ///< UI adjust patient disconnect confirm request
- MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE = 0xAC, ///< TD adjust patient disconnect confirm response
- MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD, ///< TD dry self test progress data
- MSG_ID_TD_TUBING_SET_BARCODE_SCAN_REQUEST = 0xAE, ///< TD tube set authentication request
+ MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB, ///< UI water sample result response
+ MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC, ///< TD broadcast water sample data
+ MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD, ///< TD broadcast of treatment log average data
+ MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE, ///< TD dry self test progress data
MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF, ///< UI tube set authentication acknowledge request
MSG_ID_TD_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0, ///< TD tube set authentication acknowledge response
MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1, ///< TD broadcast of syringe pump data
MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2, ///< TD response to pause/resume Heparin delivery request
MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3, ///< FFU signal TD update is available.
MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4, ///< FFU signal DD update is available.
- MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5, ///< DD substitution pump broadcast data.
- MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xB6, ///< DD conductivity resistance data broadcast.
+ MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST = 0xB5, ///< TD request for generic UI confirmation.
+ MSG_ID_UI_GENERIC_CONFIRMATION_RESULT_RESPONSE = 0xB6, ///< UI generic confirmation result to TD.
+ MSG_ID_AVAILABLE_B7 = 0xB7, ///< Msg ID not used - available for use.
MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request
MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response
+ MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB, ///< DD substitution pump broadcast data.
+ MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC, ///< DD conductivity resistance data broadcast.
+ MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD, ///< FP Filter Flush broadcast data
+ MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE, ///< FP Permeate Flush broadcast data
+ MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6,
+ MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0XD7,
// service/test CAN messages
MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID
@@ -302,6 +309,8 @@
MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058, ///< TD syringe pump ADC read counter override request
MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059, ///< TD heparin bolus target rate override request
MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060, ///< TD set syringe pump force sensor DAC calibration request
+ MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061, ///< TD send alarm table properties request
+ MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062, ///< TD send alarm table properties response to Dialin
MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID
MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in
@@ -312,8 +321,8 @@
MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005, ///< DD valve sensed state override request
MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006, ///< DD pressure sensor override request
MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007, ///< DD pressure sensor temperature override request
- MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008, ///< DD Treatment parameters override request
- MSG_ID_AVAILABLE_3 = 0xA009, ///< DD Msg ID not used - available for use.
+ MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008, ///< DD pressure sensor read counter override request
+ MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009, ///< DD pressure sensor error counter override request
MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A, ///< DD pressure sensor publish interval override request
MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B, ///< DD pressure sensor filter readings override request
MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xA00C, ///< DD pressure sensor filter temperature override request
@@ -346,7 +355,7 @@
MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027, ///< DD TD CAN Communication status override request
MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028, ///< DD operation mode status override request
MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029, ///< DD set new operation mode override request
- MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD ultrafiltration data publish interval override request
+ MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02A, ///< DD ultrafiltration data publish interval override request
MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B, ///< DD dialysate pumps start/stop override request
MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C, ///< DD generate dialysate mode data publish interval override request
MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D, ///< DD Concentrate pumps start/stop override request
@@ -421,6 +430,7 @@
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_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA075, ///< DD Treatment parameters override 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
@@ -533,7 +543,7 @@
REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM = 13, ///< Treatment time change is less than minimum treatment time
REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS = 14, ///< Ultrafiltration is not currently in progress
REQUEST_REJECT_REASON_UF_NOT_PAUSED = 15, ///< Ultrafiltration is not currently paused
- REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS = 16, ///< A fluid bolus is in progress
+ REQUEST_REJECT_REASON_FLUID_BOLUS_IN_PROGRESS = 16, ///< A fluid bolus is in progress
REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range
REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED = 18, ///< Filter flush time has been expired
REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 19, ///< Saline bolus volume maximum has been reached - no more saline allowed
@@ -578,6 +588,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 -r36ee59a069768e02031d4e0777a0faf74a7d751b -rec3513b4b94dc88a677fd42667dcca3491a5e54d
--- TDDefs.h (.../TDDefs.h) (revision 36ee59a069768e02031d4e0777a0faf74a7d751b)
+++ TDDefs.h (.../TDDefs.h) (revision ec3513b4b94dc88a677fd42667dcca3491a5e54d)
@@ -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
@@ -413,8 +413,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
@@ -702,8 +701,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
};
@@ -881,6 +881,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