Controllers

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-16309

  1. … 2 more files in changeset.
DG-DEN-15791_DG Software Design Description
DG-DEN-15791_DG Software Design Description
Merge branch 'DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment' into develop

# Conflicts:

# firmware/App/DGCommon.h

  1. … 2 more files in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-16309 added a new heat disinfect state

  1. … 2 more files in changeset.
DEN-16309 removed the clearance period some of the persistence alarms

The ROPump PWM is set from 5 different calls. Doesn't look like there is a global indicating the last set PWM value (could add). The execROPumpMonitor function might be a good place to put the chec...

The ROPump PWM is set from 5 different calls. Doesn't look like there is a global indicating the last set PWM value (could add). The execROPumpMonitor function might be a good place to put the check as it looks to be able to handle different modes, but again doesn't have access to the last set PWM value.

Merge branch 'staging' into DEN-15973-alarm-48-uf-rate-tare-error-triggered-during-treatment

DEN-15973 Address code review comments

Corrected

Corrected

Corrected

Corrected

Corrected

Corrected

Done.

Done.

Done.

Done.

Lets add a comment here that "we are insisting conductivity reach 100% of expected level since signal is very noisy and peak noise will reach 100% when average is about 93%. if sensor noise is redu...

Lets add a comment here that "we are insisting conductivity reach 100% of expected level since signal is very noisy and peak noise will reach 100% when average is about 93%. if sensor noise is reduced, this level should also be reduced accordingly."

100% now.

100% now.

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.