Fisheye on dialin/

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

Michael Garthwaite — Wed, 12 Oct 2022 15:06:36 -0700

Michael Garthwaite committed c6cc166 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

· /dialin/common/dg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Fixed merge conflicts.

Sean Nash — Thu, 06 Oct 2022 10:02:35 -0700

Sean Nash committed 261e20e on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Fixed merge conflicts.

· /dialin/dg/load_cells.py

(-13, +3)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 06 Oct 2022 09:42:32 -0700

Dara Navaei committed fe051f8 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

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

· /dialin/common/dg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/msg_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/chemical_disinfect.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/flush.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/heat_disinfect.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/switches.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/temperatures.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/voltages.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/treatment.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

Michael Garthwaite — Thu, 06 Oct 2022 09:42:03 -0700

Michael Garthwaite committed d8a3f72 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

· /dialin/dg/load_cells.py

(-2, +9)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

Michael Garthwaite — Thu, 06 Oct 2022 09:41:26 -0700

Michael Garthwaite committed 2189886 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Merge branch 'staging' into DEN-13903-s80-mg-DIAL-204

· /dialin/common/dg_defs.py	(-3, +16)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-14, +14)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-2, +4)	\| History	\| Source	\| Diff
· /dialin/hd/alarms.py	(-17, +33)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-24, +56)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into staging

Michael Garthwaite — Thu, 06 Oct 2022 09:40:52 -0700

Michael Garthwaite committed 4457c41 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

Michael Garthwaite — Thu, 06 Oct 2022 09:40:38 -0700

Michael Garthwaite committed 79965be on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

Merge branch 'staging' into DEN-13427-sw_dev-sprint-75_mg

· /dialin/common/hd_defs.py	(-202, +242)	\| History	\| Source	\| Diff
· /dialin/common/msg_defs.py	(-2, +66)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-15, +10)	\| History	\| Source	\| Diff
· /dialin/dg/voltages.py	(-6, +14)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: Added raw option to load cell override command.

Sean Nash — Thu, 06 Oct 2022 09:27:48 -0700

Sean Nash committed e38f90b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: Added raw option to load cell override command.

· /dialin/dg/load_cells.py

(-2, +4)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 30 Sep 2022 09:26:35 -0700

Dara Navaei committed a3008f2 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 178 more in dialin

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

· /dialin/common/msg_ids.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/calibration_record.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/concentrate_pumps.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_flow_sensor.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/rtc.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/voltages.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/calibration_record.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/sw_configs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/temperatures.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/utils/nv_ops_utils.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/peter/set_RTCs.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: Fixed return value for get alarm state function. Fixed bug in UF test script.

Sean Nash — Sat, 24 Sep 2022 15:15:24 -0700

Sean Nash committed 402f5f2 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: Fixed return value for get alarm state function. Fixed bug in UF test script.

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

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: added HD prefix to standby states enum.

Sean Nash — Thu, 22 Sep 2022 10:44:28 -0700

Sean Nash committed bb3d6e8 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: added HD prefix to standby states enum.

· /dialin/common/hd_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: Renamed standby states enum and removed redundant.

Sean Nash — Thu, 22 Sep 2022 10:33:57 -0700

Sean Nash committed a8b402d on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: Renamed standby states enum and removed redundant.

· /dialin/common/hd_defs.py	(-18, +1)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: Added missing payloads to new set PWM commands for peristaltic pumps. Added standby states enum to HD Defs.

Sean Nash — Thu, 22 Sep 2022 10:24:45 -0700

Sean Nash committed 189355b on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: Added missing payloads to new set PWM commands for peristaltic pumps. Added standby states enum to HD Defs.

· /dialin/common/hd_defs.py	(-0, +15)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-1, +5)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_inlet_flow.py	(-1, +5)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_outlet_flow.py	(-1, +5)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2

Dara Navaei — Wed, 21 Sep 2022 17:08:22 -0700

Dara Navaei committed 50dd417 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 179 more in dialin

Merge branch 'staging' into DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2

dialin (DEN-16693-institutional-settings-implementation-2): Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

Michael Garthwaite — Tue, 20 Sep 2022 12:05:47 -0700

Michael Garthwaite committed ee5ab44 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Merge remote-tracking branch 'origin/DEN-13903-s80-mg-DIAL-204' into DEN-13903-s80-mg-DIAL-204

dialin (DEN-16693-institutional-settings-implementation-2): Revert "DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed ...

Michael Garthwaite — Tue, 20 Sep 2022 11:56:51 -0700

Michael Garthwaite committed f14e457 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

Revert "DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed tests in relation to the changes above."

This reverts commit 75d8984d2074be9262e4e78d9e10da4895cef0e5.

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed tests in...

Michael Garthwaite — Tue, 20 Sep 2022 11:56:51 -0700

Michael Garthwaite committed 75d8984 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: DIAL-204: Removed duplicate enums. Added DG Service mode states. Removed StandbyStates for HD. Fixed tests in relation to the changes above.

· /dialin/common/dg_defs.py	(-0, +4)	\| History	\| Source	\| Diff
· /dialin/common/hd_defs.py	(-94, +10)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: fixed indentation.

Michael Garthwaite — Tue, 20 Sep 2022 10:42:55 -0700

Michael Garthwaite committed 8d5d5b0 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: fixed indentation.

· /dialin/hd/blood_flow.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13903: DIAL-204: Implemented set PWM methods for all 3 HD pumps.

Michael Garthwaite — Tue, 20 Sep 2022 10:37:56 -0700

Michael Garthwaite committed 6029930 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13834-dg_hd_dev-hd_dg_dvt-update-part-3 and 175 more in dialin

DEN-13903: DIAL-204: Implemented set PWM methods for all 3 HD pumps.

· /dialin/common/hd_defs.py	(-15, +0)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-0, +3)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-0, +26)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_inlet_flow.py	(-0, +27)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_outlet_flow.py	(-0, +27)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 09 Sep 2022 16:40:24 -0700

Dara Navaei committed 7842248 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 181 more in dialin

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

· /dialin/common/hd_defs.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/common/msg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/dg_simulator.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator_alarms.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-12716-UI_BN_S70' into staging

Behrouz NematiPour — Fri, 09 Sep 2022 16:39:06 -0700

Behrouz NematiPour committed 7c8abf7 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 181 more in dialin

Merge branch 'DEN-12716-UI_BN_S70' into staging

· /dialin/common/hd_defs.py

(-212, +252)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13845: CRV: Code Review...

Behrouz NematiPour — Thu, 08 Sep 2022 16:12:14 -0700

Behrouz NematiPour committed bcbc797 on branch DEN-12716-UI_BN_S70, DEN-13154-heparin-syringe-empty-position-incorrect and 182 more in dialin

DEN-13845: CRV: Code Review

- http://dvm-linux02:8060/cru/DIALIN-DEN-12716-1#c13273

- http://dvm-linux02:8060/cru/DIALIN-DEN-12716-1#c13270

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

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13427: Fixed doc string for hd op mode

Michael Garthwaite — Thu, 08 Sep 2022 08:56:15 -0700

Michael Garthwaite committed 1f1bb58 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

DEN-13427: Fixed doc string for hd op mode

· /dialin/hd/hemodialysis_device.py

(-3, +3)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13460 updated the DG RTC message ID from HD

Dara Navaei — Sun, 04 Sep 2022 09:03:06 -0700

Dara Navaei committed bca51ef on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 179 more in dialin

DEN-13460 updated the DG RTC message ID from HD

· /dialin/common/msg_ids.py	(-0, +2)	\| History	\| Source	\| Diff
· /dialin/dg/rtc.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-7, +9)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-4, +5)	\| History	\| Source	\| Diff
· /tests/hd_nvm_scripts.py	(-2, +2)	\| History	\| Source	\| Diff
· /tests/peter/set_RTCs.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13427: updated Dry self test enum struct to contain new dry self test values.

Michael Garthwaite — Wed, 31 Aug 2022 14:19:23 -0700

Michael Garthwaite committed fe44bde on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

DEN-13427: updated Dry self test enum struct to contain new dry self test values.

· /dialin/common/hd_defs.py

(-7, +9)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13460: Updated dialysate_flow_sensor class to be in line with the DG flow sensor messaging & overrides.

Michael Garthwaite — Wed, 31 Aug 2022 14:05:06 -0700

Michael Garthwaite committed 3df1d92 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 179 more in dialin

DEN-13460: Updated dialysate_flow_sensor class to be in line with the DG flow sensor messaging & overrides.

· /dialin/dg/dialysate_flow_sensor.py

(-37, +35)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13427: DIAL-200: Updated Temperature handlers to include internal thd rtd. Added more positions for messages up to 3...

Michael Garthwaite — Tue, 30 Aug 2022 15:14:51 -0700

Michael Garthwaite committed 6939702 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

DEN-13427: DIAL-200: Updated Temperature handlers to include internal thd rtd. Added more positions for messages up to 30

· /dialin/common/msg_defs.py	(-0, +8)	\| History	\| Source	\| Diff
· /dialin/dg/temperatures.py	(-13, +19)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13427: DEN-13795: fixed dg voltages override from sending over Dialin-HD channel to Dialin-DG channel.

Michael Garthwaite — Tue, 30 Aug 2022 14:37:50 -0700

Michael Garthwaite committed 1d831af on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

DEN-13427: DEN-13795: fixed dg voltages override from sending over Dialin-HD channel to Dialin-DG channel.

· /dialin/dg/voltages.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13460 removed the raw load cell broadcast values

Dara Navaei — Tue, 23 Aug 2022 16:05:15 -0700

Dara Navaei committed 045cdab on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 179 more in dialin

DEN-13460 removed the raw load cell broadcast values

· /dialin/dg/concentrate_pumps.py	(-1, +9)	\| History	\| Source	\| Diff
· /dialin/dg/load_cells.py	(-13, +0)	\| History	\| Source	\| Diff
· /tests/dg_nvm_scripts.py	(-3, +3)	\| History	\| Source	\| Diff
· /tests/dg_tests.py	(-5, +10)	\| History	\| Source	\| Diff
· /tests/hd_blood_leak_data.py	(-2, +8)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13427: fixed dg switch status to bit shift correctly to display 0 or 1 values

Michael Garthwaite — Wed, 17 Aug 2022 15:04:52 -0700

Michael Garthwaite committed 54df608 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-13427-sw_dev-sprint-75_mg and 176 more in dialin

DEN-13427: fixed dg switch status to bit shift correctly to display 0 or 1 values

· /dialin/dg/switches.py

(-2, +2)

| History

| Source

| Diff