I would keep blank line between library includes and regular includes.

We can't have 2 alarms with ID 196. The enum only has the empty saline bag alarm. Looks like alarm 197 is duplicate of this 196 alarm you've added.
I think you should just remove this new alarm 196 that you've added here.

Fix merge conflict stuff here.

Fix merge conflict stuff here.

please remove extra line

Output is none

Please add message id.

Output is none

Message id MSG_ID_OFF_BUTTON_PRESS_REQUEST looks wrong

Can we restore this code?

Remove FANS test.

Remove.

Move this to Messaging.c

Remove. Replaced by generic confirmation functions and messages.

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 offRequestAwaitingUserConfirmation flag.

Replace with request code above.

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

No need for these elses.

Remove send function call.

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

No need to move else - not needed.

Replace this send function call with addConfirmationRequest()

Move this if down to handleOffButtonProcessing()