ModeFill.c

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16314-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low-2' into develop

DEN-16314 added code in the fill mode to set the start fill time if it was 0 even if the previous state in the fill mode was pause

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.
Merge branch 'DIAL-285-event-log-15-missing-fill-prime-concentrate-state' into develop

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

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

On Dara's advice, ifdef'ed code for fill state treatment recovery

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Reset timers when doing a test recover state, or returning from a (reset) fault condition.

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Reintroduced reservoir data structure change.

Corrected the setModeFillStateTransition semantics.

  1. … 1 more file in changeset.
DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Corrected spacing in the file per CR comments

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Follow up for changes, simplifications suggested by Sean.

Merge remote-tracking branch 'origin/DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low' into develop

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Updated headers

DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

fill time allowance for time spent in pause state

Cleared fill timer on transition to generate

Added removed unused (and uninitialized) variables from broadcast data structure.

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

  1. … 7 more files in changeset.
DEN-16314-1-alarm-206-triggers-after-resuming-from-incoming-water-conductivity-high-or-low

Initial changes for alarm 206 timer

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

  1. … 5 more files in changeset.
DEN-16093 code review comments added

DEN-16093 fixed code review comments

DEN-16093 fixed merging conflicts

  1. … 3 more files in changeset.
DEN-16093-Increased conductivity percentage check and time out values

take latest changes from staging

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears' into develop

  1. … 5 more files in changeset.
DEN-16093-merge in to develop

  1. … 1 more file in changeset.
DEN-16093-changed prime Max time and conductivity poercent check

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

  1. … 2 more files in changeset.