Activity leahi-dialin/

2:49 pm

Michael Garthwaite

More
e64aa88
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 46 more LEAHI-DIALIN-LDT-1473-1

LDT-1473: changed temperature override to consider conductivity sensors with temperature.

- -5
- +15
/leahi_dialin/dd/modules/temperature_sensors.py
- History
- Source
- Diff
/leahi_dialin/dd/.../temperature_sensors.py

1:57 pm

Michael Garthwaite

More
9ac39d9
changed 4 files
LDT-2655-fix_conductivity_override, develop LEAHI-DIALIN-LDT-2655-1

Merge branch 'LDT-1473-ultrafiltration-dd' into develop

- -0
- +1
/leahi_dialin/common/__init__.py
- History
- Source
- Diff
/leahi_dialin/common/__init__.py
- -7
- +0
/leahi_dialin/fp/modules/levels.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/levels.py
- -20
- +2
/leahi_dialin/fp/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/valves.py
- -5
- +0
/leahi_dialin/fp/modules/water_pumps.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/water_pumps.py

1:57 pm

Michael Garthwaite

More
829d25c
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 46 more LEAHI-DIALIN-LDT-1473-1

LDT-1473: Updated heaters broadcast to be in sync with dd heaters broadcast.

- -14
- +21
/leahi_dialin/dd/modules/heaters.py
- History
- Source
- Diff
/leahi_dialin/dd/modules/heaters.py

12:42 pm

Behrouz NematiPour

More
82673b4
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 46 more

Merge branch 'feature/LDT-907-Main-Treatment-Screen-SW-Diagnostics-Screen-DD-2' into staging

- -0
- +1
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py
- -18
- +508
/leahi_dialin/ui/dd_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/dd_messaging.py
- -94
- +162
/leahi_dialin/ui/td_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/td_messaging.py

4:20 pm

Tiffany Mejia

More
a5182b0
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-APPLICATION-LDT-907-2

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation - Implement DD Valves Message

- -0
- +111
/leahi_dialin/ui/dd_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/dd_messaging.py

4:06 pm

Jonny Paguio <jpaguio@diality.com>

More
68bb533
changed 1 file
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 46 more LEAHI-DIALIN-LDT-602-1

Removed extraneous functions

- -25
- +0
/setup.py
- History
- Source
- Diff
/setup.py

3:53 pm

Jonny Paguio <jpaguio@diality.com>

More
e0eadb4
changed 3 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 46 more LEAHI-DIALIN-LDT-602-1

Updated naming of wheel file to occur in build.sh instead of setup.py and removed version.py

- -1
- +14
/build.sh
- History
- Source
- Diff
/build.sh
- -83
- +0
/leahi_dialin/version.py
- History
- Source
- Diff
/leahi_dialin/version.py
- -35
- +29
/setup.py
- History
- Source
- Diff
/setup.py

2:07 pm

Jonny Paguio <jpaguio@diality.com>

More
e22aa39
changed 0 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more

Merge remote-tracking branch 'origin/staging' into LDT-1872-leahi-dialin-add-version-variab

Merging staging

2:00 pm

Jonny Paguio <jpaguio@diality.com>

More
77740bc
changed 10 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 48 more LEAHI-DIALIN-LDT-1872-1

LDT-1872: DD/init: Added version and FPGA version initialization, FP submodules: moved enumerations to fp_defs

- -0
- +1
/leahi_dialin/common/__init__.py
- History
- Source
- Diff
/leahi_dialin/common/__init__.py
- -1
- +71
/leahi_dialin/common/fp_defs.py
- History
- Source
- Diff
/leahi_dialin/common/fp_defs.py
- -0
- +2
/leahi_dialin/dd/dialysate_delivery.py
- History
- Source
- Diff
/leahi_dialin/dd/dialysate_delivery.py
- -5
- +0
/leahi_dialin/fp/modules/conductivity_sensors.py
- History
- Source
- Diff
/leahi_dialin/fp/.../conductivity_sensors.py
- -6
- +0
/leahi_dialin/fp/modules/flow_sensors.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/flow_sensors.py
- -7
- +0
/leahi_dialin/fp/modules/levels.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/levels.py
- -13
- +0
/leahi_dialin/fp/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/fp/.../pressure_sensors.py
- -16
- +1
/leahi_dialin/fp/modules/temperatures.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/temperatures.py
- -20
- +2
/leahi_dialin/fp/modules/valves.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/valves.py
- -5
- +0
/leahi_dialin/fp/modules/water_pumps.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/water_pumps.py

1:31 pm

Michael Garthwaite

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

Merge branch 'staging' into develop

- -0
- +3
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py

1:05 pm

Michael Garthwaite

More
3b67c9a
changed 0 files
LDT-1195-dd-request-for-a-variable-for-b, LDT-1196-dd-request-for-a-variable-for-t and 47 more

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

11:16 am

Tiffany Mejia

More
fdaa21a
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-APPLICATION-LDT-907-2

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Adjust TD and DD descriptions to match fn implementation

- Add MSG ID to all TD and DD implemented messages

- -16
- +18
/leahi_dialin/ui/dd_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/dd_messaging.py
- -98
- +121
/leahi_dialin/ui/td_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/td_messaging.py

10:42 am

Michael Garthwaite

More
4f967e4
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-DIALIN-LDT-566-2

LDT-566: updated comments to indicate TODOs

- -0
- +3
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/protocols/CAN.py

9:21 am

Michael Garthwaite

More
b4df138
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-DIALIN-LDT-566-2

LDT-566: code review comments.

- -0
- +1
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py
- -5
- +0
/leahi_dialin/fp/modules/alarms.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/alarms.py
- -4
- +0
/leahi_dialin/fp/modules/ro_pump.py
- History
- Source
- Diff
/leahi_dialin/fp/modules/ro_pump.py

1:28 am

Tiffany Mejia

More
7916765
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-APPLICATION-LDT-907-2

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Add Air bubbles and Air Pump message

- -0
- +45
/leahi_dialin/ui/td_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/td_messaging.py

11:52 am

Michael Garthwaite

More
72c53ec
changed 0 files
LDT-2655-fix_conductivity_override, develop

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

11:52 am

Michael Garthwaite

More
114a63e
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-DIALIN-LDT-566-2

LDT-566: fixed typo

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

11:37 am

Michael Garthwaite

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

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

11:37 am

Michael Garthwaite

More
9ccbc0c
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-DIALIN-LDT-566-2

LDT-566: fixed dialin channels for blood flow estimation overrides. updated ejector documentation

- -3
- +3
/leahi_dialin/td/modules/blood_flow.py
- History
- Source
- Diff
/leahi_dialin/td/modules/blood_flow.py
- -8
- +3
/leahi_dialin/td/modules/ejector.py
- History
- Source
- Diff
/leahi_dialin/td/modules/ejector.py
- -2
- +2
/tests/fp_dianogistic_logger.py
- History
- Source
- Diff
/tests/fp_dianogistic_logger.py

1:51 pm

Vinayakam Mani

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

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

1:41 pm

Michael Garthwaite

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

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

1:40 pm

Michael Garthwaite

More
6e95e17
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-DIALIN-LDT-566-2

LDT-566: updated pressure sensors for fp and td.

- -31
- +0
/leahi_dialin/fp/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/fp/.../pressure_sensors.py
- -0
- +15
/leahi_dialin/td/modules/pressure_sensors.py
- History
- Source
- Diff
/leahi_dialin/td/.../pressure_sensors.py
- -1
- +1
/tests/data_capture_helpers/fp_helpers.py
- History
- Source
- Diff
/tests/data_capture_helpers/fp_helpers.py
- -2
- +2
/tests/fp_dianogistic_logger.py
- History
- Source
- Diff
/tests/fp_dianogistic_logger.py

11:24 pm

Tiffany Mejia

More
95af742
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-APPLICATION-LDT-907-2

LDT-915: Main Treatment Screen - SW - Diagnostics Screen-DD - 08: DEV - Dialin Implementation

- Add Blood leak message as 0x60

- Add The following DD messages: levels, pressure, temperature, heaters, concentrate pumps, dialysate pumps, blood leak

- -0
- +1
/leahi_dialin/common/msg_ids.py
- History
- Source
- Diff
/leahi_dialin/common/msg_ids.py
- -2
- +379
/leahi_dialin/ui/dd_messaging.py
- History
- Source
- Diff
/leahi_dialin/ui/dd_messaging.py

2:04 pm

Michael Garthwaite

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

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

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

2:04 pm

Michael Garthwaite

More
9bb361e
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-DIALIN-LDT-566-2

WIP on develop

LDT-566: fixed can protocol exception

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

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
/leahi_dialin/protocols/CAN.py
- History
- Source
- Diff
/leahi_dialin/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 49 more LEAHI-DIALIN-LDT-566-2

WIP on develop

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

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

12:37 pm

Vinayakam Mani

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

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

12:37 pm

Vinayakam Mani

More
d07e48f
changed 1 file
LDT-2655-fix_conductivity_override, develop LEAHI-DIALIN-LDT-2655-1

update DD test

- -78
- +92
/tests/test_dd.py
- History
- Source
- Diff
/tests/test_dd.py

11:42 am

Michael Garthwaite

More
76398b8
changed 0 files
LDT-2655-fix_conductivity_override, develop

Merge branch 'LDT-566-water-treatment-and-degassing-fp-2' 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

Behrouz NematiPour

Tiffany Mejia

Jonny Paguio <jpaguio@diality.com>

Jonny Paguio <jpaguio@diality.com>

Jonny Paguio <jpaguio@diality.com>

Jonny Paguio <jpaguio@diality.com>

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Vinayakam Mani

Michael Garthwaite

Michael Garthwaite

Tiffany Mejia

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Michael Garthwaite

Vinayakam Mani

Vinayakam Mani

Michael Garthwaite