Activity leahi-dialin/

11:11 am

Michael Garthwaite

More
2bb54c4
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -1
- +4
/leahi_dialin/ro/reverse_osmosis.py
- History
- Source
- Diff
/leahi_dialin/ro/reverse_osmosis.py

11:11 am

Michael Garthwaite

More
9a51c2b
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

11:10 am

Michael Garthwaite

More
6889609
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

WIP on develop

added flow sensors and conductivity to ro main module

- -1
- +4
/leahi_dialin/ro/reverse_osmosis.py
- History
- Source
- Diff
/leahi_dialin/ro/reverse_osmosis.py

11:09 am

Michael Garthwaite

More
e1f2b0f
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-139-2

WIP on develop

fixed concentrate pump handler

- -21
- +17
/leahi_dialin/dd/modules/concentrate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../concentrate_pump.py

8:44 am

Sean Nash

More
270356f
changed 5 files
LDT-2655-fix_conductivity_override, develop LEAHI-DIALIN-LDT-2655-1

TEST: fixes to RO levels and flow sensors.

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

4:28 pm

Vinayakam Mani

More
93bd2f0
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

4:27 pm

Vinayakam Mani

More
10d688e
changed 1 file
LDT-2655-fix_conductivity_override, develop

Gen Dial and Vhi update

- -12
- +45
/tests/test_dd.py
- History
- Source
- Diff
/tests/test_dd.py

11:10 am

Michael Garthwaite

More
78c301b
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -1
- +0
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

11:09 am

Michael Garthwaite

More
2d30541
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

fixed ro valve positioning

- -5
- +5
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

11:00 am

Michael Garthwaite

More
bc3135a
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

11:00 am

Michael Garthwaite

More
9a915d1
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-139-2

WIP on develop

updated dd valve positioning

- -8
- +8
/leahi_dialin/dd/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/valves.py

10:59 am

Sean Nash

More
f0908ac
changed 1 file
LDT-2655-fix_conductivity_override, develop

TEST: Adjustments to RO valves class.

- -6
- +6
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

10:48 am

Sean Nash

More
f47cf31
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-dialin into develop

10:48 am

Sean Nash

More
16a7827
changed 1 file
LDT-2655-fix_conductivity_override, develop

TEST: Add valves to RO test script.

- -12
- +12
/tests/test_ro.py
- History
- Source
- Diff
/tests/test_ro.py

10:26 am

Michael Garthwaite

More
1ad88ae
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -14
- +18
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

10:25 am

Michael Garthwaite

More
eed229f
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2

updated RO valves with SPP valve.

- -26
- +30
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

10:15 am

Michael Garthwaite

More
e8907bc
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

10:15 am

Michael Garthwaite

More
e4d1e64
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

fixed ro flow sensor registering an unknown method

- -1
- +1
/leahi_dialin/ro/modules/flow_sensors.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/flow_sensors.py

10:10 am

Michael Garthwaite

More
bfb64f6
changed 2 files
LDT-2655-fix_conductivity_override, develop LEAHI-DIALIN-LDT-2655-1

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

- -1
- +1
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -2
- +13
/leahi_dialin/ro/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/ro/.../pressure_sensors.py

10:10 am

Michael Garthwaite

More
4afd0ae
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

added RO conductivity module.

- -0
- +0
/leahi_dialin/ro/modules/conductivity.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/conductivity.py
- -0
- +274
/leahi_dialin/ro/modules/conductivity_sensors.py
- History
- Source
/leahi_dialin/ro/.../conductivity_sensors.py

10:04 am

Michael Garthwaite

More
3c967e5
changed 5 files
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

Added flow sensor module. minor updates across other modules

- -1
- +1
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -0
- +0
/leahi_dialin/ro/modules/conductivity.py
- History
- Source
/leahi_dialin/ro/modules/conductivity.py
- -0
- +177
/leahi_dialin/ro/modules/flow_sensors.py
- History
- Source
/leahi_dialin/ro/modules/flow_sensors.py
- -2
- +2
/leahi_dialin/ro/modules/levels.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/levels.py
- -2
- +13
/leahi_dialin/ro/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/ro/.../pressure_sensors.py

9:37 am

Michael Garthwaite

More
60112e4
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

9:37 am

Michael Garthwaite

More
91a4cac
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -4
- +4
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py

9:36 am

Michael Garthwaite

More
eff35c7
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-139-2 LEAHI-DIALIN-LEAH-139-3

updated dd documentation.

- -2
- +2
/leahi_dialin/dd/modules/dialysate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../dialysate_pump.py
- -1
- +1
/leahi_dialin/dd/modules/heaters.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/heaters.py

9:34 am

Michael Garthwaite

More
335b74e
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-136-2

updated boost pump documentation

- -4
- +4
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py

8:55 am

Michael Garthwaite

More
d4a7bd4
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

8:54 am

Michael Garthwaite

More
be5dde1
changed 3 files
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-139-2 LEAHI-DIALIN-LEAH-139-3

Updated DD concentrate handler. Updated pressure handler. Updated valve positions

- -12
- +32
/leahi_dialin/dd/modules/concentrate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../concentrate_pump.py
- -7
- +6
/leahi_dialin/dd/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/dd/.../pressure_sensors.py
- -8
- +8
/leahi_dialin/dd/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/valves.py

3:21 pm

Michael Garthwaite

More
260a3b6
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

3:21 pm

Michael Garthwaite

More
6c364ae
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 61 more LEAHI-DIALIN-LEAH-139-2

fixed valve all states in dd handler

- -3
- +6
/leahi_dialin/dd/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/valves.py

12:23 pm

Michael Garthwaite

More
01329b4
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-139-dial-dd-base-object' into develop

leahi-dialin

Stats

Commits this week: 16

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Vinayakam Mani

Vinayakam Mani

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Sean Nash

Sean Nash

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite