Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

Behrouz NematiPour — Fri, 20 Nov 2020 01:14:38 -0800

Behrouz NematiPour committed cf4fa75 on branch 2020_EOY_DEMO, Calibration_fixes and 261 more in dialin

Merge branch 'master' into DEN-4691_InLineBloodPressureAdjustments

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

Dara Navaei — Tue, 10 Nov 2020 19:10:12 -0800

Dara Navaei committed ced5678 on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

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

· /dialin/version.py	(-1, +1)	\| History	\| Source	\| Diff
· /tools/start_env.sh	(-1, +1)	\| History	\| Source	\| Diff
· /version.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Updated version.py

Tue, 10 Nov 2020 18:38:05 -0800

Peter Lucia committed 6e62e30 on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

Updated version.py

· /version.py

(-3, +3)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'master' of ssh://dvm-linux02:7999/vv/dialin

Tue, 10 Nov 2020 18:37:41 -0800

Peter Lucia committed fab028f on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

Merge branch 'master' of ssh://dvm-linux02:7999/vv/dialin

· /dialin/version.py	(-1, +1)	\| History	\| Source	\| Diff
· /version.py	(-1, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Updated version

Tue, 10 Nov 2020 18:37:38 -0800

Peter Lucia committed ebe11ea on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

Updated version

· /dialin/version.py

(-1, +1)

| History

| Source

| Diff

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

Dara Navaei — Tue, 10 Nov 2020 18:11:47 -0800

Dara Navaei committed 287af45 on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

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

· /dialin/common/alarm_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/valves.py

(-2, +2)

| History

| Source

| Diff

· /dialin/hd/accelerometer.py

(-2, +2)

| History

| Source

| Diff

… 23 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge master into DEN-5328-Sprint-30

Tue, 10 Nov 2020 17:38:30 -0800

Peter Lucia committed e833e65 on branch 2020_EOY_DEMO, Calibration_fixes and 263 more in dialin

Merge master into DEN-5328-Sprint-30

· /dialin/common/msg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-10, +8)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-2, +2)

| History

| Source

| Diff

· /dialin/hd/accelerometer.py

(-10, +8)

| History

| Source

| Diff

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/hd/blood_flow.py

(-1, +1)

| History

| Source

| Diff

· /dialin/hd/dialysate_inlet_flow.py

(-1, +1)

| History

| Source

| Diff

· /dialin/hd/dialysate_outlet_flow.py

(-1, +1)

| History

| Source

| Diff

· /dialin/hd/hemodialysis_device.py

(-2, +2)

| History

| Source

| Diff

· /dialin/hd/treatment.py

(-1, +1)

| History

| Source

| Diff

… 6 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4698: Code Review 0

Behrouz NematiPour — Tue, 10 Nov 2020 14:29:10 -0800

Behrouz NematiPour committed 030273d on branch 2020_EOY_DEMO, Calibration_fixes and 261 more in dialin

DEN-4698: Code Review 0

· /dialin/squish/utils.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4696: Code Coverage [99.954%]

Behrouz NematiPour — Sun, 08 Nov 2020 22:02:51 -0800

Behrouz NematiPour committed d88f91d on branch 2020_EOY_DEMO, Calibration_fixes and 261 more in dialin

DEN-4696: Code Coverage [99.954%]

· /dialin/squish/denaliMessages.py	(-6, +6)	\| History	\| Source	\| Diff
· /dialin/squish/globals.py	(-18, +0)	\| History	\| Source	\| Diff
· /dialin/squish/utils.py	(-8, +36)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge develop into DEN-5328-Sprint-30

Fri, 06 Nov 2020 12:01:16 -0800

Peter Lucia committed 7fd17b6 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge develop into DEN-5328-Sprint-30

· /dialin/hd/alarms.py

(-0, +27)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4696: Code Coverage [99.722]...

Behrouz NematiPour — Thu, 05 Nov 2020 15:14:49 -0800

Behrouz NematiPour committed 86be198 on branch 2020_EOY_DEMO, Calibration_fixes and 261 more in dialin

DEN-4696: Code Coverage [99.722]

- Moved the ranges values into the common

· /dialin/common/__init__.py	(-1, +2)	\| History	\| Source	\| Diff
· /dialin/common/prs_defs.py	(-0, +21)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

Sean Nash — Thu, 05 Nov 2020 12:06:07 -0800

Sean Nash committed f6ad3cb on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

· /dialin/hd/dialysate_inlet_flow.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_outlet_flow.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: fixed typos for new pump home commands.

Sean Nash — Thu, 05 Nov 2020 12:05:53 -0800

Sean Nash committed 3690e7c on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: fixed typos for new pump home commands.

· /dialin/hd/dialysate_inlet_flow.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_outlet_flow.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

Sean Nash — Thu, 05 Nov 2020 09:27:51 -0800

Sean Nash committed 03d163f on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: Fix typo.

Sean Nash — Thu, 05 Nov 2020 09:27:35 -0800

Sean Nash committed bcb1970 on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: Fix typo.

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

Sean Nash — Wed, 04 Nov 2020 17:38:17 -0800

Sean Nash committed c35d5fb on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: fix to last clear all alarms cmd.

Sean Nash — Wed, 04 Nov 2020 17:38:01 -0800

Sean Nash committed 609fb3a on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: fix to last clear all alarms cmd.

· /dialin/hd/alarms.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

Sean Nash — Wed, 04 Nov 2020 13:07:41 -0800

Sean Nash committed 0513b68 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

· /dialin/hd/alarms.py

(-1, +28)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: Added command to clear all alarms.

Sean Nash — Wed, 04 Nov 2020 13:07:26 -0800

Sean Nash committed 1c910d6 on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: Added command to clear all alarms.

· /dialin/hd/alarms.py

(-1, +28)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fixed merge conflicts.

Sean Nash — Wed, 04 Nov 2020 11:28:36 -0800

Sean Nash committed 5e6e776 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Fixed merge conflicts.

· /dialin/common/msg_defs.py

(-3, +16)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: Updated msg list. Fixed alarms class to reference correct alarm IDs.

Sean Nash — Wed, 04 Nov 2020 11:27:00 -0800

Sean Nash committed 3559c80 on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: Updated msg list. Fixed alarms class to reference correct alarm IDs.

· /dialin/common/msg_defs.py	(-1, +16)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-3, +3)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-3504-dg-dialysate-composition-1-of-2' into develop

Wed, 04 Nov 2020 09:52:17 -0800

Quang Nguyen committed 11e1cc2 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-3504-dg-dialysate-composition-1-of-2' into develop

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-3504: Added conversion util to dg

Wed, 04 Nov 2020 09:51:39 -0800

Quang Nguyen committed 942bc24 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

DEN-3504: Added conversion util to dg

· /dialin/dg/dialysate_generator.py

(-0, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-3504: Fixed out of sync message id

Wed, 04 Nov 2020 09:12:43 -0800

Quang Nguyen committed 7e9d1f4 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

DEN-3504: Fixed out of sync message id

· /dialin/dg/dialysate_generator.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Den-4695: Integration Testing...

Behrouz NematiPour — Tue, 03 Nov 2020 23:08:47 -0800

Behrouz NematiPour committed 79bba98 on branch 2020_EOY_DEMO, Calibration_fixes and 261 more in dialin

Den-4695: Integration Testing

- renamed some variables and methods regarding the pressures adjustment to be consistent.

· /dialin/squish/denaliMessages.py

(-6, +6)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'develop' into DEN-5328-Sprint-30

Tue, 03 Nov 2020 17:20:43 -0800

Peter Lucia committed 06fd2c8 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'develop' into DEN-5328-Sprint-30

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'develop' of ssh://dvm-linux02:7999/vv/dialin into develop

Tue, 03 Nov 2020 17:20:06 -0800

Peter Lucia committed ea68a32 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'develop' of ssh://dvm-linux02:7999/vv/dialin into develop

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5518: Fixed remaining dialysate_inlet_pump function names.

Tue, 03 Nov 2020 17:19:59 -0800

Peter Lucia committed c2cd66c on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

DEN-5518: Fixed remaining dialysate_inlet_pump function names.

· /dialin/hd/dialysate_inlet_flow.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

Sean Nash — Tue, 03 Nov 2020 16:24:10 -0800

Sean Nash committed 1d4e881 on branch 2020_EOY_DEMO, Calibration_fixes and 264 more in dialin

Merge branch 'DEN-4640-hd-firmware-saline-bolus' into develop

· /dialin/common/alarm_defs.py

(-20, +20)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4640: Fixed alarm IDs enum.

Sean Nash — Tue, 03 Nov 2020 16:23:58 -0800

Sean Nash committed 3a07955 on branch 2020_EOY_DEMO, Calibration_fixes and 265 more in dialin

DEN-4640: Fixed alarm IDs enum.

· /dialin/common/alarm_defs.py

(-20, +20)

| History

| Source

| Diff