Clone
 

james walter taylor <jtaylor@diality.com> in dgfirmware

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

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

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

Correcting issue with develop RESERVOIR_DATA_T

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.

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

Structure out of sync between HD/DG. Corrected.

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

Modification to test DG comm issues.

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

Merge remote-tracking branch 'origin/staging' 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.

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

Initial changes for alarm 206 timer

Merge remote-tracking branch 'origin/DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears' into develop

    • -23
    • +88
    /firmware/App/Services/Reservoirs.c
    • -3
    • +56
    /firmware/App/Services/SystemComm.c
DEN-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears

Incorporated HD mode check, to clear alarm 150/151

Merge remote-tracking branch 'origin/staging' into staging

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into staging

Merge remote-tracking branch 'origin/DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override' into develop

DEN-15996-over-ride-commands-duplicates-the-id-msg_id_valves_states_publish_interval_override

changed override name

Merge branch 'DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it' into staging

Merge branch 'DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it' into develop

Timeout increased from 5 to 10 seconds

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Corrected comment alignment

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Undated 5second timeout to 10 seconds

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge branch 'DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value' into staging

DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value

converted error relative to integrated flow, to error relative to load cell, as the load cell mass is a more accurate measurement.