Fisheye on dialin/

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14888-unable-to-trigger-alarm-47-ultrafiltration-rate-is-too-high-error-during-treatment...

Sean Nash — Fri, 17 Mar 2023 08:58:12 -0700

Sean Nash committed 147deed on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 143 more in dialin

Merge branch 'staging' into DEN-14888-unable-to-trigger-alarm-47-ultrafiltration-rate-is-too-high-error-during-treatment

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14888: Updated HD events enum.

Sean Nash — Thu, 16 Mar 2023 12:00:11 -0700

Sean Nash committed a8ff79b on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 143 more in dialin

DEN-14888: Updated HD events enum.

· /dialin/common/hd_defs.py

(-6, +12)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: generated the code change report

Dara Navaei — Fri, 10 Mar 2023 14:32:05 -0800

Dara Navaei committed a8d8cbf on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 143 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-7, +113)

| 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, 10 Mar 2023 14:30:25 -0800

Dara Navaei committed 9bc00e9 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 143 more in dialin

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

· /dialin/common/msg_ids.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/accelerometer.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/calibration_record.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect_flush.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/concentrate_pumps.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/cpld.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/dialysate_fill.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/events.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/fans.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/flow_sensors.py

(-2, +2)

| History

| Source

| Diff

… 58 more files in changeset.

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into staging

Michael Garthwaite — Fri, 10 Mar 2023 14:29:02 -0800

Michael Garthwaite committed 5240f9a on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 143 more in dialin

Merge branch 'DEN-14786-dialin-not-tread-safe-with-canbus-messages' into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

Michael Garthwaite — Fri, 10 Mar 2023 14:28:53 -0800

Michael Garthwaite committed 5a8384b on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

· /dialin/dg/heaters.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/hd/air_pump.py	(-1, +10)	\| History	\| Source	\| Diff
· /dialin/hd/battery.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/hd/pressure_occlusion.py	(-6, +2)	\| 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, 10 Mar 2023 11:29:23 -0800

Dara Navaei committed 32b0d39 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

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

· /dialin/dg/heaters.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/air_pump.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/battery.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/hd/pressure_occlusion.py	(-2, +2)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'DEN-14662-nfr-battery-related' into staging

Michael Garthwaite — Fri, 10 Mar 2023 11:27:58 -0800

Michael Garthwaite committed 113a9e9 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

Merge branch 'DEN-14662-nfr-battery-related' into staging

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: code review comments

Michael Garthwaite — Fri, 10 Mar 2023 10:05:54 -0800

Michael Garthwaite committed f3f7393 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: code review comments

· /dialin/dg/flow_sensors.py

(-1, +0)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: fixed syntax error from cherry picking merge.

Michael Garthwaite — Thu, 09 Mar 2023 16:14:27 -0800

Michael Garthwaite committed 7ad393d on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: fixed syntax error from cherry picking merge.

· /dialin/dg/flow_sensors.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

Michael Garthwaite — Thu, 09 Mar 2023 15:11:56 -0800

Michael Garthwaite committed db88461 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

· /dialin/dg/dialysate_fill.py	(-4, +4)	\| History	\| Source	\| Diff
· /dialin/dg/flow_sensors.py	(-2, +27)	\| History	\| Source	\| Diff
· /dialin/hd/blood_flow.py	(-2, +14)	\| History	\| Source	\| Diff
· /dialin/hd/dialysate_inlet_flow.py	(-2, +14)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14662-nfr-battery-related

Michael Garthwaite — Thu, 09 Mar 2023 15:08:19 -0800

Michael Garthwaite committed 92759b7 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

Merge branch 'staging' into DEN-14662-nfr-battery-related

dialin (DEN-16693-institutional-settings-implementation-2): DIAL-222: fixed heaters message construction

Michael Garthwaite — Thu, 09 Mar 2023 15:08:03 -0800

Michael Garthwaite committed 384cb77 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

DIAL-222: fixed heaters message construction

· /dialin/dg/heaters.py

(-1, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Bamboo Commit: generated the code change report

Dara Navaei — Wed, 08 Mar 2023 16:52:32 -0800

Dara Navaei committed e742095 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-1, +9)

| History

| Source

| Diff

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

Dara Navaei — Wed, 08 Mar 2023 16:50:53 -0800

Dara Navaei committed 5270097 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

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

· /dialin/dg/dialysate_fill.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/dg/flow_sensors.py	(-2, +2)	\| 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 (DEN-16693-institutional-settings-implementation-2): Merged DEN-13154 into staging

Dara Navaei — Wed, 08 Mar 2023 16:48:07 -0800

Dara Navaei committed 153809b on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

Merged DEN-13154 into staging

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-13154-heparin-syringe-empty-position-incorrect

Dara Navaei — Wed, 08 Mar 2023 16:47:10 -0800

Dara Navaei committed a584855 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more in dialin

Merge branch 'staging' into DEN-13154-heparin-syringe-empty-position-incorrect

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14662: fixed pressure occlusion handler

Michael Garthwaite — Wed, 08 Mar 2023 13:37:44 -0800

Michael Garthwaite committed 9411bf2 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

DEN-14662: fixed pressure occlusion handler

· /dialin/hd/pressure_occlusion.py

(-6, +0)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: CAN timestamps for hd_sim and dg_sim.

Michael Garthwaite — Wed, 08 Mar 2023 10:54:28 -0800

Michael Garthwaite committed 458f1c2 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: CAN timestamps for hd_sim and dg_sim.

· /dialin/protocols/CAN.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/ui/dg_simulator.py	(-6, +10)	\| History	\| Source	\| Diff
· /dialin/ui/hd_simulator.py	(-18, +31)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: fixed mutex position in the wrong bracket. Fixed event handling to create at timestamp instead of using the s...

Michael Garthwaite — Tue, 07 Mar 2023 16:19:48 -0800

Michael Garthwaite committed da00dd6 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: fixed mutex position in the wrong bracket. Fixed event handling to create at timestamp instead of using the socketcan timestamp.

· /dialin/dg/events.py	(-4, +3)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-3, +3)	\| History	\| Source	\| Diff
· /dialin/protocols/CAN.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14662-nfr-battery-related

Michael Garthwaite — Tue, 07 Mar 2023 14:08:33 -0800

Michael Garthwaite committed c14945c on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

Merge branch 'staging' into DEN-14662-nfr-battery-related

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14662: Updated air pump documentation to display enum for air pump states.

Michael Garthwaite — Tue, 07 Mar 2023 14:08:18 -0800

Michael Garthwaite committed 120e61c on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14662-nfr-battery-related and 145 more in dialin

DEN-14662: Updated air pump documentation to display enum for air pump states.

· /dialin/hd/air_pump.py

(-0, +9)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: fixed missing event handler to display the sub mode event change when no op mode change has been received.

Michael Garthwaite — Tue, 07 Mar 2023 13:13:12 -0800

Michael Garthwaite committed e1a940b on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: fixed missing event handler to display the sub mode event change when no op mode change has been received.

· /dialin/dg/events.py	(-7, +12)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-6, +10)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-13154: Added raw flow rates to DG flow rates broadcast message.

Sean Nash — Tue, 07 Mar 2023 12:52:35 -0800

Sean Nash committed cd6edb2 on branch DEN-13154-heparin-syringe-empty-position-incorrect, DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device and 146 more in dialin

DEN-13154: Added raw flow rates to DG flow rates broadcast message.

· /dialin/dg/flow_sensors.py

(-2, +26)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: removed log can from dg and hd objects. Fixed missing events that happen when no op mode was previously recei...

Michael Garthwaite — Tue, 07 Mar 2023 11:42:32 -0800

Michael Garthwaite committed d223289 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: removed log can from dg and hd objects. Fixed missing events that happen when no op mode was previously received .

· /dialin/dg/dialysate_generator.py	(-2, +1)	\| History	\| Source	\| Diff
· /dialin/dg/events.py	(-5, +38)	\| History	\| Source	\| Diff
· /dialin/hd/hd_events.py	(-2, +35)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-2, +1)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: removed log_can feature. Moved mutex lock and acquires to encapsulate the entire message processing than only...

Michael Garthwaite — Tue, 07 Mar 2023 11:16:22 -0800

Michael Garthwaite committed ac5801c on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: removed log_can feature. Moved mutex lock and acquires to encapsulate the entire message processing than only callback handling.

· /dialin/protocols/CAN.py

(-9, +3)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: fixed tests

Michael Garthwaite — Tue, 07 Mar 2023 11:10:50 -0800

Michael Garthwaite committed ace0d2c on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: fixed tests

· /dialin/hd/ui_proxy.py	(-1, +1)	\| History	\| Source	\| Diff
· /tests/unit_tests/test_ui_proxy.py	(-4, +4)	\| History	\| Source	\| Diff

dialin (DEN-16693-institutional-settings-implementation-2): Added MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS msg_id

Michael Garthwaite — Tue, 07 Mar 2023 10:58:58 -0800

Michael Garthwaite committed e4056c3 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

Added MSG_ID_DG_SET_DIALYSATE_MIXING_RATIOS msg_id

· /dialin/common/msg_ids.py

(-0, +1)

| History

| Source

| Diff

dialin (DEN-16693-institutional-settings-implementation-2): DEN-14786: implemented socket can timestamps to DG module and submodules

Michael Garthwaite — Tue, 07 Mar 2023 10:14:55 -0800

Michael Garthwaite committed ceb2d67 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

DEN-14786: implemented socket can timestamps to DG module and submodules

· /dialin/dg/accelerometer.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-9, +17)

| History

| Source

| Diff

· /dialin/dg/calibration_record.py

(-2, +5)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect.py

(-5, +10)

| History

| Source

| Diff

· /dialin/dg/chemical_disinfect_flush.py

(-4, +5)

| History

| Source

| Diff

· /dialin/dg/concentrate_pumps.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/conductivity_sensors.py

(-3, +7)

| History

| Source

| Diff

· /dialin/dg/cpld.py

(-2, +5)

| History

| Source

| Diff

· /dialin/dg/dialysate_fill.py

(-2, +5)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-4, +8)

| History

| Source

| Diff

· /dialin/dg/drain_pump.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/events.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/fans.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/flow_sensors.py

(-2, +4)

| History

| Source

| Diff

· /dialin/dg/fluid_leak.py

(-2, +4)

| History

| Source

| Diff

… 22 more files in changeset.

dialin (DEN-16693-institutional-settings-implementation-2): Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

Michael Garthwaite — Tue, 07 Mar 2023 09:21:07 -0800

Michael Garthwaite committed fbd7116 on branch DEN-14262-vba-homing-fails-when-cartridge-is-loaded-on-device, DEN-14679-need-an-override-to-cause-alarm_id_dg_command_invalid_parameter_fault and 144 more in dialin

Merge branch 'staging' into DEN-14786-dialin-not-tread-safe-with-canbus-messages

· /dialin/hd/blood_leak.py

(-7, +6)

| History

| Source

| Diff