Controllers

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-16093 fixed merging conflicts

  1. … 3 more files in changeset.
As we discussed, I think alarm 150 and related inlet water alarms are already set to block triggering during rinseback and post-treatment modes. So these changes are likely not needed.

As we discussed, I think alarm 150 and related inlet water alarms are already set to block triggering during rinseback and post-treatment modes. So these changes are likely not needed.

DG-DEN-16309_Heat Disinfect Has Spikes IN Temperature Near 95C Which Will Cause Water TO Boil AT
DG-DEN-16309_Heat Disinfect Has Spikes IN Temperature Near 95C Which Will Cause Water TO Boil AT
This was a specific change for this alarm (150), and the associated alarms in this routine. It appeared there were similar mode limits for temperature as well. Pressure limits were more uniquely re...

This was a specific change for this alarm (150), and the associated alarms in this routine. It appeared there were similar mode limits for temperature as well. Pressure limits were more uniquely related to valve position, I thought.

I had seen the related changes in 59, and included them in my develop build.

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

  1. … 2 more files in changeset.
We don't trigger inlet water conductivity alarm in post-treatment mode? Any reason why we're not just saying "== MODE_POST"? What about inlet water pressure/temperature? FYI - getHDOperationMode()...

We don't trigger inlet water conductivity alarm in post-treatment mode? Any reason why we're not just saying "== MODE_POST"? What about inlet water pressure/temperature?

FYI - getHDOperationMode() was not working - HD op mode handler was mishandling message - fixed in my DENBUG-59 branch, but not yet in staging.

DEN-16091 changed the trimmer heater's persistent alarm from 10 seconds to 12 seconds

DG-DEN-16308_Srsdg 53 Not Met
DG-DEN-16308_Srsdg 53 Not Met
DEN-16308 updated the DG watchdog and safety shutdown POSTs

  1. … 2 more files in changeset.
Checking for alarm in this function means we will check when in control to flow or control to pressure states. Also checked only once per control interval which is maybe ok, but not typical for ala...

Checking for alarm in this function means we will check when in control to flow or control to pressure states. Also checked only once per control interval which is maybe ok, but not typical for alarm checks.
We do control to flow for treatment modes. Control to pressure is used in some cleaning modes. Not sure we want this alarm enforced in cleaning modes.

Remove blank line.

Remove blank line.

Put declarations at top of function. Use our BOOL type. Put ternary in ().

Put declarations at top of function. Use our BOOL type. Put ternary in ().

No point to having non-zero clear persistence - it's a fault.

No point to having non-zero clear persistence - it's a fault.

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