Controllers

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-16280-stuck-in-post-treatment-when-inlet-water-alarm-appears

Incorporated HD mode check, to clear alarm 150/151

DEN-15973 Change persistence to 12 seconds

DEN-16093-merge in to develop

  1. … 1 more file in changeset.
DEN-16093-code alignment done

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-16093-changes added in the park handler logic

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Add a blank line between declarations and code.

Add a blank line between declarations and code.

#includes are sorted. Put OperationModes.h in its proper place.

#includes are sorted. Put OperationModes.h in its proper place.

DEN-16093 merge in to develop

  1. … 3 more files in changeset.
required changes are done.

required changes are done.

DEN-16093 handler for DG park concnetrate pump added

  1. … 2 more files in changeset.
DG-DEN-16280_Stuck IN Post Treatment When Inlet Water Alarm Appears
DG-DEN-16280_Stuck IN Post Treatment When Inlet Water Alarm Appears
DEN-15973 Change #define name

Consider calling a (new) function in ConcentratePumps.c that would do all of this (decides whether to accept or reject command and parks the pumps if accepting, sets reject reason code if rejecting...

Consider calling a (new) function in ConcentratePumps.c that would do all of this (decides whether to accept or reject command and parks the pumps if accepting, sets reject reason code if rejecting). Function would also create and send the cmd response message and return TRUE/FALSE which would set local result here for the ack response message below.
We should reject cmd if pumps are busy/on and/or if current DG mode is fill or fault mode.

DEN-15973 Correct #define name

DEN-13973 Rename alarm

DEN-15973 Add RO Pump max PWM alarm

DG-DEN-15973_Alarm 48 UF Rate Tare Error Triggered During Treatment
DG-DEN-15973_Alarm 48 UF Rate Tare Error Triggered During Treatment
DG-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
DG-DEN-16093_Alarm 97 Conductivity Out OF Range Triggered ON First Fill OF Treatment
Merged DEN-16250

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

  1. … 5 more files in changeset.
DG-DEN-15974_Alarm 187 Triggered During Consumables Check And During Treatment
DG-DEN-15974_Alarm 187 Triggered During Consumables Check And During Treatment
Merged DEN-15964

  1. … 4 more files in changeset.
DEN-15974 removed the clearance time of the persistence alarms of the concentrate pumps