Fisheye on dialin/

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: Fixed merge conflicts w/ staging.

Sean Nash — Thu, 10 Jun 2021 11:42:47 -0700

Sean Nash committed d4cf7e9 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: Fixed merge conflicts w/ staging.

· /dialin/common/msg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/hd_proxy.py	(-8, +8)	\| History	\| Source	\| Diff
· /dialin/dg/heat_disinfect.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/temperature_sensors.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-0, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: fixed merge conflicts w/ develop.

Sean Nash — Thu, 10 Jun 2021 11:08:28 -0700

Sean Nash committed 6e20f46 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: fixed merge conflicts w/ develop.

· /dialin/common/alarm_defs.py

(-194, +2)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-19, +52)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-5, +5)

| History

| Source

| Diff

· /dialin/dg/concentrate_pumps.py

(-6, +6)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-3, +3)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-28, +32)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/fans.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/fluid_leak.py

(-9, +9)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-12, +39)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-3, +3)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-8, +8)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-5, +12)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-5, +5)

| History

| Source

| Diff

… 17 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: commented out UI Proxy init error for Peter to resolve later.

Sean Nash — Thu, 10 Jun 2021 10:47:16 -0700

Sean Nash committed 0672e22 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: commented out UI Proxy init error for Peter to resolve later.

· /dialin/hd/ui_proxy.py	(-5, +5)	\| History	\| Source	\| Diff
· /tests/test_voltages.py	(-10, +13)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge DEN-7860-hd_dev-bubble-detector-driver into staging

Wed, 09 Jun 2021 14:54:15 -0700

Peter Lucia committed a89c772 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

Merge DEN-7860-hd_dev-bubble-detector-driver into staging

· /dialin/common/alarm_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-4, +5)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-0, +2)	\| History	\| Source	\| Diff

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

Fri, 04 Jun 2021 15:47:27 -0700

Peter Lucia committed 46342ba on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 216 more in dialin

Merge branch 'DEN-8514_UI_DEV_Alarms_Active_List' into staging

· /dialin/common/alarm_defs.py	(-232, +2)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-2, +5)	\| History	\| Source	\| Diff
· /dialin/common/ui_defs.py	(-0, +4)	\| History	\| Source	\| Diff
· /dialin/ui/dg_simulator.py	(-0, +140)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-73, +255)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator_alarms.py	(-1, +63)	\| History	\| Source	\| Diff

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

Sean Nash — Thu, 03 Jun 2021 09:52:13 -0700

Sean Nash committed e7c6fbb on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: Addressed code review feedback.

· /dialin/utils/__init__.py

(-0, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8647: Setting txqueuelen

Wed, 02 Jun 2021 10:19:16 -0700

Peter Lucia committed 9137f7c on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 217 more in dialin

DEN-8647: Setting txqueuelen

· /tools/setup_canbus.sh

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): BUG-FIX added the clear the list the NVM class

Dara Navaei — Wed, 02 Jun 2021 08:50:59 -0700

Dara Navaei committed abc9155 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

BUG-FIX added the clear the list the NVM class

· /dialin/utils/nv_ops_utils.py

(-1, +4)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8647: Added Dara's fix to clear record packets to be sent to fw.

Tue, 01 Jun 2021 18:27:15 -0700

Peter Lucia committed 691a604 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 217 more in dialin

DEN-8647: Added Dara's fix to clear record packets to be sent to fw.

· /dialin/utils/nv_ops_utils.py

(-0, +1)

| History

| Source

| Diff

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

Tue, 01 Jun 2021 18:24:36 -0700

Peter Lucia committed 5deb42d on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 217 more in dialin

Merge branch 'staging' into DEN-8647_Sprint_46

dialin (DEN-12358-sw_dev-sprint-67_mg): Revert "Added a clear method to nv_ops_utils"...

Tue, 01 Jun 2021 18:22:49 -0700

Peter Lucia committed 11853bd on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 217 more in dialin

Revert "Added a clear method to nv_ops_utils"

This reverts commit 0b7a9c29a45ba2be12e1751167106a0e3a6aa526.

· /dialin/utils/nv_ops_utils.py

(-3, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Added a clear method to nv_ops_utils

Dara Navaei — Tue, 01 Jun 2021 15:51:31 -0700

Dara Navaei committed 0b7a9c2 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 217 more in dialin

Added a clear method to nv_ops_utils

· /dialin/utils/nv_ops_utils.py

(-0, +3)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8523: Aal: Code Review 0...

Behrouz NematiPour — Fri, 28 May 2021 19:48:10 -0700

Behrouz NematiPour committed ee41728 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 217 more in dialin

DEN-8523: Aal: Code Review 0

DIALIN-DEN-8514: DIALIN-DEN-8514-1: DIALIN-DEN-8514_UI DEV Alarms Active List

· /dialin/ui/hd_simulator.py

(-5, +5)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8523: posTx: Code Review 0...

Behrouz NematiPour — Fri, 28 May 2021 18:01:38 -0700

Behrouz NematiPour committed 0bee920 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 217 more in dialin

DEN-8523: posTx: Code Review 0

DIALIN-DEN-8308 : DIALIN-DEN-8308-1 : DIALIN-DEN-8308_UI DEV Treatment Log

· /dialin/ui/hd_simulator.py

(-4, +4)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-8103-dg-hd_dev-alarm-design' into develop

Fri, 28 May 2021 16:22:04 -0700

Quang Nguyen committed 91993c3 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

Merge branch 'DEN-8103-dg-hd_dev-alarm-design' into develop

· /dialin/common/msg_ids.py	(-2, +24)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-0, +2)	\| History	\| Source	\| Diff
· /dialin/dg/fluid_leak.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/fluid_leak.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-5, +3)	\| History	\| Source	\| Diff
· /tests/peter/test_calibration.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8103: Updated message id for continue to treatment request

Fri, 28 May 2021 15:52:42 -0700

Quang Nguyen committed f0edd03 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 211 more in dialin

DEN-8103: Updated message id for continue to treatment request

· /dialin/hd/ui_proxy.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8521: Implementations [Simulator/Testing]...

Behrouz NematiPour — Thu, 27 May 2021 19:45:19 -0700

Behrouz NematiPour committed 790434e on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 217 more in dialin

DEN-8521: Implementations [Simulator/Testing]

- Removed the debug code.

· /dialin/ui/hd_simulator_alarms.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: Publish changes in logged in status.

Sean Nash — Thu, 27 May 2021 14:17:08 -0700

Sean Nash committed 98f33dd on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: Publish changes in logged in status.

· /dialin/dg/dialysate_generator.py	(-2, +13)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +13)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: Added common check function for validating ms parameter of broadcast interval overrides. Added get function f...

Sean Nash — Thu, 27 May 2021 13:56:34 -0700

Sean Nash committed a2d4443 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: Added common check function for validating ms parameter of broadcast interval overrides. Added get function for HD and DG to determine logged in status.

· /dialin/dg/accelerometer.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/concentrate_pumps.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-4, +11)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/fans.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/fluid_leak.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/pressures.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-1, +0)

| History

| Source

| Diff

· /dialin/dg/ro_pump.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/temperature_sensors.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/thermistors.py

(-0, +4)

| History

| Source

| Diff

· /dialin/dg/uv_reactors.py

(-0, +4)

| History

| Source

| Diff

… 16 more files in changeset.

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-7605: Fixed bug in syringe pump class.

Sean Nash — Thu, 27 May 2021 11:12:35 -0700

Sean Nash committed 1b768bf on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 210 more in dialin

DEN-7605: Fixed bug in syringe pump class.

· /dialin/hd/syringe_pump.py	(-1, +3)	\| History	\| Source	\| Diff
· /tests/test_uf.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8521: Implementations [Simulator/Testing]

Behrouz NematiPour — Thu, 27 May 2021 03:40:44 -0700

Behrouz NematiPour committed 06ce0fa on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 217 more in dialin

DEN-8521: Implementations [Simulator/Testing]

· /dialin/common/msg_defs.py	(-0, +8)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-2, +81)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator_alarms.py	(-0, +37)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8462: Improved POST testing

Tue, 25 May 2021 12:49:42 -0700

Peter Lucia committed 33ca5c4 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 218 more in dialin

DEN-8462: Improved POST testing

· /tests/peter/test_POST.py

(-0, +5)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

Behrouz NematiPour — Mon, 24 May 2021 23:53:20 -0700

Behrouz NematiPour committed 9bb545d on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 218 more in dialin

Merge branch 'DEN-8308_UI_DEV_Treatment_Log' into DEN-8495_UI_DEV_Service_ManualDisinfection_Flush

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

Behrouz NematiPour — Mon, 24 May 2021 23:17:48 -0700

Behrouz NematiPour committed 4fca777 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 219 more in dialin

DEN-8319: TxLog: Code Review 0

· /dialin/ui/hd_simulator.py

(-52, +232)

| History

| Source

| Diff

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

Mon, 24 May 2021 14:54:30 -0700

Peter Lucia committed 0514a69 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 218 more in dialin

Merge staging into DEN-8462_Sprint_45

· /dialin/common/msg_ids.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-1, +2)	\| History	\| Source	\| Diff
· /dialin/dg/fluid_leak.py	(-5, +5)	\| History	\| Source	\| Diff
· /dialin/dg/hd_proxy.py	(-40, +62)	\| History	\| Source	\| Diff
· /dialin/dg/heat_disinfect.py	(-35, +3)	\| History	\| Source	\| Diff
· /dialin/dg/heaters.py	(-9, +34)	\| History	\| Source	\| Diff
· /dialin/dg/ro_pump.py	(-5, +9)	\| History	\| Source	\| Diff
· /dialin/dg/temperature_sensors.py	(-1, +33)	\| History	\| Source	\| Diff
· /dialin/dg/uv_reactors.py	(-6, +8)	\| History	\| Source	\| Diff
· /dialin/hd/fluid_leak.py	(-5, +5)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-7, +13)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-6, +279)	\| History	\| Source	\| Diff
· /tools/build_common_defs.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8251: (BUGFIX) Added pandas to requirements.txt

Mon, 24 May 2021 13:27:30 -0700

Peter Lucia committed 74440c7 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 220 more in dialin

DEN-8251: (BUGFIX) Added pandas to requirements.txt

· /requirements.txt

(-0, +1)

| History

| Source

| Diff

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

Mon, 24 May 2021 13:22:25 -0700

Peter Lucia committed 9d116c2 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 220 more in dialin

Merge staging into DEN-8251_Sprint_44

· /dialin/common/alarm_defs.py	(-8, +46)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-4, +39)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-1, +2)	\| History	\| Source	\| Diff
· /dialin/dg/fluid_leak.py	(-5, +5)	\| History	\| Source	\| Diff
· /dialin/dg/temperature_sensors.py	(-1, +33)	\| History	\| Source	\| Diff
· /dialin/dg/uv_reactors.py	(-6, +8)	\| History	\| Source	\| Diff
· /dialin/hd/buttons.py	(-6, +0)	\| History	\| Source	\| Diff
· /dialin/hd/fluid_leak.py	(-6, +6)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-0, +2)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-13, +17)	\| History	\| Source	\| Diff
· /dialin/ui/dg_simulator.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-9, +282)	\| History	\| Source	\| Diff
· /tests/peter/test_calibration.py	(-8, +1)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_imports.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_ui_proxy.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DEN-8462: Added support for UI POST

Mon, 24 May 2021 13:15:39 -0700

Peter Lucia committed 6b8fcf5 on branch Calibration_fixes, DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime and 218 more in dialin

DEN-8462: Added support for UI POST

· /dialin/common/alarm_defs.py	(-2, +7)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-4, +29)	\| History	\| Source	\| Diff
· /dialin/ui/dg_simulator.py	(-0, +30)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-0, +30)	\| History	\| Source	\| Diff
· /tests/peter/test_POST.py	(-0, +36)	\| History	\| Source

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

Mon, 24 May 2021 09:01:47 -0700

Peman Montazemi committed 6f5b393 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 211 more in dialin

Addressed code review comments

· /dialin/hd/air_bubbles.py

(-1, +0)

| History

| Source

| Diff

dialin (DEN-12358-sw_dev-sprint-67_mg): DN-7860: Addressed integration issues

Fri, 21 May 2021 16:02:02 -0700

Peman Montazemi committed 2edb623 on branch DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime, DEN-10602_UI_DEV_PatientID and 211 more in dialin

DN-7860: Addressed integration issues

· /dialin/hd/air_bubbles.py	(-6, +6)	\| History	\| Source	\| Diff
· /tests/hd_air_bubbles_data.py	(-8, +36)	\| History	\| Source	\| Diff