Fisheye on dialin/

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

Sean Nash — Wed, 10 Mar 2021 21:33:56 -0800

Sean Nash committed 0a5edee on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: Fixed merge conflicts from staging.

· /dialin/common/msg_defs.py	(-8, +12)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +3)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-58, +420)	\| History	\| Source	\| Diff
· /version.py	(-69, +0)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-6402-hd_dev-pre-treatment-self-tests' into staging

Tue, 02 Mar 2021 10:08:36 -0800

Quang Nguyen committed 9b36d47 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 234 more in dialin

Merge branch 'DEN-6402-hd_dev-pre-treatment-self-tests' into staging

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6372: Added set HD op mode request.

Sean Nash — Mon, 01 Mar 2021 21:47:41 -0800

Sean Nash committed 9e96d02 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: Added set HD op mode request.

· /dialin/common/msg_defs.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +43)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7043: (BUGFIX) Ensure AlarmID values are cast to int

Mon, 01 Mar 2021 17:39:07 -0800

Peter Lucia committed 46a620c on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 236 more in dialin

DEN-7043: (BUGFIX) Ensure AlarmID values are cast to int

· /dialin/common/alarm_defs.py

(-1, +1)

| History

| Source

| Diff

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

Fri, 26 Feb 2021 15:12:01 -0800

Peter Lucia committed 142b14d on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 236 more in dialin

Merge master into staging

· /dialin/ui/hd_simulator.py

(-0, +9)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7043: (BUGFIX) Correct uf pre-treatment msgid in ui_proxy

Wed, 24 Feb 2021 14:08:11 -0800

Peter Lucia committed d922d27 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 241 more in dialin

DEN-7043: (BUGFIX) Correct uf pre-treatment msgid in ui_proxy

· /dialin/hd/ui_proxy.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7144: Fixed Simulator Alarm plugin...

Behrouz NematiPour — Wed, 24 Feb 2021 13:50:46 -0800

Behrouz NematiPour committed 0f311ae on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 241 more in dialin

DEN-7144: Fixed Simulator Alarm plugin

- Added instance count in Alarm Simulator

- Added a getter for alarm simulator from within HDSimulator.

· /dialin/ui/hd_simulator.py	(-0, +3)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator_alarms.py	(-0, +5)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7144: preTx: Implementation [Simulator/Testing] ( 1 )...

Behrouz NematiPour — Tue, 23 Feb 2021 19:28:43 -0800

Behrouz NematiPour committed 508802a on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 241 more in dialin

DEN-7144: preTx: Implementation [Simulator/Testing] ( 1 )

- Updated the HDSimulator regarding the enum changes in the msg_defs.py

· /dialin/ui/hd_simulator.py

(-2, +2)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'staging' into DEN-6078-revisit-safety-functionality-of-pumps-valves

Dara Navaei — Mon, 22 Feb 2021 16:00:43 -0800

Dara Navaei committed bafa0c3 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

Merge branch 'staging' into DEN-6078-revisit-safety-functionality-of-pumps-valves

· /version.py

(-69, +0)

| History

| Source

| Diff

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

Mon, 22 Feb 2021 14:50:50 -0800

Peter Lucia committed a04732a on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 236 more in dialin

Updated changelog, version.py

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7041: Fixed old treatment states, msg ids.

Mon, 22 Feb 2021 14:49:49 -0800

Peter Lucia committed bd1071f on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 236 more in dialin

DEN-7041: Fixed old treatment states, msg ids.

· /dialin/common/msg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-2, +7)	\| History	\| Source	\| Diff
· /tests/test_heparin.py	(-0, +28)	\| History	\| Source

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6078 addressed a code review comment

Dara Navaei — Mon, 22 Feb 2021 13:22:01 -0800

Dara Navaei committed 3ed6a78 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

DEN-6078 addressed a code review comment

· /dialin/hd/valves.py

(-2, +2)

| History

| Source

| Diff

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

Sun, 21 Feb 2021 23:23:30 -0800

Peter Lucia committed cdf1c02 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

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

· /dialin/protocols/CAN.py	(-11, +23)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-35, +398)	\| History	\| Source	\| Diff

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

Sun, 21 Feb 2021 22:27:41 -0800

Peter Lucia committed e86f10c on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

Updated changelog

· /CHANGELOG.md	(-0, +30)	\| History	\| Source	\| Diff
· /dialin/squish/README.md	(-46, +0)	\| History	\| Source	\| Diff
· /dialin/squish/__init__.py	(-0, +0)	\| History	\| Source	\| Diff
· /dialin/squish/crc.py	(-62, +0)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-1479, +0)	\| History	\| Source	\| Diff
· /dialin/squish/messageBuilder.py	(-95, +0)	\| History	\| Source	\| Diff
· /dialin/squish/unittests.py	(-73, +0)	\| History	\| Source	\| Diff
· /dialin/squish/utils.py	(-180, +0)	\| History	\| Source	\| Diff

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

Sun, 21 Feb 2021 22:19:25 -0800

Peter Lucia committed 20061fe on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

Merge branch 'master' into staging

· /dialin/common/msg_defs.py

(-2, +2)

| History

| Source

| Diff

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

Sun, 21 Feb 2021 22:18:01 -0800

Peter Lucia committed f5af3b9 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

Removed duplicate version.py

· /version.py

(-69, +0)

| History

| Source

| Diff

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

Dara Navaei — Sat, 20 Feb 2021 14:24:21 -0800

Dara Navaei committed 976d426 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

DEN-6078 addressed the code review comments

· /dialin/hd/valves.py

(-1, +5)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Fix the merge conflict revert back issue...

Behrouz NematiPour — Thu, 18 Feb 2021 14:30:55 -0800

Behrouz NematiPour committed 583690f on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 242 more in dialin

Fix the merge conflict revert back issue

- During the merging thought the console_out has been renamed to passive_mode but actually passive_mode is another parameter. So it needs to be added back.

· /dialin/protocols/CAN.py	(-11, +23)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7041: Added changes necessary for testsuites to pass 100%

Wed, 17 Feb 2021 18:11:38 -0800

Peter Lucia committed ef9b75f on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 243 more in dialin

DEN-7041: Added changes necessary for testsuites to pass 100%

· /dialin/protocols/CAN.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator_alarms.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6372: Added override for treatment time remaining.

Sean Nash — Wed, 17 Feb 2021 13:33:26 -0800

Sean Nash committed cff98df on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: Added override for treatment time remaining.

· /dialin/common/msg_defs.py	(-1, +11)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-1, +30)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Tue, 16 Feb 2021 17:35:56 -0800

Behrouz NematiPour committed 96006d2 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 243 more in dialin

Merge branch 'DEN-6631_UI_DEV_Post-Treatment_Rinseback' into staging

· /dialin/common/msg_defs.py	(-5, +11)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-35, +398)	\| History	\| Source	\| Diff
· /dialin/utils/conversions.py	(-0, +20)	\| History	\| Source	\| Diff

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

Sean Nash — Tue, 16 Feb 2021 10:58:57 -0800

Sean Nash committed 3cfd47d on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: Addressed code review feedback.

· /dialin/ui/hd_simulator.py	(-5, +0)	\| History	\| Source	\| Diff
· /tests/test_uf.py	(-10, +11)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6372: Fixed bug in treatment recirc progress message handler.

Sean Nash — Mon, 15 Feb 2021 23:13:26 -0800

Sean Nash committed 47948ee on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: Fixed bug in treatment recirc progress message handler.

· /dialin/hd/treatment.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/test_uf.py	(-2, +8)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6638: ptTx-RB: Code Review 0...

Behrouz NematiPour — Mon, 15 Feb 2021 18:05:34 -0800

Behrouz NematiPour committed e5d96ec on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 244 more in dialin

DEN-6638: ptTx-RB: Code Review 0

- removed extra empty line.

· /dialin/ui/hd_simulator.py

(-1, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6638: ptTx-RB: Code Review 0...

Behrouz NematiPour — Mon, 15 Feb 2021 18:00:04 -0800

Behrouz NematiPour committed 7089b9a on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 244 more in dialin

DEN-6638: ptTx-RB: Code Review 0

- made the console out of the received can messages optional in the HDSimulator class constructor.

· /dialin/protocols/CAN.py	(-2, +4)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-2, +4)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6402: Added enum for conductivity sensors and update alarm id

Mon, 15 Feb 2021 09:02:49 -0800

Quang Nguyen committed 5d36fab on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 235 more in dialin

DEN-6402: Added enum for conductivity sensors and update alarm id

· /dialin/common/AlarmIds.txt	(-1, +27)	\| History	\| Source	\| Diff
· /dialin/dg/conductivity_sensors.py	(-1, +6)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6869: Added Version Dialin API and a Simulator plugin...

Behrouz NematiPour — Sat, 13 Feb 2021 20:47:11 -0800

Behrouz NematiPour committed 3ed79c5 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 244 more in dialin

DEN-6869: Added Version Dialin API and a Simulator plugin

- Added two more conversion functions to convert 2 and 1 byte values to byte array.

- used byte_to_bytearray (1 byte value conversion) and short_to_bytearray (2 bytes value conversion) in versions messages.

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

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6869: Added Accelerometer Dialin API and a Simulator plugin...

Behrouz NematiPour — Sat, 13 Feb 2021 19:40:17 -0800

Behrouz NematiPour committed bf3f26d on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 244 more in dialin

DEN-6869: Added Accelerometer Dialin API and a Simulator plugin

- Added version API

- Added signal strength parameters to the blood/dialysate flow rate APIs

· /dialin/common/msg_defs.py	(-3, +0)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-8, +163)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6372: added more data to UF script.

Sean Nash — Fri, 12 Feb 2021 16:59:37 -0800

Sean Nash committed 8a53de6 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: added more data to UF script.

· /dialin/hd/pressure_occlusion.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/test_uf.py	(-23, +31)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-6372: updated UF test script.

Sean Nash — Fri, 12 Feb 2021 13:59:41 -0800

Sean Nash committed 66c685d on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 232 more in dialin

DEN-6372: updated UF test script.

· /tests/test_uf.py

(-2, +2)

| History

| Source

| Diff