Services

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16245-hd.valves.cmd_set_hd_valve_current_override-rejects-any-value' into develop

# Conflicts:

# firmware/App/HDCommon.h

  1. … 1 more file in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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

DEN-16093 merge in to develop

  1. … 2 more files in changeset.
Done.

Done.

Done.

Done.

DEN-16093 DG park concetrate pump command response handled

  1. … 1 more file in changeset.
Consider following up on this command's success once we're in complete state (would need to add a handler function for complete state). There is a getDGCommandResponse() function in DGInterface tha...

Consider following up on this command's success once we're in complete state (would need to add a handler function for complete state). There is a getDGCommandResponse() function in DGInterface that we're using for other DG commands to make sure DG got and accepted the command (and sometimes retrying if not).

I think we have been trying to have these types of message IDs end in "_CMD_REQUEST".

I think we have been trying to have these types of message IDs end in "_CMD_REQUEST".

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

HD-DEN-16245_Hd.Valves.Cmd Set HD Valve Current Override Rejects Any Value
HD-DEN-16245_Hd.Valves.Cmd Set HD Valve Current Override Rejects Any Value
DEN-16245 Valve override valide for both RELEASE and DEBUG

DEN-16093-added DG park concentrate pumps

  1. … 3 more files in changeset.
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.

HD-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
HD-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-14706: code review comments.

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

Fixed. Thanks!

DEN-14706: changed override condition for pending ack

RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

Override should be OR'd with timeout only. Used should have to be true even if override > 0.

Override should be OR'd with timeout only. Used should have to be true even if override > 0.