Index: AlarmDefs.h =================================================================== diff -u -r45907574a0110204746643f627960946ee7e06b6 -rbbbcc2db1a02f36e1675c0078c3fbdff2f076d69 --- AlarmDefs.h (.../AlarmDefs.h) (revision 45907574a0110204746643f627960946ee7e06b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision bbbcc2db1a02f36e1675c0078c3fbdff2f076d69) @@ -321,6 +321,30 @@ /**@}*/ +/// Alarm properties request payload for CAN broadcast +struct AlarmTableRequestPayload +{ + 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 AlarmTableRequestPayload ALARM_PROP_T; #if defined (__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_FP_C__) @@ -354,6 +378,8 @@ }; typedef struct AlarmsStateRecord ALARM_T; + + /// Record defining the ranking of each individual alarm. struct AlarmsRankRecord { @@ -362,6 +388,7 @@ }; typedef struct AlarmsRankRecord ALARM_RANK_T; + #endif #ifdef __ALARM_MGMT_C__ Index: MsgDefs.h =================================================================== diff -u -redf4f5ef68adcc78927f655dbe6283c5b1e86c40 -rbbbcc2db1a02f36e1675c0078c3fbdff2f076d69 --- MsgDefs.h (.../MsgDefs.h) (revision edf4f5ef68adcc78927f655dbe6283c5b1e86c40) +++ MsgDefs.h (.../MsgDefs.h) (revision bbbcc2db1a02f36e1675c0078c3fbdff2f076d69) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 11-Jun-2026 +* @author (last) Sameer Kalliadan Poyil +* @date (last) 24-Jun-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -211,6 +211,9 @@ 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_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8, ///< UI vitals adjustment request + MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9, ///< TD vitals adjustment response // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -399,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 @@ -415,6 +418,11 @@ MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D, ///< DD substitution pump start stop override request MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_INTERVAL_OVERRIDE_REQUEST = 0xA06E, ///< DD substitution pump broadcast override request MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_RATE_OVERRIDE_REQUEST = 0xA06F, ///< DD substitution pump target speed override request. + 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 @@ -494,6 +502,8 @@ MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A, ///< FP response for boost pump installation status to Dialin MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B, ///< FP conductivity sensor version request MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C, ///< FP conductivity sensor version response + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D, ///< FP conductivity sensor cal request + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E, ///< FP conductivity sensor cal response MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log