Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'staging' into DEN-11980-sw_dev-sprint-64

Michael Garthwaite — Tue, 22 Feb 2022 13:04:00 -0800

Michael Garthwaite committed 410627f on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Merge branch 'staging' into DEN-11980-sw_dev-sprint-64

· /dialin/common/alarm_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/dg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-19, +39)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 18 Feb 2022 09:34:36 -0800

Dara Navaei committed 3a70bfb on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /README.md

(-1, +1)

| History

| Source

| Diff

· /build.sh

(-1, +1)

| History

| Source

| Diff

· /dialin/common/alarm_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/alarm_priorities.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/dg_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/hd_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-3, +3)

| History

| Source

| Diff

· /dialin/common/prs_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/ui_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/__init__.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/calibration_record.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect.py

(-1, +1)

| History

| Source

| Diff

… 154 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-11250-hd-syringe-pump-updates' into staging

Michael Garthwaite — Fri, 18 Feb 2022 09:33:52 -0800

Michael Garthwaite committed 10e8db9 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Merge branch 'DEN-11250-hd-syringe-pump-updates' into staging

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11980: Updated hd_simulator to have new dialysate inlet and blood flow messages

Michael Garthwaite — Thu, 17 Feb 2022 11:43:17 -0800

Michael Garthwaite committed 3296c4c on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DEN-11980: Updated hd_simulator to have new dialysate inlet and blood flow messages

· /dialin/ui/hd_simulator.py

(-12, +11)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'UI_S63' into staging

Michael Garthwaite — Thu, 17 Feb 2022 11:26:32 -0800

Michael Garthwaite committed 31050fe on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Merge branch 'UI_S63' into staging

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into staging

Michael Garthwaite — Thu, 17 Feb 2022 11:25:45 -0800

Michael Garthwaite committed 06b3440 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Merge branch 'DEN-9906-hd_dev-flow-measurement-changes' into staging

· /dialin/dg/conductivity_sensors.py

(-4, +26)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11250 Added a command to override the heprin bolus target rate

Wed, 16 Feb 2022 11:18:50 -0800

Hung Nguyen committed b3d7384 on branch DEN-11250-hd-syringe-pump-updates, DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up and 198 more in dialin

DEN-11250 Added a command to override the heprin bolus target rate

· /dialin/hd/syringe_pump.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/test_heprin_bolus_target_rate.py	(-6, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11980: Updates based on code reviews.

Michael Garthwaite — Wed, 16 Feb 2022 09:57:06 -0800

Michael Garthwaite committed c5cba1c on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DEN-11980: Updates based on code reviews.

· /dialin/hd/hemodialysis_device.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11250 Updated debug message

Tue, 15 Feb 2022 11:26:05 -0800

Hung Nguyen committed 0d40376 on branch DEN-11250-hd-syringe-pump-updates, DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up and 198 more in dialin

DEN-11250 Updated debug message

· /dialin/hd/syringe_pump.py

(-3, +3)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11250 Added heprin bolus target rate override

Tue, 15 Feb 2022 11:16:29 -0800

Hung Nguyen committed 1230c68 on branch DEN-11250-hd-syringe-pump-updates, DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up and 198 more in dialin

DEN-11250 Added heprin bolus target rate override

· /dialin/hd/syringe_pump.py	(-0, +29)	\| History	\| Source	\| Diff
· /tests/test_heprin_bolus_target_rate.py	(-0, +37)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11250 Provided Systems with heprin bolus override function

Mon, 14 Feb 2022 18:35:04 -0800

Hung Nguyen committed 37cf5a8 on branch DEN-11250-hd-syringe-pump-updates, DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up and 198 more in dialin

DEN-11250 Provided Systems with heprin bolus override function

· /dialin/common/msg_ids.py

(-0, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fixed MSG_IDs naming

Michael Garthwaite — Mon, 14 Feb 2022 15:25:42 -0800

Michael Garthwaite committed 47b174d on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Fixed MSG_IDs naming

· /dialin/common/msg_ids.py

(-4, +4)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fixed unit tests?

Michael Garthwaite — Mon, 14 Feb 2022 15:07:31 -0800

Michael Garthwaite committed 7fd727b on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Fixed unit tests?

· /dialin/common/alarm_defs.py	(-289, +289)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-378, +376)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIALIN-UI-S63: DIALIN-UI-S63-1...

Behrouz NematiPour — Mon, 14 Feb 2022 14:30:04 -0800

Behrouz NematiPour committed fcfc61f on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

DIALIN-UI-S63: DIALIN-UI-S63-1

- Addressed the code review comments.

· /dialin/utils/conversions.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-139...

Michael Garthwaite — Mon, 14 Feb 2022 13:59:47 -0800

Michael Garthwaite committed cd08a00 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DIAL-139

Updated hd_defs with UF and Saline operation enums. Updated Alarms def and msg_id's. Fixed current treatment parameters not following HEX sequence, syncing with FW.

· /dialin/common/alarm_defs.py	(-291, +291)	\| History	\| Source	\| Diff
· /dialin/common/dg_defs.py	(-3, +7)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-2, +17)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-371, +380)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-129 implementation....

Michael Garthwaite — Mon, 14 Feb 2022 10:39:56 -0800

Michael Garthwaite committed a40950b on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DIAL-129 implementation.

DIAL-129 implementation. Message protocol no longer contains blood_prime_safety_cum_vol. Removed blood_prime_ind_cum_vol to sync with current message protocol.

· /dialin/hd/treatment.py

(-5, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fixed receiving current treatment parameters...

Michael Garthwaite — Wed, 09 Feb 2022 18:22:23 -0800

Michael Garthwaite committed cec28c0 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

Fixed receiving current treatment parameters

DIAL-144: Implemented current treatment parameters within hd/treatment.py. Fixed Blood Flow handler for rotor count. Updated Message id's for current treatment parameters.

· /dialin/common/msg_ids.py	(-2, +5)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-0, +156)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN9906 Updated code to publish raw conductivity data

Wed, 09 Feb 2022 12:47:45 -0800

Hung Nguyen committed 1dedb01 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

DEN9906 Updated code to publish raw conductivity data

· /dialin/dg/conductivity_sensors.py

(-4, +26)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Band-aid the Blood prime message for now...

Behrouz NematiPour — Mon, 07 Feb 2022 15:43:02 -0800

Behrouz NematiPour committed 5dd18d4 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

Band-aid the Blood prime message for now

- UI and Dialin are not in sync with the MessageList.

· /dialin/ui/hd_simulator.py

(-0, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-145: Added get function for UI version. Removed debugging statement.

Michael Garthwaite — Mon, 07 Feb 2022 10:22:58 -0800

Michael Garthwaite committed c8e6fd1 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DIAL-145: Added get function for UI version. Removed debugging statement.

· /dialin/hd/hemodialysis_device.py

(-1, +13)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-145: Implemented UI version request in hemodialysis_device.py. Handler method as well.

Michael Garthwaite — Fri, 04 Feb 2022 09:23:05 -0800

Michael Garthwaite committed 1d0f0c1 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 197 more in dialin

DIAL-145: Implemented UI version request in hemodialysis_device.py. Handler method as well.

· /dialin/hd/hemodialysis_device.py

(-0, +63)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIALIN-BUG-S63: DIALIN-BUG-S63-1...

Behrouz NematiPour — Tue, 01 Feb 2022 19:21:13 -0800

Behrouz NematiPour committed 0f18251 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

DIALIN-BUG-S63: DIALIN-BUG-S63-1

- Addressed code review comments.

· /dialin/ui/hd_simulator.py	(-25, +20)	\| History	\| Source	\| Diff
· /dialin/ui/unittests.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11821: Failed to get UI version from HDSimulator class, it returns None...

Behrouz NematiPour — Thu, 20 Jan 2022 18:15:45 -0800

Behrouz NematiPour committed 6b32185 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

DEN-11821: Failed to get UI version from HDSimulator class, it returns None

- Changed the UI version format

- added console_out condition for printing the version.

· /dialin/ui/hd_simulator.py

(-3, +4)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11821: Failed to get UI version from HDSimulator class, it returns None...

Behrouz NematiPour — Wed, 19 Jan 2022 21:29:50 -0800

Behrouz NematiPour committed d9b45e5 on branch DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up, DEN-11928-dg-conductivity-update and 198 more in dialin

DEN-11821: Failed to get UI version from HDSimulator class, it returns None

- fixed the version response parser

- Added some other conversion functions to ease the conversion and make it error free.

· /dialin/ui/hd_simulator.py	(-15, +38)	\| History	\| Source	\| Diff
· /dialin/utils/conversions.py	(-0, +92)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 05 Jan 2022 15:13:51 -0800

Dara Navaei committed adae506 on branch DEN-11250-hd-syringe-pump-updates, DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up and 199 more in dialin

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

· /README.md

(-1, +1)

| History

| Source

| Diff

· /build.sh

(-1, +1)

| History

| Source

| Diff

· /dialin/common/alarm_defs.py

(-3, +3)

| History

| Source

| Diff

· /dialin/common/alarm_priorities.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/dg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/hd_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-3, +3)

| History

| Source

| Diff

· /dialin/common/prs_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/common/ui_defs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/__init__.py

(-3, +3)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/calibration_record.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect.py

(-1, +1)

| History

| Source

| Diff

… 153 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11114 addressed the code review comments

Dara Navaei — Wed, 05 Jan 2022 10:11:30 -0800

Dara Navaei committed 516a07d on branch DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2, DEN-11250-hd-syringe-pump-updates and 200 more in dialin

DEN-11114 addressed the code review comments

· /dialin/dg/reservoirs.py	(-1, +3)	\| History	\| Source	\| Diff
· /dialin/hd/blood_leak.py	(-1, +3)	\| History	\| Source	\| Diff
· /dialin/hd/fans.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11114 continued developing the blood leak

Dara Navaei — Tue, 04 Jan 2022 17:49:34 -0800

Dara Navaei committed 51548ed on branch DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2, DEN-11250-hd-syringe-pump-updates and 200 more in dialin

DEN-11114 continued developing the blood leak

· /dialin/hd/alarms.py	(-10, +5)	\| History	\| Source	\| Diff
· /dialin/hd/calibration_record.py	(-1, +25)	\| History	\| Source	\| Diff
· /tests/dg_heat_and_chemical_disinfect_test.py	(-5, +7)	\| History	\| Source	\| Diff
· /tests/peter/test_hd_records.py	(-1, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11114 added a fan publish

Dara Navaei — Wed, 22 Dec 2021 14:38:45 -0800

Dara Navaei committed a3aa9f7 on branch DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2, DEN-11250-hd-syringe-pump-updates and 200 more in dialin

DEN-11114 added a fan publish

· /dialin/hd/alarms.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/fans.py	(-7, +6)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11114 disabled a few alarms module code

Dara Navaei — Wed, 22 Dec 2021 14:07:23 -0800

Dara Navaei committed 5a14dc4 on branch DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2, DEN-11250-hd-syringe-pump-updates and 200 more in dialin

DEN-11114 disabled a few alarms module code

· /dialin/hd/alarms.py	(-10, +13)	\| History	\| Source	\| Diff
· /tests/dg_heat_and_chemical_disinfect_test.py	(-1, +10)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-11114 updated the fans function

Dara Navaei — Tue, 21 Dec 2021 17:59:44 -0800

Dara Navaei committed 946a19e on branch DEN-11114-dg_dev-dg-dialysate-temperature-control-2-of-2, DEN-11250-hd-syringe-pump-updates and 200 more in dialin

DEN-11114 updated the fans function

· /dialin/dg/fans.py

(-1, +1)

| History

| Source

| Diff