Index: AlarmDefs.h =================================================================== diff -u -r83ac225bfa686b4fd1a687c90487ce692e20c0bb -rc63acce6dee4dd95d5e20ca41bf1d1acb34992f0 --- AlarmDefs.h (.../AlarmDefs.h) (revision 83ac225bfa686b4fd1a687c90487ce692e20c0bb) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c63acce6dee4dd95d5e20ca41bf1d1acb34992f0) @@ -1017,7 +1017,7 @@ { 711, ALARM_ID_TD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 715, ALARM_ID_TD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM }, { 716, ALARM_ID_TD_SYRINGE_PUMP_OCCLUSION }, - { 731, ALARM_ID_TD_INVALID_TUBING_SET }, + { 717, ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE }, { 718, ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET }, { 719, ALARM_ID_TD_TUBING_SET_NOT_DETECTED }, { 720, ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT }, @@ -1030,8 +1030,8 @@ { 727, ALARM_ID_TD_ARTERIAL_PRESSURE_DECAY }, { 728, ALARM_ID_TD_ARTERIAL_PRESSURE_LEAK }, { 729, ALARM_ID_TD_ARTERIAL_PRESSURE_RELIEF }, - { 717, ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE }, { 730, ALARM_ID_TD_SYRINGE_PUMP_SYRINGE_EMPTY }, + { 731, ALARM_ID_TD_INVALID_TUBING_SET }, { 745, ALARM_ID_TD_SYRINGE_DETECTED }, { 746, ALARM_ID_TD_RECIRC_TIMEOUT_WARNING }, { 850, ALARM_ID_BATTERY_LOW }, Index: DDDefs.h =================================================================== diff -u -r713db476bacaa86bd5cc37dc6d99dc26bda05c8e -rc63acce6dee4dd95d5e20ca41bf1d1acb34992f0 --- DDDefs.h (.../DDDefs.h) (revision 713db476bacaa86bd5cc37dc6d99dc26bda05c8e) +++ DDDefs.h (.../DDDefs.h) (revision c63acce6dee4dd95d5e20ca41bf1d1acb34992f0) @@ -150,9 +150,12 @@ /// Enumeration of Pre-Gen Dialysate mode states. enum DD_Pre_Gen_Dialysate_States { - 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_WAIT_FOR_FP_GEN = 0, ///< DD Pre-Gen wait for FP state. + DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK, ///< DD Pre-Gen Dialysate hyrochamber fill check DD_PRE_GEN_DRY_BICART_INITIAL_FILL, ///< DD Pre-Gen DryBicart Initial Fill + DD_PRE_GEN_FILL_CHAMBER_F, ///< DD Pre-Gen Prime Chamber F + DD_PRE_GEN_PRIME_BICARB_LINE, ///< DD Pre-Gen Prime Bicarb line + DD_PRE_GEN_PRIME_ACID_LINE, ///< DD Pre-Gen Prime acid line 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 }; @@ -193,6 +196,8 @@ DD_GEND_SPENT_CHAMBER_FILL_STATE, ///< Gen dialysate - spent chamber fill state DD_GEND_BICARB_CHAMBER_FILL_STATE, ///< Gen dialysate - bicarb chamber fill state DD_GEND_DIALYSATE_DELIVERY_PAUSE, ///< Gen dialysate - dialysate delivery pause state + DD_GEND_SPENT_CHAMBER_VALV_OPEN_STATE, ///< Gen dialysate - spent chamber vent open state + DD_GEND_PRIME_FLUID_DISCARD_STATE, ///< Gen dialysate - prime fluid discard state NUM_OF_DD_GEND_MODE_STATES ///< Number of gen dialysate states }; typedef enum DD_GenD_Mode_States DD_GEND_MODE_STATE_T; ///< Type for DD gen dialysate mode states enumeration @@ -344,7 +349,8 @@ DD_EVENT_SERVICE_RECORD_UPDATE, ///< DD NVM Service Record Change Event DD_EVENT_INSTITUTIONAL_RECORD_UPDATE, ///< DD NVM Institutional Record Change Event DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD NVM Usage Info Record Change Event - DD_EVENT_LAST = DD_EVENT_USAGE_INFO_RECORD_UPDATE, ///< DD last event in list + DD_EVENT_PRE_GEN_CHANGE, ///< DD Pre Gen state change + DD_EVENT_LAST = DD_EVENT_PRE_GEN_CHANGE, ///< 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 @@ -561,6 +567,20 @@ }; typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T; ///< Type for dry bicart depressurize exec state enumeration +/// Enumeration of Bicarb chamber pre gen fill exec states. +enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States +{ + PRE_GEN_BICARB_CHAMBER_START_STATE = 0, ///< Initial state of Chamber F fill + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_START_STATE, ///< Dry bicart fill water start state while dialysate delivery + PRE_GEN_BICARB_CARTRIDGE_FILL_WATER_END_STATE, ///< Dry bicart fill water end state while dialysate delivery + PRE_GEN_BICARB_CHAMBER_SUPPLY_STATE, ///< Bicarb Chamber fill start state + PRE_GEN_BICARB_CHAMBER_PRESSURE_CHECK_STATE, ///< Bicarb Chamber pressure check start state + PRE_GEN_BICARB_SUPPLY_VENT_START_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F start state + PRE_GEN_BICARB_SUPPLY_VENT_END_STATE, ///< Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_PRE_GEN_BICARB_CHAMBER_FILL_EXEC_STATES ///< Number of Bicarb chamber fill state +}; +typedef enum Bicarb_Chamber_F_Pre_Gen_Fill_Exec_States BICARB_CHAMBER_PRE_GEN_FILL_EXEC_STATE_T; ///< Type for bicarb chamber fill exec state enumeration + /// Enumeration of conductivity sensors. enum Conductivity_Sensors { Index: MsgDefs.h =================================================================== diff -u -re268f2ae691ea29dc620e05d0bcfa21474620af9 -rc63acce6dee4dd95d5e20ca41bf1d1acb34992f0 --- MsgDefs.h (.../MsgDefs.h) (revision e268f2ae691ea29dc620e05d0bcfa21474620af9) +++ MsgDefs.h (.../MsgDefs.h) (revision c63acce6dee4dd95d5e20ca41bf1d1acb34992f0) @@ -215,6 +215,8 @@ MSG_ID_TD_PRE_TREATMENT_STATES_DATA = 0xB7, ///< TD Pre-Treatment states broadcast data.. 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_TD_PRIME_REQUEST_DATA = 0xC3, ///< TD PreTx prime request to DD + MSG_ID_TD_PRIME_PROGRESS_DATA = 0xC7, ///< TD broadcast of PreTx prime data MSG_ID_UI_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_REQUEST = 0xD6, ///< UI setup connection confirmation request MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE = 0xD7, ///< TD setup connection confirmation response MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8, ///< TD POST final test result @@ -359,6 +361,7 @@ MSG_ID_TD_RINSEBACK_VOLUME_OVERRIDE = 0x8065, ///< TD rinseback volume override MSG_ID_TD_RINSEBACK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8066, ///< TD rinseback publish interval broadcast override. MSG_ID_TD_AIR_PUMP_RPM_OVERRIDE_REQUEST = 0x8067, ///< TD Override request for Air Pump RPM + MSG_ID_TD_PRIME_PUBLISH_INTERVAL_OVERRIDE = 0x8069, ///< TD PreTx 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 @@ -554,15 +557,14 @@ MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045, ///< FP response for defatured status to Dialin MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046, ///< FP set operation sub mode request MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047, ///< FP conductivity sensor resistance override request - MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048, ///< FP request to set recovery valve setting. MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049, ///< FP request for boost pump installation status from Dialin 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 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