Fisheye on common/

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14197-sw-s83-mg-pi-optimizations' into staging

Michael Garthwaite — Mon, 21 Nov 2022 14:50:39 -0800

Michael Garthwaite committed 835d681 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 173 more in common

Merge branch 'DEN-14197-sw-s83-mg-pi-optimizations' into staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14197: Addressed code review comments.

Michael Garthwaite — Mon, 21 Nov 2022 14:42:04 -0800

Michael Garthwaite committed 9baa83e on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 174 more in common

DEN-14197: Addressed code review comments.

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14197: Fixed merge conflicts.

Sean Nash — Wed, 16 Nov 2022 18:48:09 -0800

Sean Nash committed 0b6f7c3 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 174 more in common

DEN-14197: Fixed merge conflicts.

· /MsgDefs.h

(-2, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Fri, 11 Nov 2022 15:31:11 -0800

Dara Navaei committed 08e1637 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 175 more in common

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

· /AlarmDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14150 merged staging

Dara Navaei — Fri, 11 Nov 2022 13:50:33 -0800

Dara Navaei committed 4a54c70 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

DEN-14150 merged staging

· /AlarmDefs.h	(-97, +97)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-14, +27)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Thu, 10 Nov 2022 10:35:45 -0800

Dara Navaei committed 97993b4 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

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

· /AlarmDefs.h	(-1, +1)	\| History	\| Source	\| Diff
· /Compatible.h	(-1, +1)	\| History	\| Source	\| Diff
· /MsgDefs.h	(-1, +1)	\| History	\| Source	\| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 addressed a code review comment by renaming the CPLD broadcast message to DG_CPLD broadcast message

Dara Navaei — Wed, 09 Nov 2022 13:23:23 -0800

Dara Navaei committed 753dd7f on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 addressed a code review comment by renaming the CPLD broadcast message to DG_CPLD broadcast message

· /MsgDefs.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14150: Update AlarmDefs.h

Wed, 09 Nov 2022 11:19:52 -0800

Dong Nguyen committed 6499712 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

DEN-14150: Update AlarmDefs.h

· /AlarmDefs.h

(-2, +5)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14150 updated the alarms table with the latest alarms

Dara Navaei — Wed, 09 Nov 2022 10:56:12 -0800

Dara Navaei committed ba75be4 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

DEN-14150 updated the alarms table with the latest alarms

· /AlarmDefs.h

(-0, +15)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14197: Fixed merge conflicts & improper commit.

Michael Garthwaite — Tue, 08 Nov 2022 15:08:59 -0800

Michael Garthwaite committed b9637d3 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 174 more in common

DEN-14197: Fixed merge conflicts & improper commit.

· /MsgDefs.h

(-4, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14197: DIAL-200: DIAL-212: Changed msg id values for ro feedback and dialysate fill total volume to prevent merge co...

Michael Garthwaite — Tue, 08 Nov 2022 15:07:57 -0800

Michael Garthwaite committed ef20295 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 174 more in common

DEN-14197: DIAL-200: DIAL-212: Changed msg id values for ro feedback and dialysate fill total volume to prevent merge conflicts

· /MsgDefs.h

(-0, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14197: DIAL-200: DIAL-212: MSG ID's for ro feedback voltage and dialysate fill total volume overrides

Michael Garthwaite — Tue, 08 Nov 2022 15:04:29 -0800

Michael Garthwaite committed 0bd629e on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 174 more in common

DEN-14197: DIAL-200: DIAL-212: MSG ID's for ro feedback voltage and dialysate fill total volume overrides

· /MsgDefs.h

(-1, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

Dara Navaei — Mon, 07 Nov 2022 10:40:28 -0800

Dara Navaei committed f47c304 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

Merge branch 'staging' into DEN-14175-dg_hd_dev-hd_dg_dvt-update-part-5

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 addressed a code reivew comment

Dara Navaei — Thu, 03 Nov 2022 09:53:38 -0700

Dara Navaei committed 1665b91 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 addressed a code reivew comment

· /Compatible.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 updated the DG logging messages

Dara Navaei — Mon, 31 Oct 2022 13:54:26 -0700

Dara Navaei committed 5292942 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 updated the DG logging messages

· /MsgDefs.h

(-2, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 added a message to override the sensed status of the DG valves

Dara Navaei — Fri, 28 Oct 2022 11:10:54 -0700

Dara Navaei committed 5ae1ed9 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 added a message to override the sensed status of the DG valves

· /MsgDefs.h

(-1, +3)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into staging

Michael Garthwaite — Fri, 28 Oct 2022 08:32:32 -0700

Michael Garthwaite committed ec399e4 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

Merge branch 'DEN-13801-sw_dev-sprint-79_mg' into staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-13801-sw_dev-sprint-79_mg

Michael Garthwaite — Fri, 28 Oct 2022 08:32:25 -0700

Michael Garthwaite committed e054475 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 178 more in common

Merge branch 'staging' into DEN-13801-sw_dev-sprint-79_mg

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14150-hd-dialysate-flow-estimation' of ssh://dvm-linux02:7999/comm/common into DEN-14150-hd-dialysate-...

Sean Nash — Thu, 27 Oct 2022 13:14:35 -0700

Sean Nash committed e4b21d4 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

Merge branch 'DEN-14150-hd-dialysate-flow-estimation' of ssh://dvm-linux02:7999/comm/common into DEN-14150-hd-dialysate-flow-estimation

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14150: Added msg ID for override of DPi rotor count.

Sean Nash — Thu, 27 Oct 2022 13:14:32 -0700

Sean Nash committed 789dc14 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

DEN-14150: Added msg ID for override of DPi rotor count.

· /MsgDefs.h

(-0, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14150: Update DialInFlow.c and DialInFlow.h tp add rotor count to broadcast

Thu, 27 Oct 2022 13:13:29 -0700

Dong Nguyen committed 31452ca on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 176 more in common

DEN-14150: Update DialInFlow.c and DialInFlow.h tp add rotor count to broadcast

· /AlarmDefs.h

(-1, +4)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Dara Navaei — Wed, 26 Oct 2022 14:32:15 -0700

Dara Navaei committed bddc751 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 178 more in common

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

· /HDDefs.h

(-2, +2)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-13786-hd_dg_dev-s78_bb' into staging

Wed, 26 Oct 2022 14:30:32 -0700

Bill Bracken committed a42317b on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 178 more in common

Merge branch 'DEN-13786-hd_dg_dev-s78_bb' into staging

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

Wed, 26 Oct 2022 10:35:08 -0700

Bill Bracken committed c53a252 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 179 more in common

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 bumped up the DG FPGA comp rev

Dara Navaei — Wed, 26 Oct 2022 10:30:26 -0700

Dara Navaei committed 6ccd16c on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 bumped up the DG FPGA comp rev

· /Compatible.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 decreased the revision of DG FPGA comp

Dara Navaei — Wed, 26 Oct 2022 10:25:45 -0700

Dara Navaei committed 679ac94 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 decreased the revision of DG FPGA comp

· /Compatible.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 updated the compatible commentes

Dara Navaei — Wed, 26 Oct 2022 10:23:27 -0700

Dara Navaei committed c39a41f on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 updated the compatible commentes

· /Compatible.h

(-1, +1)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): DEN-14175 added conductivity sensors hex bad character alarms

Dara Navaei — Tue, 25 Oct 2022 15:40:47 -0700

Dara Navaei committed af26e89 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 177 more in common

DEN-14175 added conductivity sensors hex bad character alarms

· /AlarmDefs.h

(-1, +13)

| History

| Source

| Diff

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'staging' into DEN-13801-sw_dev-sprint-79_mg

Michael Garthwaite — Tue, 25 Oct 2022 14:36:58 -0700

Michael Garthwaite committed 9a9c842 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 178 more in common

Merge branch 'staging' into DEN-13801-sw_dev-sprint-79_mg

common (DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment): Merge branch 'DEN-14209-UI-BN-S82' into staging

Behrouz NematiPour — Tue, 25 Oct 2022 13:14:48 -0700

Behrouz NematiPour committed 0ebbd84 on branch master, DEN-10155-treatment-end-paused-state-not-displaying-resume-option and 179 more in common

Merge branch 'DEN-14209-UI-BN-S82' into staging