Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

# Conflicts:

# firmware/App/HDCommon.h

Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into develop

# Conflicts:

# firmware/App/HDCommon.h

Merge branch 'DIAL-278-fan-pwm-override' into develop

DEN-16203: changed dopMeasuredRate to handle set flow rate in open loop state.

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

DEN-16093 merge in to develop

DEN-16093 DG park concetrate pump command response handled

DEN-15980 Air pump mods: longer ON time, shorter stabilize pressure time, add alarm framework for air pump on too much.

STT-2897 Correct alarm persistence

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

DEN-16245 Valve override valide for both RELEASE and DEBUG

DEN-16093-added DG park concentrate pumps

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

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

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Fixed expected msg payload length for a trigger alarm msg.

DEN-14706: code review comments.

DEN-14706: changed override condition for pending ack

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Bamboo Commit: Updated HDCommon.h with build versions from Bamboo

Merge branch 'DENBUG-59-fw-duplicate-alarms-occur-during-post-treatment-rinseback-and-block-workflow' into develop

DENBUG-59: Updated post-tx logic to handle recovery of ac power during reservoir drain per DEN-15763.

DEN-16278-hd-pretreatment-prime-start-state-does-not-allow-pause

Added pause/stop property detection in start state.

DEN-16164: Removed reservoir weight check in fill settle state

DEN-14706: HD pending ACK override message handling and implementation.

DEN-16164: code review comments.