ModeDrain.c

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DENBUG-276-alarm-282-bicarb-usage-alarm-did-not-trigger-before-the-bicarb-ran-out' into develop

DENBUG-276 changed the acid and bicarb low volume checks to 500mL

Removed a temporary event

Merged staging

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

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

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

DENBUG-201: Addressed DENBUG-201.

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

Fixed merge conflict.

DENBUG-201: Addressed DENBUG-201 - prevent empty concentrate alarms in post-tx mode.

Merge branch 'DEN-16466-alarm-282-dg-bicarbonate-concentration-bottle-low-volume-triggers-after-treatment' into develop

DEN-16466 Ignore bicarb/acid low volume alarms when at end of treatment or post,

Merge branch 'DEN-16466-alarm-282-dg-bicarbonate-concentration-bottle-low-volume-triggers-after-treatment' into develop

# Conflicts:

# firmware/App/DGCommon.h

DEN-16466 Allow alarm ID 282/281 to only occur in pre-treatment or treatment modes.

DEN-16466 Allow alarm ID 282 to only occur in pre-treatment or treatment modes.

DEN-16466 Allow alarm ID 282 to only occur in pre-treatment or treatment modes.

DEN-16395 fix merge issues

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

  1. … 12 more files in changeset.
Merge branch 'DEN-15791-dg-software-design-description' into develop

  1. … 8 more files in changeset.
Merged staging to DEN-15791.

  1. … 7 more files in changeset.
DEN-15791: Doxygen comment fixes.

  1. … 5 more files in changeset.
Merged staging

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

  1. … 3 more files in changeset.
Merge branch 'DEN-16382-alarm-207-dg-flow-meter-check-failure-triggers-after-alarm-282-bicarbonate-volume' into develop

  1. … 1 more file in changeset.
DEN-16382 updated the code to eliminate the extra fill command after the empty bottles alarm

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

  1. … 1 more file in changeset.
DEN-16382: Prevent empty concentrate bottle alarms when mix with water test config is active.

  1. … 1 more file in changeset.
Merged DEN-16149

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

  1. … 8 more files in changeset.