Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

Behrouz NematiPour — Mon, 14 Dec 2020 19:23:42 -0800

Behrouz NematiPour committed 1ea73de on branch 2020_EOY_DEMO, Calibration_fixes and 257 more in dialin

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5833: Implementation...

Behrouz NematiPour — Mon, 14 Dec 2020 19:21:56 -0800

Behrouz NematiPour committed e632450 on branch 2020_EOY_DEMO, Calibration_fixes and 258 more in dialin

DEN-5833: Implementation

- added the message id 80 for pTx uf adj rsp.

· /dialin/common/msg_defs.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-1, +28)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-1, +19)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

Behrouz NematiPour — Fri, 11 Dec 2020 18:12:01 -0800

Behrouz NematiPour committed 95c79d8 on branch 2020_EOY_DEMO, Calibration_fixes and 257 more in dialin

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5833: Implementation...

Behrouz NematiPour — Fri, 11 Dec 2020 18:11:49 -0800

Behrouz NematiPour committed 00e1e2f on branch 2020_EOY_DEMO, Calibration_fixes and 259 more in dialin

DEN-5833: Implementation

- Added API for the message 63 : Alarm Condition Cleared

· /dialin/squish/denaliMessages.py

(-1, +26)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

Behrouz NematiPour — Thu, 10 Dec 2020 11:51:41 -0800

Behrouz NematiPour committed a2b8a8b on branch 2020_EOY_DEMO, Calibration_fixes and 257 more in dialin

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5833: Implementation...

Behrouz NematiPour — Wed, 09 Dec 2020 22:26:37 -0800

Behrouz NematiPour committed f7da817 on branch 2020_EOY_DEMO, Calibration_fixes and 259 more in dialin

DEN-5833: Implementation

- Added AlarmFlags

· /dialin/common/prs_defs.py

(-15, +33)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-5830_AlarmDesign' into DEN-5751_Pre-TreatmentUltrafiltration

Behrouz NematiPour — Thu, 03 Dec 2020 20:03:49 -0800

Behrouz NematiPour committed 74d065a on branch 2020_EOY_DEMO, Calibration_fixes and 258 more in dialin

Merge branch 'DEN-5830_AlarmDesign' into DEN-5751_Pre-TreatmentUltrafiltration

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5833: Implementation...

Behrouz NematiPour — Thu, 03 Dec 2020 16:20:43 -0800

Behrouz NematiPour committed 2029044 on branch 2020_EOY_DEMO, Calibration_fixes and 259 more in dialin

DEN-5833: Implementation

- Added Alarms Priority enums in the common folder.

- Updated the CANBus test function test_can0 to be able to be used out side of the SquishQt (ex. Simulator) and moved the common portion in the utils.py

· /dialin/common/prs_defs.py	(-0, +5)	\| History	\| Source	\| Diff
· /dialin/squish/unittests.py	(-12, +7)	\| History	\| Source	\| Diff
· /dialin/squish/utils.py	(-0, +16)	\| 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 — Thu, 03 Dec 2020 15:18:20 -0800

Dara Navaei committed a5e1daa on branch 2020_EOY_DEMO, Calibration_fixes and 259 more in dialin

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

· /dialin/squish/denaliMessages.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-5736_UI_Heparin_Bolus'

Behrouz NematiPour — Thu, 03 Dec 2020 14:51:28 -0800

Behrouz NematiPour committed 7fd2ae0 on branch 2020_EOY_DEMO, Calibration_fixes and 259 more in dialin

Merge branch 'DEN-5736_UI_Heparin_Bolus'

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5739: Implementation...

Behrouz NematiPour — Mon, 23 Nov 2020 05:56:58 -0800

Behrouz NematiPour committed 8f4ef44 on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

DEN-5739: Implementation

- Fixed the API bug when implementing the request.

· /dialin/squish/denaliMessages.py

(-1, +1)

| History

| Source

| Diff

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

Behrouz NematiPour — Fri, 20 Nov 2020 22:04:44 -0800

Behrouz NematiPour committed 1b2bf9d on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

DEN-5741 Integration Testing

- Added Heparin Data/Response messages API

· /dialin/squish/denaliMessages.py

(-13, +91)

| 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 — Fri, 20 Nov 2020 11:33:47 -0800

Dara Navaei committed 345fc02 on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

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

· /tests/unit_tests/test_imports.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-5638: Removed globals import test from test_squish

Fri, 20 Nov 2020 09:30:55 -0800

Peter Lucia committed 215f2d9 on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

DEN-5638: Removed globals import test from test_squish

· /tests/unit_tests/test_imports.py

(-1, +0)

| 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 — Fri, 20 Nov 2020 03:01:58 -0800

Dara Navaei committed f33ee24 on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

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

· /dialin/common/prs_defs.py	(-0, +15)	\| History	\| Source	\| Diff
· /dialin/squish/denaliMessages.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/squish/utils.py	(-2, +2)	\| History	\| Source	\| Diff

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

Behrouz NematiPour — Fri, 20 Nov 2020 03:01:21 -0800

Behrouz NematiPour committed f48fb10 on branch 2020_EOY_DEMO, Calibration_fixes and 260 more in dialin

Merge branch 'DEN-4691_InLineBloodPressureAdjustments'

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