Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4308 merged with develop branch

Dara Navaei — Wed, 14 Oct 2020 08:51:40 -0700

Dara Navaei committed 58ebcc0 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 merged with develop branch

· /dialin/common/msg_defs.py	(-5, +14)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-9, +39)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4308 removed try and except clauses from the publish function

Dara Navaei — Thu, 08 Oct 2020 09:59:12 -0700

Dara Navaei committed 3f64080 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 removed try and except clauses from the publish function

· /dialin/hd/valves.py

(-8, +20)

| History

| Source

| Diff

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

Dara Navaei — Fri, 02 Oct 2020 16:32:05 -0700

Dara Navaei committed e2d925f on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 addressed code review comments

· /dialin/hd/valves.py	(-39, +0)	\| History	\| Source	\| Diff
· /tests/hd_valves_test.py	(-69, +6)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DIAL-33: Fixed missing values

Fri, 02 Oct 2020 14:24:57 -0700

Peter Lucia committed f994f3f on branch 2020_EOY_DEMO, Calibration_fixes and 267 more in dialin

DIAL-33: Fixed missing values

· /dialin/hd/air_trap.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-4, +4)	\| History	\| Source	\| Diff

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

Fri, 02 Oct 2020 13:42:45 -0700

Peter Lucia committed e172ddc on branch 2020_EOY_DEMO, Calibration_fixes and 267 more in dialin

Merge branch 'master' into staging

· /dialin/common/msg_defs.py	(-0, +15)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-6, +5)	\| History	\| Source	\| Diff
· /dialin/dg/hd_proxy.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/heaters.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/ro_pump.py	(-2, +2)	\| 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	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/test_hd.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/test_uf.py	(-4, +4)	\| History	\| Source	\| Diff

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

Fri, 02 Oct 2020 13:41:53 -0700

Peter Lucia committed 12a0ed5 on branch 2020_EOY_DEMO, Calibration_fixes and 267 more in dialin

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4308 merged master into the branch and addressed code review comments

Dara Navaei — Fri, 02 Oct 2020 09:11:11 -0700

Dara Navaei committed 87cf0bc on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 merged master into the branch and addressed code review comments

· /dialin/common/msg_defs.py	(-0, +195)	\| History	\| Source	\| Diff
· /dialin/dg/temperature_sensors.py	(-12, +51)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-30, +51)	\| History	\| Source	\| Diff
· /dialin/hd/valves.py	(-98, +83)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-528, +554)	\| History	\| Source	\| Diff
· /dialin/squish/messageBuilder.py	(-11, +24)	\| History	\| Source	\| Diff
· /dialin/squish/unittests.py	(-8, +25)	\| History	\| Source	\| Diff
· /dialin/squish/utils.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/hd_valves_test.py	(-13, +22)	\| History	\| Source	\| Diff

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

Dara Navaei — Wed, 30 Sep 2020 15:00:34 -0700

Dara Navaei committed 34b6c91 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 addressed code review comments

· /dialin/hd/valves.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-123, +124)	\| History	\| Source	\| Diff
· /dialin/squish/messageBuilder.py	(-2, +0)	\| History	\| Source	\| Diff
· /tests/hd_valves_test.py	(-0, +7)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5053: Addressed code review feedback.

Sean Nash — Wed, 30 Sep 2020 10:19:37 -0700

Sean Nash committed 924c42d on branch 2020_EOY_DEMO, Calibration_fixes and 268 more in dialin

DEN-5053: Addressed code review feedback.

· /dialin/hd/air_trap.py	(-3, +4)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-11, +5)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5053: Addressed code review feedback.

Sean Nash — Tue, 29 Sep 2020 15:53:08 -0700

Sean Nash committed c8ab70e on branch 2020_EOY_DEMO, Calibration_fixes and 268 more in dialin

DEN-5053: Addressed code review feedback.

· /dialin/common/msg_defs.py	(-1, +14)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/air_trap.py	(-7, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5053: Added HD and DG s/w reset request commands.

Sean Nash — Thu, 24 Sep 2020 10:24:14 -0700

Sean Nash committed c7effef on branch 2020_EOY_DEMO, Calibration_fixes and 268 more in dialin

DEN-5053: Added HD and DG s/w reset request commands.

· /dialin/dg/dialysate_generator.py	(-0, +30)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-1, +34)	\| History	\| Source	\| Diff
· /tests/air_trap_levels.py	(-0, +44)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4308 added air trap valve status to the publish function

Dara Navaei — Wed, 23 Sep 2020 10:02:31 -0700

Dara Navaei committed 2c2a2e3 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 added air trap valve status to the publish function

· /dialin/hd/valves.py

(-4, +15)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4308 work in porgress, developed and tested the Dialin APIs

Dara Navaei — Wed, 23 Sep 2020 08:32:25 -0700

Dara Navaei committed 3979792 on branch 2020_EOY_DEMO, Calibration_fixes and 266 more in dialin

DEN-4308 work in porgress, developed and tested the Dialin APIs

· /dialin/hd/valves.py	(-17, +234)	\| History	\| Source	\| Diff
· /tests/hd_valves_test.py	(-6, +101)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5053: Added HD class for Air Trap module.

Sean Nash — Mon, 21 Sep 2020 18:31:15 -0700

Sean Nash committed 6158522 on branch 2020_EOY_DEMO, Calibration_fixes and 268 more in dialin

DEN-5053: Added HD class for Air Trap module.

· /dialin/dg/load_cells.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/air_trap.py	(-0, +187)	\| History	\| Source

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 — Fri, 18 Sep 2020 11:33:37 -0700

Dara Navaei committed 7536c3e on branch 2020_EOY_DEMO, Calibration_fixes and 269 more in dialin

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

· /dialin/dg/alarms.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge pull request #3 in VV/dialin from DEN-4169-dg-inlet-water-temperature to master...

Fri, 18 Sep 2020 11:33:08 -0700

Peter Lucia committed 3bb9885 on branch 2020_EOY_DEMO, Calibration_fixes and 269 more in dialin

Merge pull request #3 in VV/dialin from DEN-4169-dg-inlet-water-temperature to master

* commit '912a57cb9d300f872aa771ffe2a197e87aaff4d6':

DEN-4169: Use common msg id and address code review

DEN-4169: Added alarm module to dg

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

Thu, 10 Sep 2020 16:37:42 -0700

Peter Lucia committed a8f0a0f on branch 2020_EOY_DEMO, Calibration_fixes and 267 more in dialin

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

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

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

Sean Nash — Thu, 10 Sep 2020 15:23:30 -0700

Sean Nash committed 10bd08a on branch 2020_EOY_DEMO, Calibration_fixes and 270 more in dialin

DEN-4211: Addressed merge conflicts.

· /dialin/dg/accelerometer.py

(-15, +16)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-36, +79)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-20, +21)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-18, +20)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-23, +23)

| History

| Source

| Diff

· /dialin/hd/accelerometer.py

(-15, +16)

| History

| Source

| Diff

· /dialin/hd/alarms.py

(-36, +47)

| History

| Source

| Diff

· /dialin/hd/blood_flow.py

(-46, +46)

| History

| Source

| Diff

· /dialin/hd/constants.py

(-9, +8)

| History

| Source

| Diff

· /dialin/hd/dialysate_inlet_flow.py

(-37, +38)

| History

| Source

| Diff

· /dialin/hd/dialysate_outlet_flow.py

(-43, +44)

| History

| Source

| Diff

· /dialin/hd/hemodialysis_device.py

(-35, +44)

| History

| Source

| Diff

· /dialin/hd/treatment.py

(-11, +11)

| History

| Source

| Diff

· /dialin/hd/ui_proxy.py

(-33, +102)

| History

| Source

| Diff

· /dialin/squish/crc.py

(-1, +15)

| History

| Source

| Diff

… 7 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4169: Use common msg id and address code review

Wed, 09 Sep 2020 14:58:41 -0700

Quang Nguyen committed 912a57c on branch 2020_EOY_DEMO, Calibration_fixes and 270 more in dialin

DEN-4169: Use common msg id and address code review

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4211: Addressed code review comments.

Sean Nash — Tue, 08 Sep 2020 09:35:00 -0700

Sean Nash committed 586c9f1 on branch 2020_EOY_DEMO, Calibration_fixes and 270 more in dialin

DEN-4211: Addressed code review comments.

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4169: Added alarm module to dg

Wed, 02 Sep 2020 17:44:13 -0700

Quang Nguyen committed d490b41 on branch 2020_EOY_DEMO, Calibration_fixes and 270 more in dialin

DEN-4169: Added alarm module to dg

· /dialin/dg/alarms.py	(-0, +150)	\| History	\| Source
· /dialin/dg/dialysate_generator.py	(-0, +2)	\| 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, 01 Sep 2020 10:23:26 -0700

Dara Navaei committed d36d505 on branch 2020_EOY_DEMO, Calibration_fixes and 271 more in dialin

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

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

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

Tue, 01 Sep 2020 10:23:03 -0700

Peter Lucia committed d592a44 on branch 2020_EOY_DEMO, Calibration_fixes and 271 more in dialin

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-4589: Created version.py symlink, fixed setup.py import

Tue, 01 Sep 2020 10:22:55 -0700

Peter Lucia committed 22af5b6 on branch 2020_EOY_DEMO, Calibration_fixes and 271 more in dialin

DEN-4589: Created version.py symlink, fixed setup.py import

· /setup.py	(-2, +2)	\| History	\| Source	\| Diff
· /version.py	(-0, +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, 01 Sep 2020 10:14:59 -0700

Dara Navaei committed 53017c3 on branch 2020_EOY_DEMO, Calibration_fixes and 271 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

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

Tue, 01 Sep 2020 10:03:13 -0700

Peter Lucia committed 549833e on branch 2020_EOY_DEMO, Calibration_fixes and 271 more in dialin

Bumping dialin version

· /dialin/version.py

(-2, +2)

| 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, 01 Sep 2020 09:14:15 -0700

Dara Navaei committed 8ea13ae on branch 2020_EOY_DEMO, Calibration_fixes and 271 more in dialin

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

· /build.sh

(-1, +1)

| History

| Source

| Diff

· /dialin/common/alarm_defs.py

(-0, +15)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-0, +15)

| History

| Source

| Diff

· /dialin/dg/__init__.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-9, +8)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/valves.py

(-1, +1)

| History

| Source

| Diff

… 40 more files in changeset.

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'