Activity leahi-dialin/

10:26 am

Sean Nash

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

TEST: Update to RO test script.

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

5:01 pm

Sean Nash

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

TEST: misc RO test script changes.

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

4:23 pm

Sean Nash

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

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

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

4:23 pm

Sean Nash

More
48cc95b
changed 2 files
LDT-2655-fix_conductivity_override, develop

TEST: Added pump enum to boost_pump class. Updates to RO test script.

- -0
- +2
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -16
- +16
/tests/test_ro.py
- History
- Source
- Diff
/tests/test_ro.py

3:29 pm

Michael Garthwaite

More
94d317b
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

3:29 pm

Michael Garthwaite

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

fixed concentrate pump handler to be in the correct order.

- -14
- +15
/leahi_dialin/dd/modules/concentrate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../concentrate_pump.py

3:04 pm

Michael Garthwaite

More
93094da
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

3:03 pm

Michael Garthwaite

More
0e04853
added 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 59 more LEAHI-DIALIN-LEAH-136-2 LEAHI-DIALIN-LEAH-136-3

WIP on develop

added init file for build script

- -0
- +0
/leahi_dialin/ro/modules/__init__.py
- History
- Source
/leahi_dialin/ro/modules/__init__.py

2:57 pm

Michael Garthwaite

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

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

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

2:56 pm

Michael Garthwaite

More
557a20a
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 59 more LEAHI-DIALIN-LEAH-136-2

fixed boost pump import. fixed valve doc string

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

2:35 pm

Michael Garthwaite

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

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

2:35 pm

Michael Garthwaite

More
03936b9
changed 4 files
master, LDT-1195-dd-request-for-a-variable-for-b and 59 more LEAHI-DIALIN-LEAH-139-2

WIP on develop

fixed dd set start stop cmds

- -0
- +32
/leahi_dialin/dd/modules/concentrate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../concentrate_pump.py
- -9
- +9
/leahi_dialin/dd/modules/dialysate_pump.py
- History
- Source
- Diff
/leahi_dialin/dd/.../dialysate_pump.py
- -6
- +7
/leahi_dialin/dd/modules/heaters.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/heaters.py
- -0
- +33
/leahi_dialin/dd/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/valves.py

2:14 pm

Sean Nash

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

TEST: Fixed misc valve bug.

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

2:12 pm

Sean Nash

More
436032f
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

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

2:12 pm

Sean Nash

More
f57dc55
changed 4 files
LDT-2655-fix_conductivity_override, develop

TEST: Added pump enum list to boost_pump class. Changed valve state override param from bool to int. Refined TD and RO test scripts.

- -0
- +5
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -2
- +2
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py
- -43
- +24
/tests/test_ro.py
- History
- Source
- Diff
/tests/test_ro.py
- -52
- +3
/tests/test_td.py
- History
- Source
- Diff
/tests/test_td.py

12:44 pm

Michael Garthwaite

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

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

12:43 pm

Michael Garthwaite

More
8c0c7ee
changed 3 files
master, LDT-1195-dd-request-for-a-variable-for-b and 59 more LEAHI-DIALIN-LEAH-136-2

WIP on develop

documentation fixes

- -2
- +2
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -8
- +8
/leahi_dialin/ro/modules/levels.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/levels.py
- -2
- +2
/leahi_dialin/ro/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/ro/.../pressure_sensors.py

12:35 pm

Michael Garthwaite

More
2515ac7
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

12:35 pm

Michael Garthwaite

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

WIP on develop

fixed set pwm

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

12:32 pm

Michael Garthwaite

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

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

12:32 pm

Michael Garthwaite

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

WIP on develop

fixed boost pump pwm

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

12:30 pm

Michael Garthwaite

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

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

12:30 pm

Michael Garthwaite

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

WIP on develop

fixed set pwm to not be an override

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

12:27 pm

Sean Nash

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

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

12:26 pm

Michael Garthwaite

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

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

12:26 pm

Michael Garthwaite

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

fixed override.

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

12:25 pm

Michael Garthwaite

More
383d61e
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

12:25 pm

Michael Garthwaite

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

WIP on develop

fixed ro boost pump overrides

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

12:25 pm

Sean Nash

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

TEST: update to RO test script.

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

12:13 pm

Sean Nash

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

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

leahi-dialin

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Sean Nash

Sean Nash

Sean Nash

Sean Nash

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

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

Sean Nash

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Sean Nash