Fisheye on leahi-common/

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1928 resolved merge conflicts

Raghu Kallala — Tue, 02 Sep 2025 11:02:38 -0700

Raghu Kallala committed 96dd8f5 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 69 more in leahi-common

LDT-1928 resolved merge conflicts

· /MsgDefs.h

(-1, +12)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merged LDT-2030

Dara Navaei — Fri, 29 Aug 2025 14:49:58 -0700

Dara Navaei committed 6e006cb on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 70 more in leahi-common

Merged LDT-2030

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 addressed the code review comment

Dara Navaei — Fri, 29 Aug 2025 11:12:34 -0700

Dara Navaei committed e90e686 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 addressed the code review comment

· /AlarmDefs.h

(-3, +3)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merge branch 'staging' into LDT-2030-blood-leak---dd

Dara Navaei — Fri, 29 Aug 2025 11:09:34 -0700

Dara Navaei committed 895fad7 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

Merge branch 'staging' into LDT-2030-blood-leak---dd

· /AlarmDefs.h

(-12, +12)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 updated the blood leak and solution infusion messages

Dara Navaei — Wed, 27 Aug 2025 11:55:54 -0700

Dara Navaei committed f2c3813 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 updated the blood leak and solution infusion messages

· /MsgDefs.h

(-3, +3)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 addressed the code review comments

Dara Navaei — Wed, 27 Aug 2025 11:46:11 -0700

Dara Navaei committed e52ae91 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 addressed the code review comments

· /AlarmDefs.h	(-3, +3)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-2, +2)	\| History	\| Source	\| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merge branch 'LDT-828-stop-state-fp' into staging

Michael Garthwaite — Fri, 22 Aug 2025 15:05:11 -0700

Michael Garthwaite committed b564e8c on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

Merge branch 'LDT-828-stop-state-fp' into staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-828: updated alarm properties for water quality alarms

Michael Garthwaite — Fri, 22 Aug 2025 13:41:18 -0700

Michael Garthwaite committed 8e34261 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 72 more in leahi-common

LDT-828: updated alarm properties for water quality alarms

· /AlarmDefs.h

(-6, +6)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 updated the blood leak message IDs

Dara Navaei — Thu, 21 Aug 2025 16:34:37 -0700

Dara Navaei committed e1b03e2 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 updated the blood leak message IDs

· /MsgDefs.h

(-8, +8)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 added a new message for blood leak zeroing command

Dara Navaei — Thu, 21 Aug 2025 14:42:49 -0700

Dara Navaei committed 790f260 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 added a new message for blood leak zeroing command

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 added blood leak override command IDs

Dara Navaei — Thu, 21 Aug 2025 09:58:04 -0700

Dara Navaei committed d6ad2ae on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 added blood leak override command IDs

· /MsgDefs.h

(-1, +8)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-828: updated alarm properties to reflect requirements of alarms and stop state.

Michael Garthwaite — Tue, 19 Aug 2025 13:09:57 -0700

Michael Garthwaite committed 91927a3 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 72 more in leahi-common

LDT-828: updated alarm properties to reflect requirements of alarms and stop state.

· /AlarmDefs.h

(-12, +12)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Added broadcast and override messages for inlet pressure check.

Raghu Kallala — Tue, 19 Aug 2025 11:30:32 -0700

Raghu Kallala committed fb0e774 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 69 more in leahi-common

Added broadcast and override messages for inlet pressure check.

· /FPDefs.h	(-0, +16)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-0, +3)	\| History	\| Source	\| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merged staging into LDT-1928-inlet-pressure-check

Raghu Kallala — Tue, 19 Aug 2025 11:26:59 -0700

Raghu Kallala committed 78bb54d on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 69 more in leahi-common

Merged staging into LDT-1928-inlet-pressure-check

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 added alarms, messages, and events pertaining to blood leak detector

Dara Navaei — Mon, 18 Aug 2025 17:03:33 -0700

Dara Navaei committed df0b360 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 added alarms, messages, and events pertaining to blood leak detector

· /AlarmDefs.h	(-0, +20)	\| History	\| Source	\| Diff
· /DDDefs.h	(-0, +4)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-0, +1)	\| History	\| Source	\| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-2030 added saline bolus request and reponse message IDs

Dara Navaei — Mon, 18 Aug 2025 10:47:53 -0700

Dara Navaei committed 9d699b7 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 71 more in leahi-common

LDT-2030 added saline bolus request and reponse message IDs

· /MsgDefs.h

(-0, +2)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into staging

Michael Garthwaite — Tue, 05 Aug 2025 14:41:49 -0700

Michael Garthwaite committed 0c7e0ad on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 74 more in leahi-common

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' into staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merge branch 'staging' into LDT-566-water-treatment-and-degassing-fp-2

Michael Garthwaite — Tue, 05 Aug 2025 14:39:14 -0700

Michael Garthwaite committed 80795d4 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

Merge branch 'staging' into LDT-566-water-treatment-and-degassing-fp-2

· /AlarmDefs.h	(-16, +16)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +2)	\| History	\| Source	\| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 merge into staging

Vinayakam Mani — Tue, 05 Aug 2025 13:30:20 -0700

Vinayakam Mani committed e97b48f on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

LDT-1473 merge into staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-566: updated MSG_ID to conform to staging

Michael Garthwaite — Tue, 05 Aug 2025 13:01:46 -0700

Michael Garthwaite committed 803c926 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

LDT-566: updated MSG_ID to conform to staging

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 updating valve enum

Vinayakam Mani — Tue, 05 Aug 2025 11:49:36 -0700

Vinayakam Mani committed 3505e8e on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 updating valve enum

· /DDDefs.h

(-2, +2)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 merge into staging

Vinayakam Mani — Tue, 05 Aug 2025 11:27:37 -0700

Vinayakam Mani committed a64d1d0 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

LDT-1473 merge into staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 latest from staging

Vinayakam Mani — Tue, 05 Aug 2025 11:23:34 -0700

Vinayakam Mani committed c3d732c on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 latest from staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 update valve naming

Vinayakam Mani — Mon, 04 Aug 2025 17:11:36 -0700

Vinayakam Mani committed 2f1fb93 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 update valve naming

· /AlarmDefs.h	(-16, +16)	\| History	\| Source	\| Diff
· /DDDefs.h	(-2, +3)	\| History	\| Source	\| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 updated valves enum

Vinayakam Mani — Mon, 04 Aug 2025 13:05:32 -0700

Vinayakam Mani committed 0fafac8 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 updated valves enum

· /DDDefs.h

(-1, +1)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 merge into staging

Vinayakam Mani — Mon, 04 Aug 2025 11:03:58 -0700

Vinayakam Mani committed 4c0b05b on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 merge into staging

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-1473 resolving merge issue

Vinayakam Mani — Mon, 04 Aug 2025 10:54:56 -0700

Vinayakam Mani committed 47eb8eb on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

LDT-1473 resolving merge issue

· /MsgDefs.h

(-7, +19)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): LDT-566: fixed merge changes

Michael Garthwaite — Mon, 04 Aug 2025 09:20:06 -0700

Michael Garthwaite committed 6ba30cb on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

LDT-566: fixed merge changes

· /AlarmDefs.h

(-5, +5)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merge branch 'staging' into LDT-566-water-treatment-and-degassing-fp-2

Michael Garthwaite — Mon, 04 Aug 2025 08:51:13 -0700

Michael Garthwaite committed fc80936 on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 75 more in leahi-common

Merge branch 'staging' into LDT-566-water-treatment-and-degassing-fp-2

· /AlarmDefs.h

(-163, +164)

| History

| Source

| Diff

leahi-common (LDT-1873-dialysate-flow-rate---dd-2): Merged LDT-802

Dara Navaei — Fri, 01 Aug 2025 21:47:21 -0700

Dara Navaei committed 0347b4c on branch LDT-1195-dd-is-balancing-chamber-switching, LDT-1242-iofp-finalize-permeate-tank and 76 more in leahi-common

Merged LDT-802