Activity leahi-dialin/

11:25 am

Michael Garthwaite

More
6e58562
changed 1 file
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

fixed can pairings and valve channel id

- -11
- +14
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py

11:25 am

Michael Garthwaite

More
47f2938
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

11:24 am

Michael Garthwaite

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

Merge branch 'LEAH-142-dial-td-base-object' into develop

fixed RO login message

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

11:22 am

Michael Garthwaite

More
151f2ea
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

WIP on LEAH-142-dial-td-base-object

fixed channel ID pairs.

- -22
- +25
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py

11:04 am

Michael Garthwaite

More
90e9dd3
changed 1 file
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

WIP on develop

fixed valves channels

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

11:02 am

Sean Nash

More
54ba744
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

11:02 am

Sean Nash

More
75e4518
added 2 files
LDT-2655-fix_conductivity_override, develop LEAHI-DIALIN-LDT-2655-1

TEST: Added test scripts.

- -0
- +98
/tests/test_ro.py
- History
- Source
/tests/test_ro.py
- -0
- +94
/tests/test_td.py
- History
- Source
/tests/test_td.py

10:31 am

Michael Garthwaite

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

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

10:31 am

Michael Garthwaite

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

fixed circular import reference

- -2
- +1
/leahi_dialin/dd/proxies/ro_proxy.py
- History
- Source
- Diff
/leahi_dialin/dd/proxies/ro_proxy.py

10:28 am

Michael Garthwaite

More
03ec166
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

10:28 am

Michael Garthwaite

More
2cfe3b2
changed 4 files
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

fixed dd_proxy. added inits for easier importing.

- -0
- +1
/leahi_dialin/dd/__init__.py
- History
- Source
- Diff
/leahi_dialin/dd/__init__.py
- -0
- +1
/leahi_dialin/ro/__init__.py
- History
- Source
- Diff
/leahi_dialin/ro/__init__.py
- -0
- +1
/leahi_dialin/td/__init__.py
- History
- Source
- Diff
/leahi_dialin/td/__init__.py
- -2
- +1
/leahi_dialin/td/proxies/dd_proxy.py
- History
- Source
- Diff
/leahi_dialin/td/proxies/dd_proxy.py

10:17 am

Michael Garthwaite

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

Merge branch 'LEAH-142-dial-td-base-object' into develop

10:17 am

Michael Garthwaite

More
6388ebc
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

WIP on develop

updated build script.

- -1
- +1
/build.sh
- History
- Source
- Diff
/build.sh
- -2
- +2
/setup.py
- History
- Source
- Diff
/setup.py

9:59 am

Michael Garthwaite

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

Merge branch 'LEAH-142-dial-td-base-object' into develop

9:58 am

Michael Garthwaite

More
8ae7b13
changed 2 files
LDT-2655-fix_conductivity_override, develop

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

- -1
- +4
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py
- -0
- +6
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py

9:58 am

Michael Garthwaite

More
bd45f04
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

implemented gen dialysate request proxy cmd

- -0
- +63
/leahi_dialin/td/proxies/dd_proxy.py
- History
- Source
- Diff
/leahi_dialin/td/proxies/dd_proxy.py
- -0
- +5
/leahi_dialin/td/treatment_delivery.py
- History
- Source
- Diff
/leahi_dialin/td/treatment_delivery.py

9:55 am

Michael Garthwaite

More
9a9f638
changed 4 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 proxy commands for demo. Updated message IDs

- -1
- +9
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py
- -0
- +6
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py
- -0
- +62
/leahi_dialin/dd/proxies/ro_proxy.py
- History
- Source
/leahi_dialin/dd/proxies/ro_proxy.py
- -0
- +79
/leahi_dialin/dd/proxies/td_proxy.py
- History
- Source
- Diff
/leahi_dialin/dd/proxies/td_proxy.py

9:28 am

Michael Garthwaite

More
55f8c0d
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LEAH-142-dial-td-base-object' into develop

9:27 am

Michael Garthwaite

More
cd4a454
changed 2 files
master, LDT-1195-dd-request-for-a-variable-for-b and 63 more LEAHI-DIALIN-LEAH-142-2

commented out interval checkin until FW implementation. Fixed blood flow handler. Fixed blood flow overrides that had incorrect logging.

- -28
- +6
/leahi_dialin/td/modules/blood_flow.py
- History
- Source
- Diff
/leahi_dialin/td/modules/blood_flow.py
- -3
- +3
/leahi_dialin/td/treatment_delivery.py
- History
- Source
- Diff
/leahi_dialin/td/treatment_delivery.py

9:23 am

Michael Garthwaite

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

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

- -2
- +2
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py

9:23 am

Michael Garthwaite

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

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

9:22 am

Michael Garthwaite

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

commented out interval checkin until FW implementation.

- -2
- +2
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py

9:21 am

Michael Garthwaite

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

updated pathing for imports

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

9:18 am

Michael Garthwaite

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

moved constants folder. Updated Ro valves

- -18
- +0
/leahi_dialin/ro/constants.py
- History
- Source
- Diff
/leahi_dialin/ro/constants.py
- -1
- +0
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/boost_pump.py
- -0
- +18
/leahi_dialin/ro/modules/constants.py
- History
- Source
/leahi_dialin/ro/modules/constants.py
- -0
- +291
/leahi_dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/ro/modules/valves.py

9:06 am

Michael Garthwaite

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

Moving modules to folder

updated naming and handlers

- -263
- +0
/leahi-dialin/ro/modules/boost_pump.py
- History
- Source
- Diff
/leahi-dialin/ro/modules/boost_pump.py
- -130
- +0
/leahi-dialin/ro/modules/levels.py
- History
- Source
- Diff
/leahi-dialin/ro/modules/levels.py
- -173
- +0
/leahi-dialin/ro/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi-dialin/ro/.../pressure_sensors.py
- -0
- +0
/leahi-dialin/ro/modules/valves.py
- History
- Source
- Diff
/leahi-dialin/ro/modules/valves.py
- -0
- +256
/leahi_dialin/ro/modules/boost_pump.py
- History
- Source
/leahi_dialin/ro/modules/boost_pump.py
- -0
- +129
/leahi_dialin/ro/modules/levels.py
- History
- Source
/leahi_dialin/ro/modules/levels.py
- -0
- +171
/leahi_dialin/ro/modules/pressure_sensors.py
- History
- Source
/leahi_dialin/ro/modules/pressure_sensors.py
- -0
- +0
/leahi_dialin/ro/modules/valves.py
- History
- Source
/leahi_dialin/ro/modules/valves.py
- -0
- +245
/leahi_dialin/ro/reverse_osmosis.py
- History
- Source
- Diff
/leahi_dialin/ro/reverse_osmosis.py

1:43 pm

Michael Garthwaite

More
4e0b678
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

1:43 pm

Michael Garthwaite

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

updated levels handler. Fixed pressure sensor counter overrides from floats to ints.

- -4
- +1
/leahi_dialin/dd/modules/levels.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/levels.py
- -8
- +8
/leahi_dialin/dd/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/dd/.../pressure_sensors.py

10:39 am

Sean Nash

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

TEST: Fixed typos in blood_flow.py.

- -3
- +3
/leahi_dialin/td/modules/blood_flow.py
- History
- Source
- Diff
/leahi_dialin/td/modules/blood_flow.py
- -1
- +1
/tests/test_uf.py
- History
- Source
- Diff
/tests/test_uf.py

4:09 pm

Sean Nash

More
7bc77fb
changed 5 files
LDT-2655-fix_conductivity_override, develop

TEST: misc fixes and disables to facilitate testing.

- -11
- +11
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py
- -14
- +4
/leahi_dialin/td/modules/blood_flow.py
- History
- Source
- Diff
/leahi_dialin/td/modules/blood_flow.py
- -2
- +2
/leahi_dialin/td/treatment_delivery.py
- History
- Source
- Diff
/leahi_dialin/td/treatment_delivery.py
- -3
- +17
/tests/test_dd.py
- History
- Source
- Diff
/tests/test_dd.py
- -20
- +20
/tests/test_uf.py
- History
- Source
- Diff
/tests/test_uf.py

10:47 am

Sean Nash

More
a2b122c
changed 2 files
LDT-2655-fix_conductivity_override, develop

TEST: renamed UI to HD channel to UI to TD. Commented out 2 lines in dialysate_delivery.py that were crashing Dialin.

- -2
- +2
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py
- -2
- +1
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py

leahi-dialin

Stats

Commits this week: 19

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

Michael Garthwaite

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

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Sean Nash

Sean Nash

Sean Nash