DGInterface.c

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'develop' of ssh://devapps.diality.us:7999/hd/hdfirmware into develop

Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

  1. … 1 more file in changeset.
DEN-14830: compiler fixes.

DEN-14830: Reworked dialysate temperature logic so persistence triggers do not cancel each other out. Fixed air pump not turning off when dry self tests are user stopped.

  1. … 1 more file in changeset.
Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

  1. … 3 more files in changeset.
Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

DEN-14830: removed 2 dialysate temperature alarms.

DEN-14830: PRS alignments

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

DEN-14999-2: Shortened a few alarm enum names.

Merged staging

  1. … 6 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 20 more files in changeset.
Fixed merge conflicts from DEN-14999.

  1. … 6 more files in changeset.
DEN-14999: Log DG command ID for rejected DG command alarm.

Fixed merge conflicts.

  1. … 9 more files in changeset.
DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

  1. … 2 more files in changeset.
Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

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

  1. … 8 more files in changeset.
Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

  1. … 3 more files in changeset.
Fixed merge conflict.

  1. … 6 more files in changeset.
Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered

  1. … 1 more file in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 14 more files in changeset.
Fixed merge conflicts from local merge from staging.

  1. … 5 more files in changeset.
Fixed merge conflict.

  1. … 4 more files in changeset.
Merge branch 'DEN-14830-incorrect-dialysate-temperature-alarm-triggered' into develop

  1. … 4 more files in changeset.
DEN-14830: Implemented temperature recovery to be set at +-2 C of target temp. Implemented dialysate temperature alarms to have a clear period of 30s.

DEN-13154: Use raw FMD measured flow for alarm 312. Added capture of raw dialysate flow to facilitate this.

  1. … 3 more files in changeset.
Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

  1. … 2 more files in changeset.
DEN-14830: reworked dialysate temp timeouts and conditions. Restored previous persistence alarms. added below 33 degC alarm

Merge branch 'staging' into DEN-14830-incorrect-dialysate-temperature-alarm-triggered