Fisheye on leahi-dialin/leahi_dialin/ro

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): test

Behrouz NematiPour — Wed, 23 Apr 2025 15:49:25 -0700

Behrouz NematiPour committed 1a719e5 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 84 more in leahi-dialin

test

· /leahi_dialin/fp/__init__.py

(-0, +22)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/__init__.py

(-0, +0)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/boost_pump.py

(-0, +255)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/conductivity_sensors.py

(-0, +230)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/constants.py

(-0, +18)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/flow_sensors.py

(-0, +175)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/levels.py

(-0, +128)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/pressure_sensors.py

(-0, +220)

| History

| Source

| Diff

· /leahi_dialin/fp/modules/valves.py

(-0, +294)

| History

| Source

| Diff

· /leahi_dialin/fp/reverse_osmosis.py

(-0, +248)

| History

| Source

| Diff

· /leahi_dialin/ro/__init__.py

(-22, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/__init__.py

(-0, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/boost_pump.py

(-255, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/conductivity_sensors.py

(-230, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/constants.py

(-18, +0)

| History

| Source

| Diff

… 5 more files in changeset.

leahi-dialin (LDT-2655-fix_conductivity_override): Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"...

Behrouz NematiPour — Wed, 23 Apr 2025 14:33:38 -0700

Behrouz NematiPour committed 78a6637 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Revert "Merge branch 'LDT-237-MainTreatmentScreen-SW-SimulatorCleanup' into develop"

This reverts commit 2ef54f5cc7ef9ce2cf49c528a6205f77933d8a77, reversing

changes made to 9403e6711adf53da699ff25b4b7342286bf49b92.

· /leahi_dialin/common/__init__.py	(-2, +2)	\| History	\| Source	\| Diff
· /leahi_dialin/dd/__init__.py	(-22, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/protocols/CAN.py	(-4, +3)	\| History	\| Source	\| Diff
· /leahi_dialin/protocols/__init__.py	(-2, +2)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/__init__.py	(-22, +0)	\| History	\| Source	\| Diff
· /leahi_dialin/td/__init__.py	(-22, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ui/td_messaging.py	(-4, +4)	\| History	\| Source	\| Diff
· /leahi_dialin/utils/__init__.py	(-2, +2)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation...

Behrouz NematiPour — Wed, 23 Apr 2025 12:24:52 -0700

Behrouz NematiPour committed be6aa30 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 84 more in leahi-dialin

LDT-242 Main Treatment Screen - SW - Simulator Cleanup - 05: DEV - Feature Implementation

- Fixed the issues caused SWVV main test to fail.

· /leahi_dialin/common/__init__.py	(-2, +2)	\| History	\| Source	\| Diff
· /leahi_dialin/dd/__init__.py	(-1, +22)	\| History	\| Source	\| Diff
· /leahi_dialin/protocols/CAN.py	(-5, +5)	\| History	\| Source	\| Diff
· /leahi_dialin/protocols/__init__.py	(-2, +2)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/__init__.py	(-1, +22)	\| History	\| Source	\| Diff
· /leahi_dialin/td/__init__.py	(-1, +22)	\| History	\| Source	\| Diff
· /leahi_dialin/ui/td_messaging.py	(-4, +4)	\| History	\| Source	\| Diff
· /leahi_dialin/utils/__init__.py	(-2, +2)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): WIP on develop...

Michael Garthwaite — Fri, 21 Feb 2025 08:23:54 -0800

Michael Garthwaite committed 0f08c28 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 84 more in leahi-dialin

WIP on develop

Renamed RO class and sub modules to use FP to be in line with sub system names

· /leahi_dialin/__init__.py

(-1, +1)

| History

| Source

| Diff

· /leahi_dialin/fp/__init__.py

(-0, +1)

| History

| Source

· /leahi_dialin/fp/filtration_purification.py

(-0, +250)

| History

| Source

· /leahi_dialin/fp/modules/__init__.py

(-0, +0)

| History

| Source

· /leahi_dialin/fp/modules/boost_pump.py

(-0, +256)

| History

| Source

· /leahi_dialin/fp/modules/conductivity_sensors.py

(-0, +230)

| History

| Source

· /leahi_dialin/fp/modules/constants.py

(-0, +18)

| History

| Source

· /leahi_dialin/fp/modules/flow_sensors.py

(-0, +175)

| History

| Source

· /leahi_dialin/fp/modules/levels.py

(-0, +135)

| History

| Source

· /leahi_dialin/fp/modules/pressure_sensors.py

(-0, +220)

| History

| Source

· /leahi_dialin/fp/modules/valves.py

(-0, +294)

| History

| Source

· /leahi_dialin/protocols/CAN.py

(-10, +10)

| History

| Source

| Diff

· /leahi_dialin/ro/__init__.py

(-1, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/__init__.py

(-0, +0)

| History

| Source

| Diff

· /leahi_dialin/ro/modules/boost_pump.py

(-255, +0)

| History

| Source

| Diff

… 9 more files in changeset.

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

Michael Garthwaite — Thu, 13 Feb 2025 14:18:41 -0800

Michael Garthwaite committed dfbb4f0 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-261-fw-ro-flow-sensor-driver' into develop

· /leahi_dialin/dd/modules/piston_pump.py	(-6, +13)	\| History	\| Source	\| Diff
· /leahi_dialin/dd/proxies/td_proxy.py	(-2, +8)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/boost_pump.py	(-34, +32)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/levels.py	(-9, +10)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/valves.py	(-54, +54)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/reverse_osmosis.py	(-3, +3)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): LEAHI-136: Code review comments.

Michael Garthwaite — Thu, 06 Feb 2025 10:00:03 -0800

Michael Garthwaite committed d0317f5 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

LEAHI-136: Code review comments.

· /leahi_dialin/ro/reverse_osmosis.py

(-1, +1)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): LEAHI-136: code review comments

Michael Garthwaite — Wed, 05 Feb 2025 13:31:10 -0800

Michael Garthwaite committed 08788e2 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

LEAHI-136: code review comments

· /leahi_dialin/ro/modules/conductivity_sensors.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/pressure_sensors.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/valves.py	(-1, +1)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): LEAHI-136: code review comments

Michael Garthwaite — Wed, 05 Feb 2025 10:43:57 -0800

Michael Garthwaite committed c995ca1 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

LEAHI-136: code review comments

· /leahi_dialin/ro/modules/flow_sensors.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/levels.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/pressure_sensors.py	(-2, +2)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): LEAHI-136: addressing code review comments. Updated pressure handler method.

Michael Garthwaite — Wed, 05 Feb 2025 10:37:51 -0800

Michael Garthwaite committed 7ae7087 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

LEAHI-136: addressing code review comments. Updated pressure handler method.

· /leahi_dialin/ro/modules/boost_pump.py	(-34, +32)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/conductivity_sensors.py	(-65, +21)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/flow_sensors.py	(-30, +28)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/levels.py	(-11, +10)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/pressure_sensors.py	(-35, +73)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/valves.py	(-54, +53)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/reverse_osmosis.py	(-3, +3)	\| History	\| Source	\| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-136-dial-ro-base-object' into develop

Michael Garthwaite — Fri, 13 Dec 2024 11:11:31 -0800

Michael Garthwaite committed 2bb54c4 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-136-dial-ro-base-object' into develop

· /leahi_dialin/ro/reverse_osmosis.py

(-1, +4)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): WIP on develop...

Michael Garthwaite — Fri, 13 Dec 2024 11:10:58 -0800

Michael Garthwaite committed 6889609 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

WIP on develop

added flow sensors and conductivity to ro main module

· /leahi_dialin/ro/reverse_osmosis.py

(-1, +4)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: fixes to RO levels and flow sensors.

Sean Nash — Fri, 13 Dec 2024 08:44:17 -0800

Sean Nash committed 270356f on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: fixes to RO levels and flow sensors.

· /leahi_dialin/ro/modules/flow_sensors.py	(-6, +6)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/levels.py	(-11, +16)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/reverse_osmosis.py	(-0, +2)	\| History	\| Source	\| Diff
· /tests/test_ro.py	(-2, +14)	\| History	\| Source	\| Diff
· /tests/test_td.py	(-3, +2)	\| History	\| Source	\| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-136-dial-ro-base-object' into develop

Michael Garthwaite — Tue, 10 Dec 2024 11:10:12 -0800

Michael Garthwaite committed 78c301b on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-136-dial-ro-base-object' into develop

· /leahi_dialin/ro/modules/valves.py

(-1, +0)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): fixed ro valve positioning

Michael Garthwaite — Tue, 10 Dec 2024 11:09:19 -0800

Michael Garthwaite committed 2d30541 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

fixed ro valve positioning

· /leahi_dialin/ro/modules/valves.py

(-5, +5)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Adjustments to RO valves class.

Sean Nash — Tue, 10 Dec 2024 10:59:09 -0800

Sean Nash committed f0908ac on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Adjustments to RO valves class.

· /leahi_dialin/ro/modules/valves.py

(-6, +6)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-136-dial-ro-base-object' into develop

Michael Garthwaite — Tue, 10 Dec 2024 10:26:09 -0800

Michael Garthwaite committed 1ad88ae on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-136-dial-ro-base-object' into develop

· /leahi_dialin/ro/modules/valves.py

(-14, +18)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): updated RO valves with SPP valve.

Michael Garthwaite — Tue, 10 Dec 2024 10:25:28 -0800

Michael Garthwaite committed eed229f on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

updated RO valves with SPP valve.

· /leahi_dialin/ro/modules/valves.py

(-26, +30)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): fixed ro flow sensor registering an unknown method

Michael Garthwaite — Tue, 10 Dec 2024 10:15:46 -0800

Michael Garthwaite committed e4d1e64 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

fixed ro flow sensor registering an unknown method

· /leahi_dialin/ro/modules/flow_sensors.py

(-1, +1)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-136-dial-ro-base-object' into develop

Michael Garthwaite — Tue, 10 Dec 2024 10:10:32 -0800

Michael Garthwaite committed bfb64f6 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-136-dial-ro-base-object' into develop

· /leahi_dialin/ro/modules/boost_pump.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/pressure_sensors.py	(-2, +13)	\| History	\| Source	\| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): added RO conductivity module.

Michael Garthwaite — Tue, 10 Dec 2024 10:10:21 -0800

Michael Garthwaite committed 4afd0ae on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

added RO conductivity module.

· /leahi_dialin/ro/modules/conductivity.py	(-0, +0)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/conductivity_sensors.py	(-0, +274)	\| History	\| Source

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): Added flow sensor module. minor updates across other modules

Michael Garthwaite — Tue, 10 Dec 2024 10:04:04 -0800

Michael Garthwaite committed 3c967e5 on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

Added flow sensor module. minor updates across other modules

· /leahi_dialin/ro/modules/boost_pump.py	(-1, +1)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/conductivity.py	(-0, +0)	\| History	\| Source
· /leahi_dialin/ro/modules/flow_sensors.py	(-0, +177)	\| History	\| Source
· /leahi_dialin/ro/modules/levels.py	(-2, +2)	\| History	\| Source	\| Diff
· /leahi_dialin/ro/modules/pressure_sensors.py	(-2, +13)	\| History	\| Source	\| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): Merge branch 'LEAH-136-dial-ro-base-object' into develop

Michael Garthwaite — Tue, 10 Dec 2024 09:37:05 -0800

Michael Garthwaite committed 91a4cac on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

Merge branch 'LEAH-136-dial-ro-base-object' into develop

· /leahi_dialin/ro/modules/boost_pump.py

(-4, +4)

| History

| Source

| Diff

leahi-dialin (feature/LDT-713-general-alarm-requirements-sw): updated boost pump documentation

Michael Garthwaite — Tue, 10 Dec 2024 09:34:41 -0800

Michael Garthwaite committed 335b74e on branch master, LDT-1195-dd-is-balancing-chamber-switching and 86 more in leahi-dialin

updated boost pump documentation

· /leahi_dialin/ro/modules/boost_pump.py

(-4, +4)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Simplified update to valve_states_all variable.

Sean Nash — Fri, 06 Dec 2024 09:10:33 -0800

Sean Nash committed befe788 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Simplified update to valve_states_all variable.

· /leahi_dialin/ro/modules/valves.py

(-20, +1)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Fixed sensed valve state issue. Populated valve_states_all in broadcast msg handler.

Sean Nash — Thu, 05 Dec 2024 18:04:35 -0800

Sean Nash committed 92358e1 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Fixed sensed valve state issue. Populated valve_states_all in broadcast msg handler.

· /leahi_dialin/ro/modules/valves.py

(-10, +30)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Fixed bit masks for reported RO valve commanded states.

Sean Nash — Thu, 05 Dec 2024 15:05:16 -0800

Sean Nash committed 793fa81 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Fixed bit masks for reported RO valve commanded states.

· /leahi_dialin/ro/modules/valves.py

(-6, +6)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): fixed RO valves handler

Michael Garthwaite — Thu, 05 Dec 2024 14:46:59 -0800

Michael Garthwaite committed 388757f on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

fixed RO valves handler

· /leahi_dialin/ro/modules/valves.py

(-6, +6)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Added PPi pressure sensor to ro.

Sean Nash — Thu, 05 Dec 2024 09:48:29 -0800

Sean Nash committed fd6afc8 on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Added PPi pressure sensor to ro.

· /leahi_dialin/ro/modules/pressure_sensors.py	(-0, +5)	\| History	\| Source	\| Diff
· /tests/test_ro.py	(-1, +2)	\| History	\| Source	\| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: Changed valve swap per Haiwen.

Sean Nash — Thu, 05 Dec 2024 08:58:02 -0800

Sean Nash committed 3d49d3e on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: Changed valve swap per Haiwen.

· /leahi_dialin/ro/modules/valves.py

(-12, +12)

| History

| Source

| Diff

leahi-dialin (LDT-2655-fix_conductivity_override): TEST: More on swapped valve positions for VCr and VROD.

Sean Nash — Thu, 05 Dec 2024 08:48:31 -0800

Sean Nash committed 549707c on branch LDT-2655-fix_conductivity_override, develop in leahi-dialin

TEST: More on swapped valve positions for VCr and VROD.

· /leahi_dialin/ro/modules/valves.py

(-7, +6)

| History

| Source

| Diff