Fisheye on hdfirmware/firmware

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Resolved merge conflicts

Tue, 04 Jan 2022 11:09:21 -0800

Hung Nguyen committed f1c099b on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Resolved merge conflicts

· /firmware/App/Controllers/BloodFlow.c	(-3, +3)	\| History	\| Source	\| Diff
· /firmware/App/Controllers/SyringePump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/HDCommon.h	(-2, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Prime.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/SelfTests.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-7, +14)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Tue, 04 Jan 2022 10:51:49 -0800

Dara Navaei committed beeaeab on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 04 Jan 2022 10:51:42 -0800

Dara Navaei committed 20c0256 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /firmware/App/Controllers/BloodFlow.c

(-2, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Removed an dead alarm

Dara Navaei — Tue, 04 Jan 2022 10:50:40 -0800

Dara Navaei committed 25ebf5b on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

Removed an dead alarm

· /firmware/App/Controllers/BloodFlow.c

(-1, +0)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Removed code related to run blood circuit again because it no longer needed

Tue, 04 Jan 2022 10:45:51 -0800

Hung Nguyen committed 539eaef on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Removed code related to run blood circuit again because it no longer needed

· /firmware/App/HDCommon.h	(-1, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Prime.c	(-14, +0)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Tue, 04 Jan 2022 10:36:31 -0800

Dara Navaei committed f4c8704 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 04 Jan 2022 10:36:22 -0800

Dara Navaei committed 24b2fe7 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /firmware/App/Controllers/AirTrap.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/AirTrap.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/AlarmLamp.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/AlarmLamp.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodFlow.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodFlow.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodLeak.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/BloodLeak.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Bubble.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Bubble.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Buttons.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/Buttons.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/DGInterface.c

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/DGInterface.h

(-1, +1)

| History

| Source

| Diff

· /firmware/App/Controllers/DialInFlow.c

(-1, +1)

| History

| Source

| Diff

… 98 more files in changeset.

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): http://dvm-linux02:8060/cru/HD-DEN-10602-1...

Behrouz NematiPour — Tue, 04 Jan 2022 10:18:29 -0800

Behrouz NematiPour committed 83d46d8 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

http://dvm-linux02:8060/cru/HD-DEN-10602-1

- Addressed comments

· /firmware/App/Modes/ModePostTreat.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.c	(-1, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Addressed code review comments

Mon, 03 Jan 2022 14:36:09 -0800

Hung Nguyen committed 5674acb on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Addressed code review comments

· /firmware/App/Controllers/BloodFlow.c	(-3, +0)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Prime.c	(-22, +22)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemComm.c	(-1, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Updated prime time limit for the saline dialyzer state

Wed, 15 Dec 2021 11:52:29 -0800

Hung Nguyen committed 0047fb7 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Updated prime time limit for the saline dialyzer state

· /firmware/App/Modes/Prime.c

(-14, +15)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Converted from seconds to milliseconds fix

Tue, 14 Dec 2021 18:46:07 -0800

Hung Nguyen committed 24e36c2 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Converted from seconds to milliseconds fix

· /firmware/App/Modes/Prime.c

(-3, +3)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Corrected state transition and changed blood pump speed from 400 to 300 per system specification

Tue, 14 Dec 2021 11:14:57 -0800

Hung Nguyen committed f9d8627 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Corrected state transition and changed blood pump speed from 400 to 300 per system specification

· /firmware/App/Modes/Prime.c

(-3, +3)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11543: Unable proceed to the Confirm Treatment when "08-3251-9" Acid Concentrate is selected...

Behrouz NematiPour — Mon, 13 Dec 2021 20:12:33 -0800

Behrouz NematiPour committed 05ee4d6 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

DEN-11543: Unable proceed to the Confirm Treatment when "08-3251-9" Acid Concentrate is selected

The HD FW updated to accept up to 4 acid concentration type index.

Below is the UI DataList.conf for acid concentrate.

[Acid Concentrate]

Fres. Naturalyte

08-1251-1

08-2251-0

08-3251-9

· /firmware/App/Modes/ModeTreatmentParams.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Incorporated peer review comments

Mon, 13 Dec 2021 18:32:29 -0800

Hung Nguyen committed 645a316 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Incorporated peer review comments

· /firmware/App/HDCommon.h	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Prime.c	(-55, +25)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Updated code per peer review comments

Mon, 13 Dec 2021 14:52:01 -0800

Hung Nguyen committed 8c93220 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Updated code per peer review comments

· /firmware/App/Modes/Prime.c

(-1, +5)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Updated time out limits

Mon, 13 Dec 2021 10:55:09 -0800

Hung Nguyen committed 9a97708 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Updated time out limits

· /firmware/App/Modes/Prime.c

(-14, +9)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Implemented code update due to requirements change

Fri, 10 Dec 2021 18:27:40 -0800

Hung Nguyen committed 76a5589 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Implemented code update due to requirements change

· /firmware/App/Modes/Prime.c	(-193, +255)	\| History	\| Source	\| Diff
· /firmware/App/Modes/SelfTests.c	(-0, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Finishing up the story for firmware...

Behrouz NematiPour — Thu, 09 Dec 2021 01:32:55 -0800

Behrouz NematiPour committed 8cdd4c1 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Finishing up the story for firmware

DEN-10607: Implementation [Screen]

DEN-10609: Implementation [Treatment Log]

· /firmware/App/Modes/ModePostTreat.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePostTreat.h	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.c	(-0, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.h	(-0, +1)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Corrected delta volume calculationbased on the past 10 seconds value instead of the past 9 seconds

Wed, 08 Dec 2021 10:02:55 -0800

Hung Nguyen committed 11d3b6b on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Corrected delta volume calculationbased on the past 10 seconds value instead of the past 9 seconds

· /firmware/App/Modes/Prime.c

(-9, +10)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Tue, 07 Dec 2021 21:58:24 -0800

Dara Navaei committed a771649 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

· /firmware/App/HDCommon.h

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 07 Dec 2021 21:58:17 -0800

Dara Navaei committed b3056c7 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /firmware/App/Services/SystemComm.c

(-2, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Fixed DG_RESERVOIR to DG_RESERVOIRS

Dara Navaei — Tue, 07 Dec 2021 21:57:16 -0800

Dara Navaei committed 5305585 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Fixed DG_RESERVOIR to DG_RESERVOIRS

· /firmware/App/Services/SystemComm.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Merge branch 'DEN-10153_Treatment_Log_Prescribed_UF' into staging

Behrouz NematiPour — Tue, 07 Dec 2021 20:51:14 -0800

Behrouz NematiPour committed 65d0f3f on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Merge branch 'DEN-10153_Treatment_Log_Prescribed_UF' into staging

· /firmware/App/Modes/ModePostTreat.c	(-1, +6)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModePostTreat.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.c	(-0, +32)	\| History	\| Source	\| Diff
· /firmware/App/Modes/ModeTreatmentParams.h	(-0, +2)	\| History	\| Source	\| Diff
· /firmware/App/Services/SystemCommMessages.c	(-2, +2)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Dara Navaei — Tue, 07 Dec 2021 20:45:57 -0800

Dara Navaei committed 643c01a on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

· /firmware/App/HDCommon.h

(-2, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Tue, 07 Dec 2021 20:45:48 -0800

Dara Navaei committed 9cffe6e on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10602_UI_DEV_Add_PatientID_PreTreatment and 341 more in hdfirmware

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /firmware/App/Services/SystemComm.c

(-2, +2)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Implemented steady state volume check

Tue, 07 Dec 2021 11:26:05 -0800

Hung Nguyen committed 24237b8 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Implemented steady state volume check

· /firmware/App/Modes/Prime.c

(-4, +11)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Updated steady state volume detection logic

Mon, 06 Dec 2021 17:28:22 -0800

Hung Nguyen committed 2d354e7 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Updated steady state volume detection logic

· /firmware/App/Modes/Prime.c

(-53, +52)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Updated header

Tue, 30 Nov 2021 16:48:30 -0800

Hung Nguyen committed 45803ac on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Updated header

· /firmware/App/Modes/Prime.c

(-1, +1)

| History

| Source

| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-11098 Corrected R1 and R2 in bypass state and dialyzer state

Tue, 30 Nov 2021 13:24:49 -0800

Hung Nguyen committed f90e1ab on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-11098-implement-hd-pre-treatment-mode-update and 340 more in hdfirmware

DEN-11098 Corrected R1 and R2 in bypass state and dialyzer state

· /firmware/App/Controllers/SyringePump.c	(-1, +1)	\| History	\| Source	\| Diff
· /firmware/App/Modes/Prime.c	(-2, +2)	\| History	\| Source	\| Diff

hdfirmware (DEN-15436-dpi-tubing-comes-out-of-pump-track-during-dpi-reversal-in-post-treatment): DEN-10247: UI Acknow timeouts on HD side, due to the delay of almost 2 seconds....

Behrouz NematiPour — Mon, 29 Nov 2021 16:10:27 -0800

Behrouz NematiPour committed eec3af7 on branch DEN-10155-treatment-end-paused-state-not-displaying-resume-option, DEN-10247_UI_Initial_Acknow_Timeout and 342 more in hdfirmware

DEN-10247: UI Acknow timeouts on HD side, due to the delay of almost 2 seconds.

- Added another timeout of 5000 ms ( same value as UI_COMM_TIMEOUT_IN_MS ) only for the INIT state in which UI has a delayed response.

· /firmware/App/Services/SystemComm.c

(-3, +9)

| History

| Source

| Diff