Fisheye on dialin/

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

Michael Garthwaite — Mon, 21 Aug 2023 10:34:32 -0700

Michael Garthwaite committed d5abb0a on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: generated the code change report

Dara Navaei — Mon, 21 Aug 2023 09:48:26 -0700

Dara Navaei committed 22efe4c on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-0, +2)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Mon, 21 Aug 2023 09:46:53 -0700

Dara Navaei committed 91f03e1 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

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

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

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

Michael Garthwaite — Mon, 21 Aug 2023 09:45:54 -0700

Michael Garthwaite committed 9da151c on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into st...

Michael Garthwaite — Mon, 21 Aug 2023 09:45:04 -0700

Michael Garthwaite committed b014ef6 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Merge branch 'DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked' into staging

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

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

Michael Garthwaite — Mon, 21 Aug 2023 09:39:51 -0700

Michael Garthwaite committed e17e247 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Merge branch 'staging' into DIAL-277-watchdog-override-for-dg

· /dialin/dg/hd_proxy.py	(-9, +9)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-24, +24)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: generated the code change report

Dara Navaei — Fri, 18 Aug 2023 17:48:32 -0700

Dara Navaei committed 24398c7 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-92, +94)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 18 Aug 2023 17:46:56 -0700

Dara Navaei committed cb13063 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

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

· /dialin/common/alarm_defs.py

(-6, +6)

| History

| Source

| Diff

· /dialin/common/dg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-4, +4)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/cpld.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/events.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/fluid_leak.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/rtc.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/samplewater.py

(-1, +1)

| History

| Source

| Diff

… 18 more files in changeset.

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'DIAL-280-reservoir-broadcast-override' into staging

Michael Garthwaite — Fri, 18 Aug 2023 16:43:49 -0700

Michael Garthwaite committed 39b3b08 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

Merge branch 'DIAL-280-reservoir-broadcast-override' into staging

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: code review comments for alarm defs

Michael Garthwaite — Fri, 18 Aug 2023 14:05:46 -0700

Michael Garthwaite committed facc2a6 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: code review comments for alarm defs

· /dialin/common/alarm_defs.py

(-1, +1)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: updated alarm defs

Michael Garthwaite — Fri, 18 Aug 2023 12:32:11 -0700

Michael Garthwaite committed 0ff2920 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: updated alarm defs

· /dialin/common/alarm_defs.py

(-1, +1)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-277: moved hd button response from hd_proxy to the buttons sub module

Michael Garthwaite — Fri, 18 Aug 2023 12:30:26 -0700

Michael Garthwaite committed 1ffb007 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

DIAL-277: moved hd button response from hd_proxy to the buttons sub module

· /dialin/dg/hd_proxy.py	(-20, +0)	\| History	\| Source	\| Diff
· /dialin/hd/buttons.py	(-1, +22)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: fixed typo in dg defs

Michael Garthwaite — Fri, 18 Aug 2023 09:45:11 -0700

Michael Garthwaite committed 0b8ece9 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: fixed typo in dg defs

· /dialin/common/dg_defs.py

(-1, +1)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: fixes after syncing

Michael Garthwaite — Thu, 17 Aug 2023 20:49:05 -0700

Michael Garthwaite committed 918df13 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: fixes after syncing

· /dialin/common/alarm_defs.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/common/msg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-1, +3)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: Alarm and MSG_ID sync

Michael Garthwaite — Thu, 17 Aug 2023 20:36:40 -0700

Michael Garthwaite committed 5cfee98 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: Alarm and MSG_ID sync

· /dialin/common/alarm_defs.py

(-15, +16)

| History

| Source

| Diff

· /dialin/common/msg_defs.py

(-21, +21)

| History

| Source

| Diff

· /dialin/common/msg_ids.py

(-83, +79)

| History

| Source

| Diff

· /dialin/dg/alarms.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/cpld.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/dialysate_generator.py

(-3, +3)

| History

| Source

| Diff

· /dialin/dg/events.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/fluid_leak.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/hd_proxy.py

(-8, +8)

| History

| Source

| Diff

· /dialin/dg/heaters.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/load_cells.py

(-2, +2)

| History

| Source

| Diff

· /dialin/dg/reservoirs.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/rtc.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/samplewater.py

(-1, +1)

| History

| Source

| Diff

· /dialin/dg/valves.py

(-1, +1)

| History

| Source

| Diff

… 17 more files in changeset.

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-280: Reservoir data broadcast override.

Michael Garthwaite — Thu, 17 Aug 2023 20:18:37 -0700

Michael Garthwaite committed 84f0191 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 85 more in dialin

DIAL-280: Reservoir data broadcast override.

· /dialin/common/msg_ids.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/dg/reservoirs.py	(-0, +38)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DEN-14706: Dialin handling of Pending ACK overrides

Michael Garthwaite — Thu, 17 Aug 2023 19:39:35 -0700

Michael Garthwaite committed 3317ac6 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16242-pressure-limit-request-fix and 85 more in dialin

DEN-14706: Dialin handling of Pending ACK overrides

· /dialin/common/msg_ids.py	(-0, +3)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-0, +39)	\| History	\| Source	\| Diff
· /dialin/hd/hemodialysis_device.py	(-0, +39)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-277: fixed power off messages on ui and hd proxies.

Michael Garthwaite — Thu, 17 Aug 2023 17:25:31 -0700

Michael Garthwaite committed a434f65 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

DIAL-277: fixed power off messages on ui and hd proxies.

· /dialin/dg/hd_proxy.py	(-0, +1)	\| History	\| Source	\| Diff
· /dialin/hd/ui_proxy.py	(-12, +5)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-277: Added power off response to ui in hd_proxy.

Michael Garthwaite — Thu, 17 Aug 2023 16:20:18 -0700

Michael Garthwaite committed 7c24cff on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

DIAL-277: Added power off response to ui in hd_proxy.

· /dialin/dg/hd_proxy.py

(-1, +20)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DIAL-277: DG watchdog subclass

Michael Garthwaite — Thu, 17 Aug 2023 16:05:14 -0700

Michael Garthwaite committed 5b2d913 on branch DEN-16242-pressure-limit-request-fix, DEN-16309-heat-disinfect-has-spikes-in-temperature-near-95c-which-will-cause-water-to-boil-at and 84 more in dialin

DIAL-277: DG watchdog subclass

· /dialin/dg/watchdog.py

(-0, +81)

| History

| Source

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: generated the code change report

Dara Navaei — Wed, 16 Aug 2023 10:59:58 -0700

Dara Navaei committed 2900571 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 87 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-1, +5)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Aug 2023 10:58:13 -0700

Dara Navaei committed d2b3fbb on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 87 more in dialin

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

· /dialin/common/dg_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/msg_ids.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/common/test_config_defs.py	(-1, +1)	\| History	\| Source	\| Diff
· /dialin/dg/dialysate_generator.py	(-1, +1)	\| History	\| Source	\| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merged DEN-16239

Dara Navaei — Wed, 16 Aug 2023 10:32:59 -0700

Dara Navaei committed c94bb7d on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 87 more in dialin

Merged DEN-16239

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

Dara Navaei — Wed, 16 Aug 2023 10:32:21 -0700

Dara Navaei committed 5c0cf4a on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 88 more in dialin

Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

Michael Garthwaite — Wed, 16 Aug 2023 10:26:05 -0700

Michael Garthwaite committed e3e5e7e on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 88 more in dialin

Merge branch 'DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error' into staging

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error

Michael Garthwaite — Wed, 16 Aug 2023 10:25:50 -0700

Michael Garthwaite committed eb82bf2 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 89 more in dialin

Merge branch 'staging' into DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error

· /dialin/common/msg_ids.py

(-3, +4)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

Dara Navaei — Wed, 16 Aug 2023 10:23:29 -0700

Dara Navaei committed b97fa69 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 88 more in dialin

Merge branch 'staging' into DEN-16239-add-a-test-configuration-to-disable-blood-leak-alarm

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): DEN-16215 removed the start state of mode fill

Dara Navaei — Wed, 16 Aug 2023 10:23:08 -0700

Dara Navaei committed ffd2531 on branch DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked, DEN-16093-alarm-97-conductivity-out-of-range-triggered-on-first-fill-of-treatment and 88 more in dialin

DEN-16215 removed the start state of mode fill

· /dialin/common/dg_defs.py

(-10, +9)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: generated the code change report

Dara Navaei — Wed, 16 Aug 2023 10:19:38 -0700

Dara Navaei committed 8c502e4 on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 89 more in dialin

Bamboo Commit: generated the code change report

· /tools/Code_Report.csv

(-1, +2)

| History

| Source

| Diff

dialin (DIAL-290-pressure_occlusion.py-dialin-documentation-not-updated-in-staging): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 16 Aug 2023 10:17:51 -0700

Dara Navaei committed 966adad on branch DEN-14692-need-override-for-alarm_id_hd_cpu_ram_error, DEN-14706-need-mechanism-for-alarm_id_can_message_not_acked-and-alarm_id_dg_can_message_not_acked and 89 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/valves.py	(-2, +2)	\| History	\| Source	\| Diff
· /dialin/hd/valves.py	(-2, +2)	\| History	\| Source	\| Diff