Fix merge conflict stuff here.

Fix merge conflict stuff here.

· /firmware/App/Modes/ModePreTreat.c

(-65, +0)

| History

| Source

| Diff

]]> Tue, 30 Jun 2026 11:44:35 -0700 Vendor - TEL - Arpita Srivastava https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4033-1/#c30226 https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4033-1/#c30226 Vendor - TEL - Arpita Srivastava commented on LEAHI-TD-FIRMWARE-LDT-4033-1

this function should not return anything.

Please rename all the sPump registers as h10 for consistency.

Add bpMeasurementReady, bpDriverError and pendingBPCommand to outputs.

· /firmware/App/Modes/ModeStandby.c	(-3, +66)	| History	| Source	| Diff
· /firmware/App/Modes/ModeStandby.h	(-0, +11)	| History	| Source	| Diff
· /firmware/App/Modes/StateTxPaused.c	(-5, +2)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/FluidBolus.c	(-25, +5)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/FluidBolus.h	(-1, +0)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/TubeSetInstall.c	(-0, +35)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/TubeSetInstall.h	(-1, +2)	| History	| Source	| Diff
· /firmware/App/Services/TxParams.c	(-9, +18)	| History	| Source	| Diff

]]> Fri, 26 Jun 2026 09:51:02 -0700 Vendor - TEL - Vijay Pamula https://devapps.diality.us/changelog/td-firmware?cs=ce9145f506c3b7b970285bf2ab2e464b66f83bab https://devapps.diality.us/changelog/td-firmware?cs=ce9145f506c3b7b970285bf2ab2e464b66f83bab Vendor - TEL - Vijay Pamula committed ce9145f on branch LDT-4028-pre-treatment---fw-implementation in td-firmware LDT-4028:Addressed code review commens for Pre-Tx Install State

· /firmware/App/Modes/ModePreTreat.c	(-8, +8)	| History	| Source	| Diff
· /firmware/App/Modes/ModeStandby.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Modes/ModeTreatment.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Monitors/Pressures.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Services/Messaging.c	(-1, +1)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/TubeSetInstall.c	(-4, +5)	| History	| Source	| Diff
· /firmware/App/Services/StateServices/TubeSetInstall.h	(-3, +3)	| History	| Source	| Diff
· /firmware/App/Services/TxParams.c	(-11, +11)	| History	| Source	| Diff
· /firmware/App/Services/TxParams.h	(-2, +2)	| History	| Source	| Diff

]]> Wed, 24 Jun 2026 16:14:02 -0700 Vendor - TEL - Varshini Nagabooshanam https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4033-1/#c30143 https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4033-1/#c30143 Vendor - TEL - Varshini Nagabooshanam replied to Sean Nash in LEAHI-TD-FIRMWARE-LDT-4033-1

Fixed

Added

Fixed

Fixed

Fixed

Not required here since we are initializing in the main

Yes removed

Fixed

Fixed

· /firmware/App/Controllers/BPModule.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Drivers/BPDriver.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Modes/ModePreTreat.c	(-2, +0)	| History	| Source	| Diff
· /firmware/App/Modes/ModeTreatment.c	(-1, +0)	| History	| Source	| Diff
· /firmware/App/Services/AlarmMgmtSWFaults.h	(-1, +1)	| History	| Source	| Diff
· /firmware/App/Services/AlarmMgmtTD.c	(-1, +1)	| History	| Source	| Diff
· /firmware/App/Services/FpgaTD.c	(-12, +12)	| History	| Source	| Diff
· /firmware/App/Tasks/TaskGeneral.c	(-2, +4)	| History	| Source	| Diff
· /firmware/source/sys_main.c	(-2, +2)	| History	| Source	| Diff

]]> Wed, 24 Jun 2026 15:20:09 -0700 Vendor - TEL - Varshini Nagabooshanam https://devapps.diality.us/changelog/td-firmware?cs=927dfd6e109af46160e5aef687f1b7c286d24703 https://devapps.diality.us/changelog/td-firmware?cs=927dfd6e109af46160e5aef687f1b7c286d24703 Vendor - TEL - Varshini Nagabooshanam committed 927dfd6 on branch LDT-2240-disposable-tube-set-self-test in td-firmware Merge fixes

· /firmware/App/Modes/ModePreTreat.c	(-21, +56)	| History	| Source	| Diff
· /firmware/App/Modes/ModePreTreat.h	(-2, +3)	| History	| Source	| Diff
· /firmware/App/Services/AlarmMgmtSWFaults.h	(-4, +5)	| History	| Source	| Diff
· /firmware/App/Services/DDInterface.c	(-2, +2)	| History	| Source	| Diff
· /firmware/App/Services/FpgaTD.c	(-13, +1)	| History	| Source	| Diff
· /firmware/App/TDCommon.h	(-1, +1)	| History	| Source	| Diff

]]> Wed, 24 Jun 2026 14:42:21 -0700 Vendor - TEL - Arpita Srivastava https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4028-2/#c30131 https://devapps.diality.us/cru/LEAHI-TD-FIRMWARE-LDT-4028-2/#c30131 Vendor - TEL - Arpita Srivastava commented on LEAHI-TD-FIRMWARE-LDT-4028-2

please add message id.

We should set all TD actuators here, not just blood pump.

fpgaActuatorSetPoints is an output.
Input is none.

please remove extra line

Output is none

Please add message id.

Output is none

Message id MSG_ID_OFF_BUTTON_PRESS_REQUEST looks wrong

I think we should accept this as long as we're in pre-tx: install state. User might confirm before auto-load finishes and that's ok.

Change "SetupConnection" to "SetupTubingSetConnection"