Index: MsgDefs.h =================================================================== diff -u -r82e65fa7d95457bc0539ed6ac04d3764de499ad8 -r707f52a4b6b0c16f5d17ec3e964d75262da85c36 --- MsgDefs.h (.../MsgDefs.h) (revision 82e65fa7d95457bc0539ed6ac04d3764de499ad8) +++ MsgDefs.h (.../MsgDefs.h) (revision 707f52a4b6b0c16f5d17ec3e964d75262da85c36) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Varshini Nagabooshanam -* @date (last) 19-Jan-2026 +* @author (last) Michael Garthwaite +* @date (last) 10-Feb-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -141,6 +141,7 @@ MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D, ///< TD date and time response MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E, ///< DD date and time request MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F, ///< DD date and time response + MSG_ID_DD_DRY_BICART_DATA = 0x70, ///< DD dry bicart data MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71, ///< FP broadcast RO Rejection ratio data MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x72, ///< UI pressure limits change request MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x73, ///< TD pressure limits change response @@ -180,6 +181,17 @@ MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0x95, ///< TD adjust disposables removal confirm response MSG_ID_FP_FILTER_FLUSH_DEF_DATA = 0x96, ///< FP Filter Flush Defeatured broadcast data MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA = 0x97, ///< TD broadcast of blood prime progress + MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST = 0x98, ///< UI blood prime command request + MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE = 0x99, ///< TD blood prime command response + MSG_ID_TD_ISOLATED_UF_DATA = 0x9A, ///< TD isolated UF data + MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST = 0x9B, ///< UI isolated UF duration change request + MSG_ID_TD_ISOLATED_UF_DURATION_CHANGE_RESPONSE = 0x9C, ///< TD isolated UF duration change response + MSG_ID_UI_ISOLATED_UF_VOLUME_GOAL_CHANGE_REQUEST = 0x9D, ///< UI isolated UF volume goal change request + MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE = 0x9E, ///< TD isolated UF volume goal change response + MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST = 0x9F, ///< UI isolated UF confirm request + 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 // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -284,7 +296,7 @@ MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA018, ///< DD temperature sensor publish interval override request MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST = 0xA019, ///< DD temperature sensor measured temperature override request MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA01A, ///< DD temperature sensor read counter override request - MSG_ID_DD_AVAILABLE_2 = 0xA01B, ///< DD Msg ID not used - available for use. + MSG_ID_DD_TEMPERATURE_SENSOR_FILTERED_TEMP_OVERRIDE_REQUEST = 0xA01B, ///< DD temperature sensor filtered temperature override request. MSG_ID_DD_AVAILABLE_3 = 0xA01C, ///< DD Msg ID not used - available for use. MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA01D, ///< DD dialysate pumps data publish interval override request MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST = 0xA01E, ///< DD dialysate pumps target speed override request @@ -343,7 +355,18 @@ MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053, ///< DD rinse pump broadcast data override request MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054, ///< DD rinse pump PWM percent override request MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055, ///< DD rinse pump turn on/off request + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA056, ///< DD dry bicart broadcast data overrride request + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA057, ///< DD dry bicart fill cycle max count overrride request + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA058, ///< DD dry bicart fill request overrride request + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059, ///< DD bicarb chamber fill request overrride request + MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A, ///< DD bicarb drain request overrride request + MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B, ///< DD bicarb cartridge select(small-0, large-1) overrride request +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100, ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors ) + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101, ///< DD conductivity sensor resistance override request +#endif + 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 MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001, ///< FP reset request @@ -396,26 +419,30 @@ MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030, ///< FP inlet pressure check data publish interval override request MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031, ///< FP inlet pressure check time override request MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor reading override request - MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor temperature override request - MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033, ///< FP set start stop signal for generate permeate - MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034, ///< FP RO rejection ratio data publish interval override request - MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035, ///< FP override request for filtered all time RO rejection value - MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST = 0xB036, ///< FP Request for calculated RO duty cycle - MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE = 0xB037, ///< DD send calculated duty cycle to Dialin - MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB038, ///< FP filter flush data publish interval override request - MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB039, ///< FP filter flush time override request - MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB040, ///< FP permeate flush data publish interval override request - MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST = 0xB041, ///< FP permeate flush timer override request - MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST = 0xB042, ///< FP permeate alarm timer override request - MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043, ///< FP flush concentrate data publish interval override request - MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST = 0xB044, ///< FP flush concentrate timer override request - MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB045, ///< FP defeatured filter flush data publish interval override request - MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB046, ///< FP defeatured filter flush time override request - MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB047, ///< FP defeatured pre generation data publish interval override request - MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB048, ///< FP defeatured generation data publish interval override request - MSG_ID_FP_DEF_STATUS_REQUEST = 0xB049, ///< FP request for defatured status from Dialin - MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB04A, ///< FP response for defatured status to Dialin + MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB033, ///< FP filtered conductivity sensor temperature override request + MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB034, ///< FP set start stop signal for generate permeate + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB035, ///< FP RO rejection ratio data publish interval override request + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB036, ///< FP override request for filtered all time RO rejection value + MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST = 0xB037, ///< FP Request for calculated RO duty cycle + MSG_ID_FP_RO_CALCULATED_DUTY_CYCLE_RESPONSE = 0xB038, ///< DD send calculated duty cycle to Dialin + MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB039, ///< FP filter flush data publish interval override request + MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB03A, ///< FP filter flush time override request + MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03B, ///< FP permeate flush data publish interval override request + MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST = 0xB03C, ///< FP permeate flush timer override request + MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST = 0xB03D, ///< FP permeate alarm timer override request + MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB03E, ///< FP flush concentrate data publish interval override request + MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST = 0xB03F, ///< FP flush concentrate timer override request + MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB040, ///< FP defeatured filter flush data publish interval override request + MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST = 0xB041, ///< FP defeatured filter flush time override request + MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB042, ///< FP defeatured pre generation data publish interval override request + MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043, ///< FP defeatured generation data publish interval override request + MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044, ///< FP request for defatured status from Dialin + MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045, ///< FP response for defatured status to Dialin +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100, ///< FP conductivity sensor resistance override request +#endif + MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log MSG_ID_FP_DEBUG_EVENT = 0xFFF3, ///< FP debug event text to be logged in event log