AlarmDefs.h

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Crucible fixes

Merge fixes

  1. … 1 more file in changeset.
fpgaActuatorSetPoints is an output. Input is none.

fpgaActuatorSetPoints is an output.
Input is none.

please remove extra line

please remove extra line

Output is none

Output is none

Please add message id.

Please add message id.

Output is none

Output is none

Message id MSG_ID_OFF_BUTTON_PRESS_REQUEST looks wrong

Message id MSG_ID_OFF_BUTTON_PRESS_REQUEST looks wrong

Include "BPModule.h".

Include "BPModule.h".

BPModule is just one of the controllers - move this up into the controllers section.

BPModule is just one of the controllers - move this up into the controllers section.

We should not comment this out.

We should not comment this out.

It's still here. Do we need to initialize it here too or is it sufficient to initialize once from main at startup?

It's still here. Do we need to initialize it here too or is it sufficient to initialize once from main at startup?

We are already executing this from TaskGeneral.c. Remove from here.

We are already executing this from TaskGeneral.c. Remove from here.

Monitor is mis-spelled. Should be Control anyway. Move prior to execAlarmMgmt() above.

Monitor is mis-spelled. Should be Control anyway. Move prior to execAlarmMgmt() above.

I think all flags are outputs (not just adult).

I think all flags are outputs (not just adult).

These look like outputs to me (not inputs).

These look like outputs to me (not inputs).

Updated alarm and msgdefs per review

  1. … 1 more file in changeset.
Merge fixes

Can we restore this code?

Can we restore this code?

Remove FANS test.

Remove FANS test.

Remove.

Remove.

Move this to Messaging.c

Move this to Messaging.c

Remove. Replaced by generic confirmation functions and messages.

Remove. Replaced by generic confirmation functions and messages.

Remove this function - replaced by generic confirmation functions.

Remove this function - replaced by generic confirmation functions.

Remove this timer code and replace with getConfirmationRequestStatus() and, if status is Accepted, do confirmation code above. If status is Rejected or TimedOut, clear offRequestAwaitingUserConfirm...

Remove this timer code and replace with getConfirmationRequestStatus() and, if status is Accepted, do confirmation code above. If status is Rejected or TimedOut, clear offRequestAwaitingUserConfirmation flag.

Replace with request code above.

Replace with request code above.

Remove this function after you've moved what we need.

Remove this function after you've moved what we need.

No need for these elses.

No need for these elses.

Remove send function call.

Remove send function call.

Move this code inside if statement to handleOffButtonProcessing() where same if statement exists.

Move this code inside if statement to handleOffButtonProcessing() where same if statement exists.