Index: DDDefs.h =================================================================== diff -u -rb1482aba19e14d3d0f46299399448e1bb1ee7fcc -r653a65cc16d7123fd52122ab0814228a7fda20b9 --- DDDefs.h (.../DDDefs.h) (revision b1482aba19e14d3d0f46299399448e1bb1ee7fcc) +++ DDDefs.h (.../DDDefs.h) (revision 653a65cc16d7123fd52122ab0814228a7fda20b9) @@ -137,6 +137,7 @@ { DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0, ///< DD Pre-Gen Dialysate hyrochamber fill check DD_PRE_GEN_WET_SELF_TEST, ///< DD Pre-Gen WetSelf Test + DD_PRE_GEN_DRY_BICART_FILL_CHECK, ///< DD Pre-Gen DryBicart Initial Fill Check DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND, ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition NUM_OF_DD_PRE_GEN_DIALYSATE_STATES ///< Number of Pre-Gen Dialysate mode states }; @@ -379,7 +380,7 @@ D3_VALV, ///< Valve Hydraulics Inlet (D3) D80_VALV, ///< Valve Dry Bicarb (D80) D81_VALV, ///< Valve De-scaler (D81) - D85_VALV, ///< Reserved space mapped for Valve (D85) + D85_VALV, ///< Valve DryBicart vent (D85) LAST_HYD_VALVE = D85_VALV, ///< End of Hydraulics valve of group FIRST_BC_VALVE, ///< Start of Balancing Chamber valve group D23_VALV = FIRST_BC_VALVE, ///< Balancing chamber Valve 1 (D23) @@ -489,4 +490,51 @@ /**@}*/ +/** + * @addtogroup DryBicart + * @{ + */ + +/// Enumeration of DryBicart fill exec states. +enum Dry_Bicart_Fill_Exec_States +{ + DRY_BICART_START_STATE = 0, ///< Initial state of dry bicart fill + DRY_BICART_FILL_WATER_START_STATE, ///< Dry bicart fill start state + DRY_BICART_FILL_WATER_END_STATE, ///< Dry bicart fill end state + DRY_BICART_DEGAS_START_STATE, ///< Dry bicart vent start state + DRY_BICART_DEGAS_END_STATE, ///< Dry bicart vent end state + DRY_BICART_FILL_DURATION_CHECK_STATE, ///< Dry bicart fill duration check state + DRY_BICART_FILL_COMPLETE_STATE, ///< Dry bicart fill complete state + NUM_OF_DRY_BICART_FILL_EXEC_STATES ///< Number of dry bicart fill states +}; +typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration + +/// Enumeration of Bicarb chamber fill exec states. +enum Bicarb_Chamber_F_Fill_Exec_States +{ + BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery + BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery + BICARB_CHAMBER_CHECK_LEVEL_STATE, ///< Bicarb Chamber check level state + BICARB_CHAMBER_FILL_STATE, ///< Bicarb Chamber fill start state + BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state + BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + +//Enumeration of Bicarb chmaber drain mode exec states +enum Dry_Bicart_Drain_Exec_States +{ + DRY_BICART_DRAIN_START_STATE = 0, ///< Initial state of dry bicart drain + DRY_BICART_FLUID_DRAIN_STATE, ///< Dry bicart fluid drain state + DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE, ///< Dry bicart drain duration check state + DRY_BICART_FLUID_DRAIN_END_STATE, ///< Dry bicart drain end state + NUM_OF_DRY_BICART_DRAIN_EXEC_STATES +}; +typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T; ///< Type for dry bicart fill exec state enumeration + +/**@}*/ + #endif Index: MsgDefs.h =================================================================== diff -u -r2de751b9f394d5316981542e3e744e05a088f698 -r653a65cc16d7123fd52122ab0814228a7fda20b9 --- MsgDefs.h (.../MsgDefs.h) (revision 2de751b9f394d5316981542e3e744e05a088f698) +++ MsgDefs.h (.../MsgDefs.h) (revision 653a65cc16d7123fd52122ab0814228a7fda20b9) @@ -1,15 +1,15 @@ /************************************************************************** * -* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file MsgDefs.h * -* @author (last) “rkallala” -* @date (last) 09-Dec-2025 +* @author (last) Michael Garthwaite +* @date (last) 27-Jan-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -143,6 +143,44 @@ 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 + MSG_ID_UI_BOLUS_VOLUME_CHANGE_REQUEST = 0x74, ///< UI bolus volume change request + MSG_ID_TD_BOLUS_VOLUME_CHANGE_RESPONSE = 0x75, ///< TD bolus volume change response + MSG_ID_UI_DURATION_VALIDATE_REQUEST = 0x76, ///< UI duration validation request + MSG_ID_TD_DURATION_VALIDATE_RESPONSE = 0x77, ///< TD duration validation response + MSG_ID_UI_DURATION_CONFIRM_REQUEST = 0x78, ///< UI duration confirm request + MSG_ID_TD_DURATION_CONFIRM_RESPONSE = 0x79, ///< TD duration confirm response + MSG_ID_UI_TREATMENT_SET_POINTS_CHANGE_REQUEST = 0x7A, ///< UI treatment set points change request + MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE = 0x7B, ///< TD treatment set points change response + MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST = 0x7C, ///< UI treatment set point blood flow change request + MSG_ID_TD_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RESPONSE = 0x7D, ///< TD treatment set point blood flow change response + MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST = 0x7E, ///< UI treatment set point dialysate flow change request + MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RESPONSE = 0x7F, ///< TD treatment set point dialysate flow change response + MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST = 0x80, ///< UI treatment set point dialysate temperature change request + MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_RESPONSE = 0x81, ///< TD treatment set point dialysate temperature change response + MSG_ID_TD_INSTITUTIONAL_RECORD_REQUEST = 0x82, ///< TD institutional record request + MSG_ID_TD_INSTITUTIONAL_RECORD_RESPONSE = 0x83, ///< TD institutional record response + MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_REQUEST = 0x84, ///< TD adjust institutional record request + MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_RESPONSE = 0x85, ///< TD adjust institutional record response + MSG_ID_TD_ADVANCED_INSTITUTIONAL_RECORD_REQUEST = 0x86, ///< TD advanced institutional record request + MSG_ID_TD_ADVANCED_INSTITUTIONAL_RECORD_RESPONSE = 0x87, ///< TD advanced institutional record response + MSG_ID_TD_ADVANCED_ADJUST_INSTITUTIONAL_RECORD_REQUEST = 0x88, ///< TD advanced institutional record request + MSG_ID_TD_ADVANCED_ADJUST_INSTITUTIONAL_RECORD_RESPONSE = 0x89, ///< TD advanced institutional record response + MSG_ID_TD_HEPARIN_REQUEST = 0x8A, ///< TD heparin request + MSG_ID_TD_HEPARIN_RESPONSE = 0x8B, ///< TD heparin response + MSG_ID_TD_HEPARIN_DATA = 0x8C, ///< TD heparin data + MSG_ID_TD_END_TREATMENT_REQUEST = 0x8D, ///< TD end treatment request + MSG_ID_TD_END_TREATMENT_RESPONSE = 0x8E, ///< TD end treatment response + MSG_ID_TD_RINSEBACK_PROGRESS = 0x8F, ///< TD rinseback progress + MSG_ID_UI_RINSEBACK_CMD_REQUEST = 0x90, ///< UI rinseback request + MSG_ID_TD_RINSEBACK_CMD_RESPONSE = 0x91, ///< TD rinseback response + MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST = 0x92, ///< UI adjust disposables confirm request + MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE = 0x93, ///< TD adjust disposables confirm response + MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST = 0x94, ///< UI adjust disposables removal confirm request + 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 // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -214,6 +252,9 @@ MSG_ID_TD_BARO_PRESSURE_OVERRIDE = 0x8041, ///< TD barometric pressure sensor override. MSG_ID_TD_TEMPERATURE_OVERRIDE = 0x8042, ///< TD temperature sensor override. MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8043, ///< TD temperature sensor publish interval broadcast override. + MSG_ID_TD_EJECTOR_OPT_SENSOR_OVERRIDE_REQUEST = 0x8044, ///< TD ejector optical sensor override. + MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x8045, ///< TD blood prime override. + MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8046, ///< TD blood prime publish interval broadcast override. 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 @@ -299,13 +340,16 @@ MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050, ///< DD filtered conductivity sensor temperature override request MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051, ///< DD monitored voltage data publish interval override request MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052, ///< DD monitored voltage override request - MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053, ///< DD Rinse pump broadcast data overrride request - MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA054, ///< DD dry bicart broadcast data overrride request - MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA055, ///< DD dry bicart fill cycle max count overrride request - MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA056, ///< DD dry bicart fill request overrride request - MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA057, ///< DD bicarb chamber fill request overrride request - MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA058, ///< DD bicarb drain request overrride request - MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA059, ///< DD bicarb cartridge select(small-0, large-1) overrride request + 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_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA056, ///< DD set conductivity model to conductivity sensors ( also applies to FP conductivity sensors ) + MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA057, ///< DD dry bicart broadcast data overrride request + MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA058, ///< DD dry bicart fill cycle max count overrride request + MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059, ///< DD dry bicart fill request overrride request + MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA05A, ///< DD bicarb chamber fill request overrride request + MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05B, ///< DD bicarb drain request overrride request + MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05C, ///< DD bicarb cartridge select(small-0, large-1) 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 @@ -363,6 +407,21 @@ 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_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