Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DENBUG-59: Fixed merge conflict.

DIAL-276: STT-2891: implemented short filtered pressure overrides

DIAL-276: fixed op status event duplicating on op mode change only.

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

Merge branch 'DEN-15980-pressure-alarm-windows-widened-for-extended-period-of-time-due-to-frequency-of-air' into develop

DEN-15980 Remove TODO code. Will add time window alarm later if needed.

DEN-15980 Code review update 4.

DEN-15980 Code review update 3.

DEN-15980 Code review update 2.

DEN-16179 Lock out pressure checks in Treat Recirculate substate.

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 rinseback resume after HD fluid leak alarm issue.

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

DEN-15980 Code review comments update 1

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

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

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

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

STT-2897 Replace alarm persistence counter with persistent alarm functions

DEN-16203: code review comments

DEN-16093-Changed function name aligned to state name

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.