common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into develop

DEN-8030 merged the changes

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Per Dara Navaei, we will need to implement this functions.

Per Dara Navaei, we will need to implement this functions.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Good point. Test will need to be longer than 50ms anyway - FPGA ramps the sound and there is a ~250ms time constant in the electronics. But I will want the sound to at least get started immediately.

Good point. Test will need to be longer than 50ms anyway - FPGA ramps the sound and there is a ~250ms time constant in the electronics. But I will want the sound to at least get started immediately.

DEN-8030 updated the messages list

DEN-8103: Changed DG alarms to not fault alarms

Should we call setAlarmAudio here? This test is running at 50 ms while the setAlarmAudio is running at 250 ms. The alarm audio might not be set when we switch to else part.

Should we call setAlarmAudio here?
This test is running at 50 ms while the setAlarmAudio is running at 250 ms. The alarm audio might not be set when we switch to else part.

The flag is latched by using OR with the local updated noNewTreatment status.

The flag is latched by using OR with the local updated noNewTreatment status.

But now in order to use the status flag, I think we can't allow that flag to go from TRUE to FALSE - need to latch it.

But now in order to use the status flag, I think we can't allow that flag to go from TRUE to FALSE - need to latch it.

Removed this extra flag and used alarm status noNewTreatment flag.

Removed this extra flag and used alarm status noNewTreatment flag.

Removed this extra flag.

Removed this extra flag.

Done.

Done.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Fixed merge conflicts.

Yes, and we checked for DG restarted (after it has started by HD) in DGInterface. Sample water sub-mode has to check before DG started.

Yes, and we checked for DG restarted (after it has started by HD) in DGInterface.
Sample water sub-mode has to check before DG started.

DEN-7605: Added POST test for alarm audio.

Looks like you are latching the noEndTreatment status. Maybe we can have that status be latching so we don't need two flags.

Looks like you are latching the noEndTreatment status. Maybe we can have that status be latching so we don't need two flags.

Is this different than alarmStatus.noNewTreatment?

Is this different than alarmStatus.noNewTreatment?

Shouldn't this be checked more broadly (not just in water sample sub-mode)?

Shouldn't this be checked more broadly (not just in water sample sub-mode)?

DEN-8103: Updated alarms rank

Merge branch 'staging' of ssh://dvm-linux02:7999/comm/common into staging

DEN-7605: Moved FPGA POST test to last test executed.

Moved FPGA POST to last test.

Rolled back prior merge - not ready.