Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r7efa0b84d6965d90fff88717846b96fa3b18d292 -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 7efa0b84d6965d90fff88717846b96fa3b18d292) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -48,6 +48,11 @@ /// Initial offset used to stagger the Pre-Treatment state data broadcast. #define PRE_TREATMENT_STATE_DATA_PUB_INITIAL_OFFSET 5U +#define PRE_TX_DEFAULT_QD_ML_MIN 400 ///< Default dialysate flow rate during recirculation when Rx is not entered in mL/min. +#define PRE_TX_INTERMEDIATE_QD_ML_MIN 300 ///< Intermediate dialysate flow rate for low prescribed Qd in mL/min. +#define PRE_TX_LOW_QD_THRESHOLD_ML_MIN 200 ///< Maximum prescribed Qd requiring the intermediate Qd transition in mL/min. +#define PRE_TX_LOW_QD_TRANSITION_TIME_MS ( 4 * SEC_PER_MIN * MS_PER_SECOND ) ///< Low Qd transition time before applying the prescribed Qd in milliseconds. + // ********** private data ********** static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState; ///< Current Pre-Treatment sub-state @@ -57,20 +62,25 @@ static BOOL treatmentStartRequested; ///< Flag indicating the UI requested treatment start. static U32 preTreatmentStateBroadcastTimerCtr; ///< Pre-Treatment state data broadcast timer counter. static OVERRIDE_U32_T preTreatmentStatePublishInterval; ///< Pre-Treatment state data publication interval override. +static BOOL lowQdTransitionActive; ///< Flag indicating low Qd transition is active. +static U32 lowQdTransitionStartTime; ///< Start time of the low Qd transition. +static BOOL defaultQdApplied; ///< Flag indicating default Qd has been applied while Rx is unavailable. +static BOOL preTreatmentRxUpdated; ///< Flag indicating a new or updated Rx was received. static BOOL resumePreTxAlarmResponseRequest; ///< Flag indicates user has requested PreTx resume. // ********** private function prototypes ********** -static void setPreTreatStateTransition( void ); ///< Configure actuators and variables for Pre-Treatment state transitions. -static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void ); ///< Handle Install state during Pre-Treatment -static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void ); ///< Handle Self Test Dry state during Pre-Treatment -static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void ); ///< Handle Prime state during Pre-Treatment -static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void ); ///< Handle Recirculate state during Pre-Treatment -static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void ); ///< Handle Confirm Rx state during Pre-Treatment -static TD_PRE_TREATMENT_MODE_STATE_T handleHeparinSetupState( void ); ///< Handle Heparin Setup state during Pre-Treatment. -static TD_PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void ); ///< Handle Patient Connection state during Pre-Treatment -static void publishPreTreatmentStates( void ); ///< Publish Pre-Treatment states to the UI. +static void setPreTreatStateTransition( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handleInstallState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestDryState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handlePrimeState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handleRecirculateState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handleRxState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handleHeparinSetupState( void ); +static TD_PRE_TREATMENT_MODE_STATE_T handlePatientConnectionState( void ); +static void handlePreTreatmentQdTransition( void ); +static void publishPreTreatmentStates( void ); /*********************************************************************//** * @brief @@ -91,6 +101,10 @@ continueFromRecirculateRequested = FALSE; continueFromHeparinSetupRequested = FALSE; treatmentStartRequested = FALSE; + lowQdTransitionActive = FALSE; + lowQdTransitionStartTime = 0U; + defaultQdApplied = FALSE; + preTreatmentRxUpdated = FALSE; preTreatmentStateBroadcastTimerCtr = PRE_TREATMENT_STATE_DATA_PUB_INITIAL_OFFSET; preTreatmentStatePublishInterval = (OVERRIDE_U32_T) @@ -184,6 +198,10 @@ break; } + if ( currentPreTreatmentState > TD_PRE_TREATMENT_PRIME_STATE ) + { + handlePreTreatmentQdTransition(); + } if ( prevPreTreatmentState != currentPreTreatmentState ) { setPreTreatStateTransition(); @@ -400,6 +418,10 @@ F32 bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR; F32 presUFVolumeL = 0.0F; F32 presUFRateMlMin = 0.0F; + U32 prescribedQd = 0U; + F32 prescribedDialTemp = 0.0F; + F32 ddQd = 0.0F; + F32 ddDialTemp = 0.0F; U32 ddSubMode = getDDSubMode(); TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_CONFIRM_RX_STATE; DD_OP_MODE_T ddOpMode = getDDOpMode(); @@ -411,9 +433,23 @@ { presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ); presUFRateMlMin = ( presUFVolumeL * (F32)ML_PER_LITER ) / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ); + prescribedQd = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); + prescribedDialTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ); + + ddQd = (F32)prescribedQd; + ddDialTemp = prescribedDialTemp; + + if ( ( prescribedQd <= PRE_TX_LOW_QD_THRESHOLD_ML_MIN ) && + ( ( TRUE == lowQdTransitionActive ) || ( TRUE == preTreatmentRxUpdated ) ) ) + { + ddQd = (F32)PRE_TX_INTERMEDIATE_QD_ML_MIN; + ddDialTemp = prescribedDialTemp + 1.0F; + } + // Direct DD to generate dialysate and bypass while priming blood - cmdStartGenerateDialysate( (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFRateMlMin, - 0, //getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), //TODO: Update temperature with tx param temp when we are ready + cmdStartGenerateDialysate( ddQd, + presUFRateMlMin, + ddDialTemp, TRUE, getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ), bicarbConvFactor, @@ -458,6 +494,73 @@ /*********************************************************************//** * @brief + * The handlePreTreatmentQdTransition function manages the dialysate flow + * and temperature transition after priming is complete. + * @details \b Inputs: preTreatmentRxUpdated, lowQdTransitionActive, + * lowQdTransitionStartTime, defaultQdApplied, treatment parameters. + * @details \b Outputs: preTreatmentRxUpdated, lowQdTransitionActive, + * lowQdTransitionStartTime, defaultQdApplied, dialysate flow rate, + * dialysate target temperature. + * @return none. + *************************************************************************/ +static void handlePreTreatmentQdTransition( void ) +{ + U32 prescribedQd; + F32 prescribedDialTemp; + + if ( TRUE != getValidTreatParamsReceived() ) + { + if ( TRUE != defaultQdApplied ) + { + cmdChangeQd( PRE_TX_DEFAULT_QD_ML_MIN ); + defaultQdApplied = TRUE; + } + } + else + { + prescribedQd = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); + prescribedDialTemp = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ); + + if ( TRUE == preTreatmentRxUpdated ) + { + preTreatmentRxUpdated = FALSE; + defaultQdApplied = FALSE; + + if ( prescribedQd <= PRE_TX_LOW_QD_THRESHOLD_ML_MIN ) + { + if ( TRUE != lowQdTransitionActive ) + { + cmdChangeQd( PRE_TX_INTERMEDIATE_QD_ML_MIN ); + + lowQdTransitionStartTime = getMSTimerCount(); + lowQdTransitionActive = TRUE; + } + + cmdChangeDialysateTemperature( prescribedDialTemp + 1.0F ); + } + else + { + cmdChangeQd( prescribedQd ); + cmdChangeDialysateTemperature( prescribedDialTemp ); + + lowQdTransitionActive = FALSE; + } + } + + if ( ( TRUE == lowQdTransitionActive ) && + ( TRUE == didTimeout( lowQdTransitionStartTime, + PRE_TX_LOW_QD_TRANSITION_TIME_MS ) ) ) + { + cmdChangeQd( prescribedQd ); + cmdChangeDialysateTemperature( prescribedDialTemp ); + + lowQdTransitionActive = FALSE; + } + } +} + +/*********************************************************************//** + * @brief * The PreTxRequestTubeSetInstall function signals a request to transition * the Pre-Treatment mode state machine to Install state. * @details \b Inputs: none @@ -559,6 +662,19 @@ /*********************************************************************//** * @brief + * The signalPreTreatmentRxUpdated function signals that a new or updated + * treatment prescription has been received during Pre-Treatment. + * @details \b Inputs: none. + * @details \b Outputs: preTreatmentRxUpdated. + * @return none. + *************************************************************************/ +void signalPreTreatmentRxUpdated( void ) +{ + preTreatmentRxUpdated = TRUE; +} + +/*********************************************************************//** + * @brief * The signalAlarmActionToPreTreatmentMode function executes the given alarm action * as appropriate while in Pre-Treatment Mode. * @details \b Inputs: currentPreTreatmentState and current Heparin Setup sub-state. Index: firmware/App/Modes/ModePreTreat.h =================================================================== diff -u -r08fdaaf70ab5133cbe7d019905f745074a756027 -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision 08fdaaf70ab5133cbe7d019905f745074a756027) +++ firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -46,6 +46,7 @@ void PreTxRequestContinueFromHeparinSetupRequested(void ); // Request Pre-Treatment mode to transition to Patient Connection state. BOOL handleStartTreatmentRequest ( MESSAGE_T *message ); // Handle UI request to start treatment. BOOL signalPreTreatmentBackoutToStandby( void ); // Request transition from Pre-Treatment Install: Await Confirmation to Standby. +void signalPreTreatmentRxUpdated( void ); // Signal that a new or updated Rx was received. BOOL testPreTreatmentStatePublishIntervalOverride( MESSAGE_T *message ); Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r58a7b4b8b4d84c2b1467236f38cb7d9bc98c988e -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 58a7b4b8b4d84c2b1467236f38cb7d9bc98c988e) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -7,26 +7,32 @@ * * @file ModeStandby.c * -* @author (last) Varshini Nagabooshanam -* @date (last) 14-Aug-2026 +* @author (last) suresh +* @date (last) 18-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 * ***************************************************************************/ +#include "AirPump.h" #include "AirTrap.h" #include "BloodFlow.h" +#include "Bubbles.h" #include "Buttons.h" +#include "Compatible.h" #include "DDInterface.h" #include "Messaging.h" +#include "ModeInitPOST.h" +#include "ModePostTreat.h" #include "ModePreTreat.h" -#include "ModeTreatment.h" #include "ModeStandby.h" +#include "ModeTreatment.h" #include "OperationModes.h" #include "Switches.h" #include "SyringePump.h" #include "SystemCommTD.h" +#include "SyringePump.h" #include "TxParams.h" #include "Valve3Way.h" #include "Valves.h" @@ -53,6 +59,7 @@ static TD_STANDBY_STATE_T handleStandbyModeStartState( void ); static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void ); +static void setStandbyStateTransition( void ); /*********************************************************************//** * @brief @@ -80,22 +87,24 @@ *************************************************************************/ U32 transitionToStandbyMode( void ) { - TD_OP_MODE_T previousOpMode = getPreviousOperationMode(); + TD_OP_MODE_T previousOpMode = getPreviousOperationMode(); //TODO +// U08 requestPayload[3] = { 0U, 0U, 0U }; // Re-initialize when transitioning to standby mode initStandbyMode(); resetDDInterface(); + resetAirTrap(); + resetBloodPumpRotorCount(); + resetPreLoadStatus(); + setVenousBubbleDetectionEnabled( H18_BBLD, FALSE ); setCurrentSubState( NO_SUB_STATE ); +// clearNoRetriggerFlag(); // Alarm flag // Set user alarm recovery actions allowed in this mode setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE ); - // Pumps should be off - signalBloodPumpHardStop(); -// stopSyringePump(); - // Set valves to default positions set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE ); set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE ); @@ -107,12 +116,19 @@ { setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); } - + // Standby currently supports Start and Wait For Treatment states. + currentStandbyState = STANDBY_START_STATE; + // Pumps should be off + signalBloodPumpHardStop(); +// stopSyringePump(); doorClosedRequired( FALSE ); // door no longer required to be closed in standby mode // Request DD service record and usage information from DD -// sendDGServiceRequestToDG(); -// sendDGUsageInfoRequestToDG(); +// sendDDServiceRequestToDD(); + //TODO: Service record id not available +// sendMessage( MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD, COMM_BUFFER_OUT_CAN_TD_2_DD, requestPayload, sizeof( requestPayload ) ); +// sendMessage( MSG_ID_TD_DD_USAGE_INFO_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_DD, requestPayload, sizeof( requestPayload ) ); +// sendDDUsageInfoRequestToDD(); //TODO need to enable return currentStandbyState; } @@ -127,6 +143,7 @@ U32 execStandbyMode( void ) { BOOL stop = isStopButtonPressed(); + TD_STANDBY_STATE_T prevStandbyState = currentStandbyState; if ( TRUE == stop ) { @@ -149,15 +166,21 @@ currentStandbyState = STANDBY_START_STATE; break; } + if ( prevStandbyState != currentStandbyState ) + { + setStandbyStateTransition(); + } return currentStandbyState; } /*********************************************************************//** * @brief * The handleStandbyModeStartState function handles the standby start state. - * This state waits for the door to be closed and then initiates homing of - * pumps and valves and transitions to the wait for treatment state. + * This state initiates homing of the syringe pump and pinch valves, + * then transitions to Wait For Treatment after homing completes and + * then initiates homing of pumps and valves and transitions to the + * wait for treatment state. * @details \b Inputs: homingInitiated * @details \b Outputs: homingInitiated * @return next state of the standby mode state machine @@ -166,25 +189,32 @@ { TD_STANDBY_STATE_T state = STANDBY_START_STATE; + // If we haven't already initiated homing of actuators, initiate now if ( FALSE == homingInitiated ) { VALVE_T valve; - // Initiate homing for both pinch valves. - for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve ) - { - homeValve( valve, FALSE, TRUE ); - } - homingInitiated = TRUE; + // Initiate homing for both pinch valves. + for ( valve = FIRST_VALVE; valve < NUM_OF_VALVES; ++valve ) + { + homeValve( valve, FALSE, TRUE ); + } + // Retract syringe pump if not already home. + if ( FALSE == isSyringePumpHome() ) + { + retractSyringePump(); + } + + homingInitiated = TRUE; } else if ( ( VALVE_STATE_IDLE == getValveState( H1_VALV ) ) && - ( VALVE_STATE_IDLE == getValveState( H19_VALV ) ) ) - { - // After homing completes, move both pinch valves to Position A. - setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT ); - setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); - homingInitiated = FALSE; - state = STANDBY_WAIT_FOR_TREATMENT_STATE; - } + ( VALVE_STATE_IDLE == getValveState( H19_VALV ) ) ) + { + // After homing completes, move both pinch valves to Position A. + setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT ); + setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); + homingInitiated = FALSE; + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + } return state; } @@ -200,43 +230,50 @@ static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void ) { TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_TREATMENT_STATE; - DD_OP_MODE_T ddOperationMode = getDDOpMode(); F32 bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR; + TD_VERSIONS_T payload; + //TODO +// DD_OP_MODE_T ddOperationMode = getDDOpMode(); -// switch ( dgOperationMode ) +// switch ( ddOperationMode ) // { -// case DG_MODE_GENE: -// // If DG is in idle generation state while we are in standby mode, transition DG to standby too -// cmdStopDG(); +// case DD_MODE_GENE: +// // If DD is in idle generation state while we are in standby mode, transition DD to standby too +// cmdStopDD(); // break; // -// // If DG is any of the cleaning modes, set the HD standby to be in the corresponding cleaning mode -// case DG_MODE_FLUS: -// case DG_MODE_HEAT: -// case DG_MODE_CHEM: -// case DG_MODE_CHFL: -// case DG_MODE_HCOL: -// case DG_MODE_ROPS: -// setRequestedCleaningMode( dgOperationMode ); -// state = STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE; +// // If DD is any of the cleaning modes, set the TD standby to be in the corresponding cleaning mode +// case DD_MODE_HEAT: +// case DD_MODE_HCOL: +// case DD_MODE_ROPS: +// setRequestedCleaningMode( ddOperationMode ); +// state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; +// // DD cleaning mode handling is not enabled yet. +// // Stay in Wait For Treatment until DD returns to a supported standby state. // break; // // default: -// // Do nothing. There are other DG modes that HD standby does not need to act upon them. +// // Do nothing. There are other DD modes that TD standby does not need to act upon them. // break; // } - // If DD is communicating and we don't yet have DD version info, request it -// if ( TRUE == isDDCommunicating() ) -// { -// DG_VERSIONS_T ddVersion = getDDVersion(); -// -// if ( 0 == dgVersion.compatibilityRev ) -// { -// sendFWVersionRequest(); -// } -// } + // If DD is communicating and we don't yet have DD version info, request it. + if ( TRUE == isDDCommunicating() ) + { + if ( FALSE == isDDCompatible() ) + { + // Populate TD firmware version payload. + payload.major = (U08)TD_VERSION_MAJOR; + payload.minor = (U08)TD_VERSION_MINOR; + payload.micro = (U08)TD_VERSION_MICRO; + payload.build = (U16)TD_VERSION_BUILD; + payload.compatibilityRev = (U32)SW_COMPATIBILITY_REV; + sendMessage( MSG_ID_FW_VERSIONS_REQUEST, COMM_BUFFER_OUT_CAN_TD_2_DD, + (U08 *)&payload, sizeof( TD_VERSIONS_T ) ); + } + } + // If treatment start is requested by user, initiate treatment workflow (transition to treatment params mode). if ( TRUE == treatStartReqReceived ) { @@ -245,33 +282,89 @@ // Initialize treatment modes before starting a new treatment initPreTreatmentMode(); initTreatmentMode(); -// initPostTreatmentMode(); + initPostTreatmentMode(); resetAirTrap(); // Send UI default pressure settings since user is not asked to set them. respRecord.artPresLimitWindowmmHg = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW ); respRecord.venPresLimitWindowmmHg = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_VEN_PRES_HIGH_LIMIT_WINDOW ); respRecord.venPresLimitAsymmetricmmHg = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_VEN_PRES_LOW_LIMIT_WINDOW ); respRecord.tmpPresLimitWindowmmHg = getSysConfigTreatmentParameterU32DefaultValue( TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW ); sendPressureLimitsChangeResponse( &respRecord ); + // start DD pre-gen // TODO cmdStartPreGenerateDialysate( 600, //(F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), - getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), + 0, //getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE ), getTreatmentParameterF32( TREATMENT_PARAM_ACID_CONCENTRATE_CONV_FACTOR ), bicarbConvFactor, getTreatmentParameterU32( TREATMENT_PARAM_SODIUM ), getTreatmentParameterU32( TREATMENT_PARAM_BICARBONATE ) ); // Start treatment workflow with pretreatment mode - requestNewOperationMode( MODE_PRET ); - treatStartReqReceived = FALSE; // Set fluid type setFluidType( modality ); + requestNewOperationMode( MODE_PRET ); + treatStartReqReceived = FALSE; } return state; } /*********************************************************************//** * @brief + * The setStandbyStateTransition function sets the actuators and variables + * for Standby state transitions. + * @details \b Inputs: newState + * @details \b Outputs: Actuators configured for the new Standby state. + * @param newState New Standby state. + * @return none + *************************************************************************/ +static void setStandbyStateTransition( void ) +{ + // Common Standby actuator settings. + resetAirTrap(); + + setAirPumpState( AIR_PUMP_STATE_OFF, + AIR_PUMP_MOTOR_OFF ); + + set3WayValveState( H13_VALV, + VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + + set3WayValveState( H20_VALV, + VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + + stopSyringePump(); + signalBloodPumpHardStop(); + + switch ( currentStandbyState ) + { + case STANDBY_START_STATE: + // Homing is handled in handleStandbyModeStartState(). + break; + + case STANDBY_WAIT_FOR_TREATMENT_STATE: + setValvePosition( H1_VALV, + VALVE_POSITION_A_INSERT_EJECT ); + + setValvePosition( H19_VALV, + VALVE_POSITION_A_INSERT_EJECT ); + + // TODO: + // H5 Ejector Off + // Dialyzer Bypassed + // Qd 0 + // Quf 0 + // Qs 0 + break; + + default: + SET_ALARM_WITH_2_U32_DATA( + ALARM_ID_TD_SOFTWARE_FAULT, + SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, + currentStandbyState ); + break; + } +} +/*********************************************************************//** + * @brief * The setFluidType function sets the fluid type based on the user's * treatment selection from the home screen. * @details \b Inputs: none @@ -331,52 +424,99 @@ BOOL signalUserInitiateTreatment( MESSAGE_T *message ) { BOOL result = FALSE; - U32 cmd = 0; - TD_OP_MODE_T mode = getCurrentOperationMode(); + INITIATE_TREATMENT_REQUEST_PAYLOAD_T cmd; + TD_OP_MODE_T mode = getCurrentOperationMode(); REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE; INITIATE_TREATMENT_REQUEST_PAYLOAD_T request; UI_RESPONSE_PAYLOAD_T response; + memset( &cmd, 0, sizeof( INITIATE_TREATMENT_REQUEST_PAYLOAD_T ) ); + memset( &response, 0, sizeof( UI_RESPONSE_PAYLOAD_T ) ); // Verify message payload length is valid if ( sizeof( INITIATE_TREATMENT_REQUEST_PAYLOAD_T ) == message->hdr.payloadLen ) { memcpy( &request, message->payload, sizeof( INITIATE_TREATMENT_REQUEST_PAYLOAD_T ) ); - cmd = request.command; + cmd.command = request.command; - if ( USER_COMMAND_INITIATE == cmd ) + if ( USER_COMMAND_INITIATE == cmd.command ) { - // Verify TD is in standby mode waiting for treatment start request - if ( ( mode != MODE_STAN ) || ( STANDBY_WAIT_FOR_TREATMENT_STATE != currentStandbyState ) ) + // Verify TD is in Standby mode and waiting for treatment start request. + if ( ( MODE_STAN != mode ) || ( STANDBY_WAIT_FOR_TREATMENT_STATE != currentStandbyState ) ) { rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE; } + else if ( TRUE == treatStartReqReceived ) + { + rejReason = REQUEST_REJECT_REASON_REQUEST_ALREADY_PENDING; + } else if ( request.modality >= NUM_OF_TREATMENT_MODALITY_TYPES ) { rejReason = REQUEST_REJECT_REASON_INVALID_COMMAND; } #ifndef TEST_UI_ONLY - // Verify DD is communicating with HD - else if ( isDDCommunicating() != TRUE ) + // Verify DD is communicating. + else if ( TRUE != isDDCommunicating() ) { rejReason = REQUEST_REJECT_REASON_DD_COMM_LOST; } - // Verify DD is not busy - else if ( ( DD_MODE_STAN != getDDOpMode() ) || ( DD_STANDBY_MODE_STATE_IDLE != getDDSubMode() ) ) // || ( isDDPOSTPassed() != TRUE ) ) + // Verify DD is ready and not busy with flush/disinfect/cleaning/generation. + else if ( ( DD_MODE_STAN != getDDOpMode() ) || ( DD_STANDBY_MODE_STATE_IDLE != getDDSubMode() ) ) { - rejReason = REQUEST_REJECT_REASON_DD_NOT_IN_STANDBY_IDLE_STATE; + rejReason = REQUEST_REJECT_REASON_DD_BUSY; } + else if ( FALSE == isDDCompatible() ) + { + rejReason = REQUEST_REJECT_REASON_DD_INCOMPATIBLE; + } + // TODO: Need to uncomment below after implementation +// else if ( TRUE == isDDDisinfectionOverdue() ) +// { +// rejReason = REQUEST_REJECT_REASON_DISINFECT_HAS_BEEN_EXPIRED; +// } +// else if ( TRUE == isDDFlushOverdue() ) +// { +// rejReason = REQUEST_REJECT_REASON_FILTER_FLUSH_HAS_BEEN_EXPIRED; +// } +// else if ( TRUE == isDDTemperatureTooHigh() ) +// { +// rejReason = REQUEST_REJECT_REASON_DD_TEMPERATURE_OUT_OF_RANGE; +// } +// else if ( TRUE == isDDServiceOverdue() ) +// { +// rejReason = REQUEST_REJECT_REASON_DD_SERVICE_IS_DUE; +// } +// else if ( TRUE == isTDServiceOverdue() ) +// { +// rejReason = REQUEST_REJECT_REASON_TD_SERVICE_IS_DUE; +// } +// else if ( FALSE == isFPStandbymode() ) +// { +// rejReason = REQUEST_REJECT_REASON_FP_BUSY; +// } +// else if ( TRUE == isfpServiceOverdue() ) +// { +// rejReason = REQUEST_REJECT_REASON_FP_SERVICE_IS_DUE; +// } + #endif else { - // If request to start treatment not rejected, set flag to initiate treatment workflow +// Low battery is a warning only, not a rejection. + //TODO +// if ( TRUE == isBatteryRemainingCapacityLessThan60Wh() ) +// { +// SET_ALARM( ALARM_ID_TD_LOW_BATTERY_CHARGE ); +// } + + // If request to start treatment not rejected, set flag to initiate treatment workflow. result = TRUE; treatStartReqReceived = TRUE; // Save modality to set later modality = (TREATMENT_TYPE_T)request.modality; } } - else if ( USER_COMMAND_CANCEL == cmd ) + else if ( USER_COMMAND_CANCEL == cmd.command ) { result = signalPreTreatmentBackoutToStandby(); @@ -387,14 +527,18 @@ } else { - rejReason = REQUEST_REJECT_REASON_INVALID_COMMAND; + rejReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; } } + else + { + rejReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; + } - // Respond to request to start treatment - response.accepted = result; + // Respond to request to start treatment. + response.accepted = result; response.rejectionReason = rejReason; - sendMessage( MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*)(&response), sizeof( UI_RESPONSE_PAYLOAD_T ) ); + sendMessage( MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*) &response, sizeof( UI_RESPONSE_PAYLOAD_T ) ); return result; } Index: firmware/App/Modes/StatePreTxRecirculate.c =================================================================== diff -u -r25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Modes/StatePreTxRecirculate.c (.../StatePreTxRecirculate.c) (revision 25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe) +++ firmware/App/Modes/StatePreTxRecirculate.c (.../StatePreTxRecirculate.c) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -38,8 +38,10 @@ // ********** private definitions ********** -#define PRE_TX_RECIRC_BLOOD_FLOW_RATE_ML_MIN 100 ///< Blood pump flow rate during recirculation in mL/min. -#define RECIRC_MEDIUM_TIME_MS ( 90 * SEC_PER_MIN * MS_PER_SECOND ) ///< Pre-Treatment recirc time before medium priority warning in milliseconds. +#define PRE_TX_RECIRC_INITIAL_BLOOD_FLOW_RATE_ML_MIN 500 ///< Initial blood pump flow rate during recirculation in mL/min. +#define PRE_TX_RECIRC_BLOOD_FLOW_RATE_ML_MIN 300 ///< Blood pump flow rate after the initial recirculation period in mL/min. +#define PRE_TX_RECIRC_INITIAL_BLOOD_FLOW_TIME_MS ( 30 * MS_PER_SECOND ) ///< Initial high blood flow duration in milliseconds. +#define RECIRC_MEDIUM_TIME_MS ( 90 * SEC_PER_MIN * MS_PER_SECOND ) ///< Recirculation time before medium priority warning. /// Enumeration of Pre-Treatment Recirculation sub-states. typedef enum PreTxRecirculate_States @@ -56,6 +58,7 @@ static U32 preTxRecircStartTime; ///< Recirculation start time (ms timer count). static BOOL recircMediumAlarmGiven; ///< Flag indicating medium recirculation alarm has been raised. +static BOOL initialBloodFlowComplete; ///< Flag indicating the initial high blood flow period is complete. // ********** private function prototypes ********** @@ -72,15 +75,16 @@ * @details \b Inputs: none. * @details \b Outputs: currentPreTxRecircState, * recircResumeRequested, preTxRecircStartTime, - * recircMediumAlarmGiven. + * recircMediumAlarmGiven, initialBloodFlowComplete * @return none. *************************************************************************/ void initPreTxRecirculate( void ) { - currentPreTxRecircState = PRE_TX_RECIRCULATE_STATE; - recircResumeRequested = FALSE; - preTxRecircStartTime = getMSTimerCount(); - recircMediumAlarmGiven = FALSE; + currentPreTxRecircState = PRE_TX_RECIRCULATE_STATE; + recircResumeRequested = FALSE; + preTxRecircStartTime = getMSTimerCount(); + recircMediumAlarmGiven = FALSE; + initialBloodFlowComplete = FALSE; } /*********************************************************************//** @@ -181,16 +185,28 @@ * @details \b Alarm: ALARM_ID_TD_PRIME_COMPLETED_MEDIUM if the * recirculation timeout expires. * @details \b Inputs: preTxRecircStartTime, - * recircMediumAlarmGiven. - * @details \b Outputs: recircMediumAlarmGiven. + * recircMediumAlarmGiven, initialBloodFlowComplete + * @details \b Outputs: recircMediumAlarmGiven, initialBloodFlowComplete * @return next Recirculate sub-state. *************************************************************************/ static PRE_TX_RECIRCULATE_STATE_T handlePreTxRecirculateState( void ) { PRE_TX_RECIRCULATE_STATE_T state = PRE_TX_RECIRCULATE_STATE; + if ( ( TRUE != initialBloodFlowComplete ) && + ( TRUE == didTimeout( preTxRecircStartTime, + PRE_TX_RECIRC_INITIAL_BLOOD_FLOW_TIME_MS ) ) ) + { + setBloodPumpTargetFlowRate( PRE_TX_RECIRC_BLOOD_FLOW_RATE_ML_MIN, + MOTOR_DIR_FORWARD, + PUMP_CONTROL_MODE_OPEN_LOOP ); + + initialBloodFlowComplete = TRUE; + } + if ( ( FALSE == recircMediumAlarmGiven ) && - ( TRUE == didTimeout( preTxRecircStartTime, RECIRC_MEDIUM_TIME_MS ) ) ) + ( TRUE == didTimeout( preTxRecircStartTime, + RECIRC_MEDIUM_TIME_MS ) ) ) { recircMediumAlarmGiven = TRUE; activateAlarmNoData( ALARM_ID_TD_PRIME_COMPLETED_MEDIUM ); @@ -231,8 +247,8 @@ * @brief * The setupPreTxRecirculate function configures the actuators * required for Pre-Treatment Recirculation. - * @details \b Inputs: none - * @details \b Outputs: none + * @details \b Inputs: initialBloodFlowComplete , preTxRecircStartTime + * @details \b Outputs: initialBloodFlowComplete * @return none *************************************************************************/ static void setupPreTxRecirculate( void ) @@ -249,11 +265,25 @@ retractEjector(); stopSyringePump(); - setBloodPumpTargetFlowRate( PRE_TX_RECIRC_BLOOD_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); + if ( ( TRUE == initialBloodFlowComplete ) || + ( TRUE == didTimeout( preTxRecircStartTime, + PRE_TX_RECIRC_INITIAL_BLOOD_FLOW_TIME_MS ) ) ) + { + initialBloodFlowComplete = TRUE; + setBloodPumpTargetFlowRate( PRE_TX_RECIRC_BLOOD_FLOW_RATE_ML_MIN, + MOTOR_DIR_FORWARD, + PUMP_CONTROL_MODE_OPEN_LOOP ); + } + else + { + setBloodPumpTargetFlowRate( PRE_TX_RECIRC_INITIAL_BLOOD_FLOW_RATE_ML_MIN, + MOTOR_DIR_FORWARD, + PUMP_CONTROL_MODE_OPEN_LOOP ); + } + // Direct DD to bypass dialyzer and perform no ultrafiltration cmdBypassDialyzer( TRUE ); - cmdChangeQd( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) ); cmdChangeQuf( 0.0F ); } Index: firmware/App/Monitors/Pressures.c =================================================================== diff -u -rcaecaed1083ad192dfdc034cdee6084c7b8629d2 -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision caecaed1083ad192dfdc034cdee6084c7b8629d2) +++ firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -200,7 +200,7 @@ static U32 tmpPressureReadingsLongCount; ///< Number of samples in flow rolling average buffer. static PRESSURE_SELF_TEST_STATE_T pressurePostState; ///< Pressure self test post state. -//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord; ///< Pressure sensors calibration record. +//static HD_PRESSURE_SENSORS_CAL_RECORD_T pressureSensorsCalRecord; ///< Pressure sensors calibration record. // ********** private function prototypes ********** Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r08fdaaf70ab5133cbe7d019905f745074a756027 -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 08fdaaf70ab5133cbe7d019905f745074a756027) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -7,8 +7,8 @@ * * @file DDInterface.c * -* @author (last) Varshini Nagabooshanam -* @date (last) 15-Jun-2026 +* @author (last) suresh +* @date (last) 17-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -528,6 +528,36 @@ /*********************************************************************//** * @brief + * The cmdChangeDialysateTemperature function sends a generate dialysate + * command to the DD with a given new dialysate temperature. + * @details \b Inputs: none + * @details \b Outputs: dialysateDeliveryCmdSet + * @details \b Message \b Sent: Continue generate dialysate command w/ new + * dialysate temperature. + * @param dialTemp Target dialysate temperature in deg C. + * @return none + *************************************************************************/ +void cmdChangeDialysateTemperature( F32 dialTemp ) +{ + if ( TRUE == dialysateDeliveryCmdSet.start ) + { + dialysateDeliveryCmdSet.dialTemp = dialTemp; + +#ifndef TEST_UI_ONLY + sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, + COMM_BUFFER_OUT_CAN_TD_2_DD, + (U08*)(&dialysateDeliveryCmdSet), + sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); +#endif + } + else + { + // TODO - s/w fault? + } +} + +/*********************************************************************//** + * @brief * The cmdBypassDialyzer function sends a generate dialysate command to the DD * with a given flag indicating whether dialyzer should be bypassed. * @details \b Inputs: none @@ -683,7 +713,8 @@ { //dialysateDeliveryCmdSet.substitutionRate = qs; #ifndef TEST_UI_ONLY - sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); + sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, + (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); #endif } else Index: firmware/App/Services/DDInterface.h =================================================================== diff -u -r25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/Services/DDInterface.h (.../DDInterface.h) (revision 25aeff9e9994d2e7aab3b4e6171c56fdac6a01fe) +++ firmware/App/Services/DDInterface.h (.../DDInterface.h) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -7,8 +7,8 @@ * * @file DDInterface.h * -* @author (last) Praneeth Bunne -* @date (last) 27-May-2026 +* @author (last) suresh +* @date (last) 17-Aug-2026 * * @author (original) Sean Nash * @date (original) 01-Aug-2024 @@ -63,6 +63,7 @@ void cmdStartGenerateDialysate( F32 qd, F32 quf, F32 dialTemp, BOOL bypass, F32 acidConvFactor, F32 bicarbConvFactor, U32 sodium, U32 bicarbonate ); void cmdChangeQd( F32 qd ); void cmdChangeQuf( F32 quf ); +void cmdChangeDialysateTemperature( F32 dialTemp ); void cmdBypassDialyzer( BOOL bypass ); void cmdStopGenerateDialysate( void ); void cmdSubstitutionRate (F32 qs ); Index: firmware/App/TDCommon.h =================================================================== diff -u -ra3b4a2f4a49f3f2cf6861961b1f5fd6bc5daa817 -r3ad3d957a31c79b3ff1e0da924627185d56fa642 --- firmware/App/TDCommon.h (.../TDCommon.h) (revision a3b4a2f4a49f3f2cf6861961b1f5fd6bc5daa817) +++ firmware/App/TDCommon.h (.../TDCommon.h) (revision 3ad3d957a31c79b3ff1e0da924627185d56fa642) @@ -27,6 +27,7 @@ #define TD_VERSION_MICRO 0 #define TD_VERSION_BUILD 132 + // ********** development build switches ********** #ifndef _RELEASE_