Activity leahi-dialin/leahi

3:25 pm

Tiffany Mejia

More
eb02c56
changed 40 files
LEAHI-APPLICATION-LDT-627-1

Revert "Merge remote-tracking branch 'origin/staging' into LDT-627-Main-Treatment-Screen-SW-Messaging-Broadcast"

This reverts commit 50cfafb2d49deeb742310635413c14604e1dc0ad, reversing

changes made to 1de45e3e0c294d35982514d1c52e2bad87d0a4b2.

- -24
- +9
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -5
- +1
./dd/dialysate_delivery.py
- History
- Source
- Diff
./dd/dialysate_delivery.py
- -66
- +44
./dd/modules/concentrate_pump.py
- History
- Source
- Diff
./dd/modules/concentrate_pump.py
- -3
- +2
./dd/modules/dialysate_pump.py
- History
- Source
- Diff
./dd/modules/dialysate_pump.py
- -30
- +0
./dd/modules/gen_dialysate.py
- History
- Source
- Diff
./dd/modules/gen_dialysate.py
- -3
- +1
./dd/modules/heaters.py
- History
- Source
- Diff
./dd/modules/heaters.py
- -98
- +0
./dd/modules/post_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/post_gen_dialysate.py
- -132
- +0
./dd/modules/pre_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/pre_gen_dialysate.py
- -12
- +7
./dd/modules/temperature_sensors.py
- History
- Source
- Diff
./dd/modules/temperature_sensors.py
- -3
- +2
./dd/proxies/ro_proxy.py
- History
- Source
- Diff
./dd/proxies/ro_proxy.py
- -26
- +2
./dd/proxies/td_proxy.py
- History
- Source
- Diff
./dd/proxies/td_proxy.py
- -48
- +4
./fp/filtration_purification.py
- History
- Source
- Diff
./fp/filtration_purification.py
- -0
- +256
./fp/modules/boost_pump.py
- History
- Source
./fp/modules/boost_pump.py
- -1
- +1
./fp/modules/flow_sensors.py
- History
- Source
- Diff
./fp/modules/flow_sensors.py
- -5
- +6
./fp/modules/levels.py
- History
- Source
- Diff
./fp/modules/levels.py
… 25 more files in changeset.

11:13 pm

Tiffany Mejia

More
1de45e3
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Fix common .py pressure ranges format

- Adjust TD messaging doxygen comments and correct payload for ejector, switches, and battery to unsigned int

- -24
- +24
./ui/common.py
- History
- Source
- Diff
./ui/common.py
- -32
- +31
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

1:24 am

Tiffany Mejia

More
f65f97e
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

removing TD bubbles and air pump for future implementation

- -47
- +0
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

1:20 am

Tiffany Mejia

More
22edb3e
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust pressure limits in common.py

- Adjust GenDialysate payload naming

- Change TD blood pump to blood flow

- -12
- +12
./ui/common.py
- History
- Source
- Diff
./ui/common.py
- -27
- +27
./ui/dd_messaging.py
- History
- Source
- Diff
./ui/dd_messaging.py
- -10
- +10
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

2:57 pm

Michael Garthwaite

More
add1665
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1 LEAHI-APPLICATION-LDT-627-1

LDT-566: updated msg_ids

- -4
- +5
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py

11:28 am

Tiffany Mejia

More
0be6cfc
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Add TX State message

- -0
- +44
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

10:19 am

Michael Garthwaite

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

LDT-566: code review comments

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

5:49 pm

Michael Garthwaite

More
841c29f
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: fixed msg ids

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

3:13 pm

Michael Garthwaite

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

LDT-566: added op mode broadcast interval override. added missing msg ids

- -1
- +3
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +44
./fp/filtration_purification.py
- History
- Source
- Diff
./fp/filtration_purification.py

1:38 pm

Michael Garthwaite

More
705f224
changed 1 file
LDT-2655-fix_conductivity_override, develop

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

- -1
- +1
./fp/modules/levels.py
- History
- Source
- Diff
./fp/modules/levels.py

1:38 pm

Michael Garthwaite

More
72c423d
changed 11 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

WIP on develop

LDT-566: Updated unit testing to be configured for the leahi dialin project. Various fixes around the project to ensure passing unit tests.

- -0
- +7
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -1
- +1
./fp/modules/levels.py
- History
- Source
- Diff
./fp/modules/levels.py
- -1
- +1
./td/proxies/ui_proxy.py
- History
- Source
- Diff
./td/proxies/ui_proxy.py
… 8 more files in changeset.

12:38 pm

Michael Garthwaite

More
1205ec5
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: implemented blood pump homing cmd.

- -0
- +1
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +25
./td/modules/blood_flow.py
- History
- Source
- Diff
./td/modules/blood_flow.py

10:52 am

Michael Garthwaite

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

LDT-566: updated bubble detector documentation. Updated pre gen dialysate to no longer have depreciated overrides

- -60
- +0
./dd/modules/pre_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/pre_gen_dialysate.py
- -1
- +1
./td/modules/bubble_detector.py
- History
- Source
- Diff
./td/modules/bubble_detector.py

10:47 am

Michael Garthwaite

More
e5c5e1a
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: added a set air trap control. fixed ejector broadcast interval override.

- -0
- +2
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +25
./td/modules/air_trap.py
- History
- Source
- Diff
./td/modules/air_trap.py
- -1
- +43
./td/modules/ejector.py
- History
- Source
- Diff
./td/modules/ejector.py

1:34 pm

Tiffany Mejia

More
5a50ff3
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-630: Main Treatment Screen - SW - Messaging Broadcast - 08: DEV - Dialin Implementation

- Adjust DD/TD Payload naming to have FW valve naming scheme

- -27
- +27
./ui/dd_messaging.py
- History
- Source
- Diff
./ui/dd_messaging.py
- -88
- +109
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

1:04 pm

Michael Garthwaite

More
9301b6e
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: Pre-gen dialysate request message handler implementation

- -0
- +29
./dd/modules/pre_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/pre_gen_dialysate.py

12:55 pm

Michael Garthwaite

More
16ea7b6
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: fixed ejector handler creating tuples

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

11:12 am

Michael Garthwaite

More
84343d0
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: Code review comments

- -6
- +6
./dd/modules/post_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/post_gen_dialysate.py
- -6
- +6
./dd/modules/pre_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/pre_gen_dialysate.py
- -50
- +11
./td/modules/ejector.py
- History
- Source
- Diff
./td/modules/ejector.py

10:55 am

Michael Garthwaite

More
0ca34ba
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: fixed treatment handler data types. code review changes.

- -5
- +6
./td/modules/treatment.py
- History
- Source
- Diff
./td/modules/treatment.py

10:50 am

Michael Garthwaite

More
2dab2b0
changed 5 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: Code review changes.

- -0
- +4
./dd/dialysate_delivery.py
- History
- Source
- Diff
./dd/dialysate_delivery.py
- -1
- +1
./dd/modules/post_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/post_gen_dialysate.py
- -1
- +1
./dd/modules/pre_gen_dialysate.py
- History
- Source
- Diff
./dd/modules/pre_gen_dialysate.py
- -1
- +0
./dd/proxies/td_proxy.py
- History
- Source
- Diff
./dd/proxies/td_proxy.py
- -22
- +0
./td/proxies/dd_proxy.py
- History
- Source
- Diff
./td/proxies/dd_proxy.py

10:05 am

Michael Garthwaite

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

WIP on develop

LDT-566: updated msg_ids

- -0
- +1
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py

10:01 am

Michael Garthwaite

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

LDT-566: fixed ejector broadcast

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

10:04 am

Michael Garthwaite

More
b3774ad
changed 4 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: fixed login msg ids naming.

- -2
- +2
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -1
- +1
./dd/dialysate_delivery.py
- History
- Source
- Diff
./dd/dialysate_delivery.py
- -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:56 am

Tiffany Mejia

More
71ac3af
changed 4 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add enum for TX set point data

- fix payload issues with DD conductivity and Gen dialysate

- fix payload issues with TD messaging

- -0
- +1
./common/msg_ids.py
- History
- Source
- Diff
./common/msg_ids.py
- -0
- +29
./ui/common.py
- History
- Source
./ui/common.py
- -9
- +9
./ui/dd_messaging.py
- History
- Source
- Diff
./ui/dd_messaging.py
- -11
- +11
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

11:24 am

Michael Garthwaite

More
0b843fa
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

LDT-566: alpha integration fixes for air bubble and air trap

- -1
- +1
./td/modules/air_trap.py
- History
- Source
- Diff
./td/modules/air_trap.py
- -9
- +6
./td/modules/bubble_detector.py
- History
- Source
- Diff
./td/modules/bubble_detector.py

10:57 am

Michael Garthwaite

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

WIP on develop

LDT-566: updated bubble detector to not search ADV

- -4
- +1
./td/modules/bubble_detector.py
- History
- Source
- Diff
./td/modules/bubble_detector.py

9:50 am

Michael Garthwaite

More
7f463d8
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

WIP on develop

LDT-566: temporary changes for alpha integration support. Valve homing has 3 parameters. air pump has reverted set state

- -2
- +3
./td/modules/air_pump.py
- History
- Source
- Diff
./td/modules/air_pump.py
- -0
- +1
./td/modules/switches.py
- History
- Source
- Diff
./td/modules/switches.py
- -6
- +7
./td/modules/valves.py
- History
- Source
- Diff
./td/modules/valves.py

3:20 pm

Tiffany Mejia

More
b40b6d7
changed 2 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 49 more LEAHI-APPLICATION-LDT-627-1

LDT-627: Main Treatment Screen - SW - Messaging Broadcast - 05: DEV - Feature Implementation

- Add Main treatment TD messages: Pressure and occlusion, saline, set point data, treatment time, and UF

- Add Main treatment DD messages: Conductivity, Generate dialysate

- -0
- +67
./ui/dd_messaging.py
- History
- Source
- Diff
./ui/dd_messaging.py
- -3
- +215
./ui/td_messaging.py
- History
- Source
- Diff
./ui/td_messaging.py

12:37 pm

Michael Garthwaite

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

LDT-566: updated td blood flow handler.

- -28
- +19
./td/modules/blood_flow.py
- History
- Source
- Diff
./td/modules/blood_flow.py

11:33 am

Michael Garthwaite

More
b0d9d88
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 50 more LEAHI-DIALIN-LDT-566-1

WIP on develop

LDT-566: fixed various TD commands to conform to FW data structures

- -10
- +2
./td/modules/air_pump.py
- History
- Source
- Diff
./td/modules/air_pump.py
- -3
- +2
./td/modules/pressure_sensors.py
- History
- Source
- Diff
./td/modules/pressure_sensors.py
- -5
- +5
./td/modules/valves.py
- History
- Source
- Diff
./td/modules/valves.py

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)

Tiffany Mejia

Tiffany Mejia

Tiffany Mejia

Tiffany Mejia

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite