Activity leahi-dialin/leahi

1:01 pm

Michael Garthwaite

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

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

- -1
- +1
./protocols/CAN.py
- History
- Source
- Diff
./protocols/CAN.py

1:01 pm

Michael Garthwaite

More
bb3864d
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

WIP on develop

LDT-566: fixed can. updated temperature override to use the correct override message.

- -1
- +2
./fp/modules/temperatures.py
- History
- Source
- Diff
./fp/modules/temperatures.py
- -1
- +1
./protocols/CAN.py
- History
- Source
- Diff
./protocols/CAN.py

11:13 am

Michael Garthwaite

More
c0d4b74
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: fixed message IDs

- -2
- +2
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py

10:49 am

Michael Garthwaite

More
27aa83c
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -7
- +7
./protocols/CAN.py
- History
- Source
- Diff
./protocols/CAN.py

10:48 am

Michael Garthwaite

More
1c0302e
changed 6 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: implemented permeate tank override. implemented alarm overrides for dd and fp. Commented out debugging logs for now, to be configurable setting.

- -0
- +5
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -1
- +41
./dd/modules/alarms.py
- History
- Source
- Diff
./dd/modules/alarms.py
- -0
- +68
./fp/modules/alarms.py
- History
- Source
- Diff
./fp/modules/alarms.py
- -0
- +98
./fp/modules/permeate_tank.py
- History
- Source
./fp/modules/permeate_tank.py
- -7
- +7
./protocols/CAN.py
- History
- Source
- Diff
./protocols/CAN.py
- -4
- +18
./version.py
- History
- Source
- Diff
./version.py

9:17 am

Michael Garthwaite

More
256ffed
changed 6 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: implemented dd ultrafiltration module

- -2
- +2
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +2
./dd/dialysate_delivery.py
- History
- Source
- Diff
./dd/dialysate_delivery.py
- -1
- +11
./dd/modules/temperature_sensors.py
- History
- Source
- Diff
./dd/modules/temperature_sensors.py
- -0
- +108
./dd/modules/ultrafiltration.py
- History
- Source
./dd/modules/ultrafiltration.py
… 2 more files in changeset.

11:35 am

Michael Garthwaite

More
fbf4532
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: fixed build error for safety shutdown requests

- -1
- +1
./fp/filtration_purification.py
- History
- Source
- Diff
./fp/filtration_purification.py
- -1
- +1
./td/treatment_delivery.py
- History
- Source
- Diff
./td/treatment_delivery.py

11:29 am

Michael Garthwaite

More
b0527bd
changed 4 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: implemented safety shutdown overrides for all 3 sub systems.

- -0
- +1
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +35
./dd/dialysate_delivery.py
- History
- Source
- Diff
./dd/dialysate_delivery.py
- -0
- +33
./fp/filtration_purification.py
- History
- Source
- Diff
./fp/filtration_purification.py
- -0
- +34
./td/treatment_delivery.py
- History
- Source
- Diff
./td/treatment_delivery.py

2:39 pm

Michael Garthwaite

More
000435f
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

WIP on develop

LDT-566: implemented blood flow estimation overrides

- -0
- +3
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +93
./td/modules/blood_flow.py
- History
- Source
- Diff
./td/modules/blood_flow.py

1:14 pm

Michael Garthwaite

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

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

- -6
- +6
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py

1:14 pm

Michael Garthwaite

More
aa57954
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: synced valve naming to fp firmware

- -6
- +6
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py

9:36 am

Michael Garthwaite

More
eb9d26e
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: updated fp temperature sensor handler to have flow meter temperatures

- -2
- +18
./fp/modules/temperatures.py
- History
- Source
- Diff
./fp/modules/temperatures.py

3:10 pm

Michael Garthwaite

More
cfdfc19
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT_566: fixed ui proxy commands.

- -8
- +6
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py

1:53 pm

Michael Garthwaite

More
c3d20dd
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: fixed rejection reason exception

- -2
- +2
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py

1:28 pm

Michael Garthwaite

More
5beeab4
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -7
- +23
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py

1:28 pm

Michael Garthwaite

More
eb67b89
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

WIP on develop

LDT-566: fixed valve enum to contain p20 and p43.

- -7
- +23
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py
- -4
- +7
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py

12:24 pm

Michael Garthwaite

More
028086f
changed 5 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

WIP on develop

LDT-566: updated ui proxy to be in sync with td-ui comm. Implemented uf requests in ui proxy. Implemented treatment parameters request in ui proxy.

- -0
- +3
./dd/modules/constants.py
- History
- Source
- Diff
./dd/modules/constants.py
- -1
- +1
./fp/filtration_purification.py
- History
- Source
- Diff
./fp/filtration_purification.py
- -0
- +3
./td/modules/constants.py
- History
- Source
- Diff
./td/modules/constants.py
- -13
- +102
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py
- -0
- +2
./td/treatment_delivery.py
- History
- Source
- Diff
./td/treatment_delivery.py

2:57 pm

Michael Garthwaite

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

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

- -10
- +0
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py

2:54 pm

Michael Garthwaite

More
94611b3
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: LDT-606: fixed parameter order for td pressure sensor override.

- -2
- +2
./td/modules/pressure_sensors.py
- History
- Source
- Diff
./td/modules/pressure_sensors.py

2:51 pm

Michael Garthwaite

More
e5ca0f1
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: LDT-676: removed M7 and P20 valves

- -10
- +0
./fp/modules/valves.py
- History
- Source
- Diff
./fp/modules/valves.py

2:44 pm

Michael Garthwaite

More
793bdf7
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: implemented filtered overrides for flow sensors. fixed data type to flow rate override.

- -1
- +59
./fp/modules/flow_sensors.py
- History
- Source
- Diff
./fp/modules/flow_sensors.py

2:37 pm

Michael Garthwaite

More
28afd6d
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: added bp max rpm into set speed documentation

- -1
- +1
./td/modules/blood_flow.py
- History
- Source
- Diff
./td/modules/blood_flow.py

2:19 pm

Michael Garthwaite

More
51b54b5
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: LDT-619: LDT-610: fixed typos.

- -2
- +2
./td/modules/bubble_detector.py
- History
- Source
- Diff
./td/modules/bubble_detector.py
- -2
- +2
./td/treatment_delivery.py
- History
- Source
- Diff
./td/treatment_delivery.py
… 1 more file in changeset.

2:09 pm

Michael Garthwaite

More
f67b42d
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

WIP on develop

LDT-566: fixed ui version request with the correct payload

- -2
- +13
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py

1:49 pm

Michael Garthwaite

More
7aaeb8b
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more LEAHI-DIALIN-LDT-566-2

LDT-566: updated pressure and temperature handlers to FW. removed pressure temperature override and combined into the temperature override in fp.temperatures.