Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge master into DEN-4589_Sprint_26

Tue, 01 Sep 2020 09:17:57 -0700

Peter Lucia committed a9f1495 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

Merge master into DEN-4589_Sprint_26

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

Tue, 01 Sep 2020 09:12:19 -0700

Peter Lucia committed 27357f8 on branch 2020_EOY_DEMO, Calibration_fixes and 272 more in dialin

Merge branch 'master' into staging

· /dialin/squish/denaliMessages.py	(-0, +40)	\| History	\| Source	\| Diff
· /dialin/squish/unittests.py	(-0, +13)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Fixed drain pump bug, added get_fpga_version()

Mon, 31 Aug 2020 18:22:06 -0700

Peter Lucia committed f40bfed on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Fixed drain pump bug, added get_fpga_version()

· /dialin/dg/dialysate_generator.py	(-0, +8)	\| History	\| Source	\| Diff
· /dialin/dg/drain_pump.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-4438_SalineBolus'

Behrouz NematiPour — Mon, 31 Aug 2020 12:26:45 -0700

Behrouz NematiPour committed cce60b0 on branch 2020_EOY_DEMO, Calibration_fixes and 272 more in dialin

Merge branch 'DEN-4438_SalineBolus'

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Removed pkg-resources dependency

Fri, 28 Aug 2020 15:11:31 -0700

Peter Lucia committed ddb0f33 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Removed pkg-resources dependency

· /build.sh	(-0, +1)	\| History	\| Source	\| Diff
· /setup.py	(-1, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Adding missing dg get_fpga_version

Fri, 28 Aug 2020 14:33:14 -0700

Peter Lucia committed 27fbdcf on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Adding missing dg get_fpga_version

· /dialin/dg/dialysate_generator.py

(-0, +8)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Version fix

Fri, 28 Aug 2020 14:15:20 -0700

Peter Lucia committed 9c06951 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Version fix

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Added missing get_fpga_version, adjusted treatment parameters response ordering.

Fri, 28 Aug 2020 13:15:21 -0700

Peter Lucia committed 933ce7a on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Added missing get_fpga_version, adjusted treatment parameters response ordering.

· /dialin/hd/ui_proxy.py	(-0, +8)	\| History	\| Source	\| Diff
· /tests/test_hd_simulator.py	(-18, +18)	\| History	\| Source	\| Diff

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

Thu, 27 Aug 2020 10:10:21 -0700

Peter Lucia committed e5a8b71 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589: Updated Changelog

· /CHANGELOG.md

(-0, +19)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge pull request #2 in VV/dialin from DEN-4322-dg-water-ro-rejection to staging...

Thu, 27 Aug 2020 09:29:35 -0700

Peter Lucia committed efc9725 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

Merge pull request #2 in VV/dialin from DEN-4322-dg-water-ro-rejection to staging

* commit '219f8023145f879d9b17191f60a3f7700ff32665':

DEN-4322: Removed alignment per code review

DEN-4322: Removed RO rejection ratio override command

DEN-4322: Updated Dialin API for DG RO rejection ratio

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge DEN-4344_Sprint 25 into staging

Wed, 26 Aug 2020 11:56:41 -0700

Peter Lucia committed 900f998 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

Merge DEN-4344_Sprint 25 into staging

· /dialin/dg/dialysate_generator.py

(-12, +34)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/valves.py

(-9, +8)

| History

| Source

| Diff

· /dialin/hd/alarms.py

(-34, +36)

| History

| Source

| Diff

· /dialin/hd/blood_flow.py

(-16, +15)

| History

| Source

| Diff

· /dialin/hd/buttons.py

(-9, +63)

| History

| Source

| Diff

· /dialin/hd/dialysate_inlet_flow.py

(-9, +8)

| History

| Source

| Diff

· /dialin/hd/dialysate_outlet_flow.py

(-9, +8)

| History

| Source

| Diff

· /dialin/hd/hemodialysis_device.py

(-9, +9)

| History

| Source

| Diff

… 4 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): Updated to Projects instead of projects

Wed, 26 Aug 2020 11:48:59 -0700

Peter Lucia committed 4837283 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

Updated to Projects instead of projects

· /tools/install_to_venv.sh

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589 - Updated to Projects instead of projects

Wed, 26 Aug 2020 11:47:47 -0700

Peter Lucia committed ccb6690 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4589 - Updated to Projects instead of projects

· /tools/install_to_venv.sh

(-1, +1)

| History

| Source

| Diff

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

Mon, 24 Aug 2020 18:02:32 -0700

Peter Lucia committed c9a14bb on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

Fixed duplicate version.py

· /docs/source/conf.py	(-1, +1)	\| History	\| Source	\| Diff
· /setup.py	(-1, +1)	\| History	\| Source	\| Diff
· /version.py	(--1, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge staging into DEN-4589_Sprint_26

Mon, 24 Aug 2020 10:21:55 -0700

Peter Lucia committed 46bedab on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

Merge staging into DEN-4589_Sprint_26

· /dialin/dg/dialysate_generator.py

(-0, +2)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-1, +6)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-4, +16)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-1, +8)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-0, +6)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-2, +8)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-2, +9)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-3, +39)

| History

| Source

| Diff

· /dialin/dg/valves.py

(-2, +8)

| History

| Source

| Diff

· /dialin/hd/alarms.py

(-0, +10)

| History

| Source

| Diff

· /dialin/hd/blood_flow.py

(-6, +22)

| History

| Source

| Diff

· /dialin/hd/buttons.py

(-0, +6)

| History

| Source

| Diff

· /dialin/hd/dialysate_inlet_flow.py

(-31, +47)

| History

| Source

| Diff

· /dialin/hd/dialysate_outlet_flow.py

(-5, +23)

| History

| Source

| Diff

· /dialin/hd/hemodialysis_device.py

(-4, +16)

| History

| Source

| Diff

… 3 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-29: Added DG temperature sensors enum

Mon, 24 Aug 2020 09:44:08 -0700

Peter Lucia committed ef82679 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DIAL-29: Added DG temperature sensors enum

· /dialin/dg/temperature_sensors.py	(-0, +16)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_dg_temperature_sensors.py	(-0, +34)	\| History	\| Source

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

Behrouz NematiPour — Sun, 23 Aug 2020 12:28:37 -0700

Behrouz NematiPour committed 53e705f on branch 2020_EOY_DEMO, Calibration_fixes and 274 more in dialin

DEN-4445 Code Review 0

· /dialin/squish/unittests.py

(-2, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Added static code analysis

Fri, 21 Aug 2020 17:27:28 -0700

Peter Lucia committed e525a31 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4589: Added static code analysis

· /requirements.txt	(-0, +6)	\| History	\| Source	\| Diff
· /tools/run_static_code_analysis.sh	(-0, +5)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4344, DIAL-9: Documentation fixes

Fri, 21 Aug 2020 13:54:21 -0700

Peter Lucia committed cad96c2 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DEN-4344, DIAL-9: Documentation fixes

· /dialin/hd/blood_flow.py	(-6, +6)	\| History	\| Source	\| Diff
· /dialin/hd/rtc.py	(-10, +16)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-6, +5)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Removed empty file

Fri, 21 Aug 2020 12:44:47 -0700

Peter Lucia committed acab432 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

Removed empty file

· /tests/coverage/run_coverage.py

(-0, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-28, DEN-4589, DEN-4344: Ensure unit tests don't mix with hardware reliant tests, finalized import test

Fri, 21 Aug 2020 11:53:40 -0700

Peter Lucia committed f194e9e on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DIAL-28, DEN-4589, DEN-4344: Ensure unit tests don't mix with hardware reliant tests, finalized import test

· /dialin/ui/__init__.py	(-0, +2)	\| History	\| Source	\| Diff
· /tests/test_dg_valves.py	(-28, +48)	\| History	\| Source	\| Diff
· /tests/test_ui_proxy.py	(-0, +35)	\| History	\| Source
· /tests/unit_tests/test_dg_valves.py	(-60, +0)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_imports.py	(-1, +2)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_ui_proxy.py	(-35, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-28, DEN-4589, DEN-4344: Simplified dialin import system

Fri, 21 Aug 2020 11:37:31 -0700

Peter Lucia committed b543d90 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DIAL-28, DEN-4589, DEN-4344: Simplified dialin import system

· /dialin/__init__.py	(-0, +3)	\| History	\| Source	\| Diff
· /dialin/common/__init__.py	(-0, +2)	\| History	\| Source	\| Diff
· /dialin/dg/__init__.py	(-1, +11)	\| History	\| Source	\| Diff
· /dialin/hd/__init__.py	(-0, +12)	\| History	\| Source	\| Diff
· /dialin/protocols/__init__.py	(-0, +4)	\| History	\| Source	\| Diff
· /tests/test_hd.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_imports.py	(-0, +28)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4322: Removed alignment per code review

Fri, 21 Aug 2020 09:51:35 -0700

Quang Nguyen committed 219f802 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DEN-4322: Removed alignment per code review

· /dialin/dg/conductivity_sensors.py

(-3, +3)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589 Fixed HD import issue and reworked version.py to work outside of git repos.

Thu, 20 Aug 2020 16:54:24 -0700

Peter Lucia committed 01777f6 on branch 2020_EOY_DEMO, Calibration_fixes and 275 more in dialin

DEN-4589 Fixed HD import issue and reworked version.py to work outside of git repos.

· /.gitignore	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/version.py	(-5, +32)	\| History	\| Source	\| Diff
· /tests/test_print_version.py	(-0, +20)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4322: Removed RO rejection ratio override command

Mon, 17 Aug 2020 10:20:03 -0700

Quang Nguyen committed 485d4ea on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DEN-4322: Removed RO rejection ratio override command

· /dialin/dg/conductivity_sensors.py

(-37, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Updated hd simulator test

Mon, 17 Aug 2020 08:57:18 -0700

Peter Lucia committed 56f9771 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

Updated hd simulator test

· /tests/test_hd_simulator.py

(-2, +28)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4322: Updated Dialin API for DG RO rejection ratio

Fri, 14 Aug 2020 12:27:13 -0700

Quang Nguyen committed c9b3a20 on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

DEN-4322: Updated Dialin API for DG RO rejection ratio

· /dialin/dg/conductivity_sensors.py

(-15, +68)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Added canbus convenience functions

Wed, 12 Aug 2020 14:56:31 -0700

Peter Lucia committed d34628e on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

Added canbus convenience functions

· /.gitignore	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/protocols/CAN.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_proxy.py	(-3, +1)	\| History	\| Source	\| Diff
· /dialin/utils/base.py	(-0, +156)	\| History	\| Source	\| Diff
· /tests/test_can.py	(-0, +22)	\| History	\| Source

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

Behrouz NematiPour — Tue, 11 Aug 2020 21:29:50 -0700

Behrouz NematiPour committed 5bdaabb on branch 2020_EOY_DEMO, Calibration_fixes and 274 more in dialin

DEN-4443: Integration Testing

- Added a function to check for can0 so if the canbus is not configured we can fail the test.

· /dialin/squish/unittests.py

(-0, +15)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fixed ro pump msg ids, added fpga version to dg and hd versions, added test imports to unit tests, cleaned up get alarm ...

Tue, 11 Aug 2020 12:08:17 -0700

Peter Lucia committed c3cc81d on branch 2020_EOY_DEMO, Calibration_fixes and 276 more in dialin

Fixed ro pump msg ids, added fpga version to dg and hd versions, added test imports to unit tests, cleaned up get alarm states

· /dialin/dg/dialysate_generator.py	(-4, +26)	\| History	\| Source	\| Diff
· /dialin/dg/ro_pump.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-22, +23)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-8, +37)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-9, +5)	\| History	\| Source	\| Diff
· /dialin/squish/messageBuilder.py	(-8, +3)	\| History	\| Source	\| Diff
· /dialin/squish/unittests.py	(-9, +4)	\| History	\| Source	\| Diff
· /dialin/ui/hd_proxy.py	(-3, +0)	\| History	\| Source	\| Diff
· /tests/test_demo.py	(-2, +5)	\| History	\| Source	\| Diff
· /tests/test_hd_simulator.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/test_imports.py	(-79, +0)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_imports.py	(-0, +79)	\| History	\| Source
· /tools/install_to_venv.sh	(-2, +2)	\| History	\| Source	\| Diff