Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r3518e8a088c32e75c0c8960d5e629a7401095feb -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 3518e8a088c32e75c0c8960d5e629a7401095feb)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a)
@@ -34,8 +34,8 @@
 
 // ********** public definitions **********
 
-#define ACK_REQUIRED                    TRUE                ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
-#define ACK_NOT_REQUIRED                FALSE               ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
+#define ACK_REQUIRED                    TRUE            ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
+#define ACK_NOT_REQUIRED                FALSE           ///< Macro for functions that want to know if an outgoing message requires acknowledgement from receiver.
 
 #pragma pack(push, 1)
 /// Payload record structure for ACK response.
@@ -147,7 +147,8 @@
 // ACK MSG
 BOOL sendACKMsg( MESSAGE_T *message );
 
-void handleUITDResetInServiceModeRequest( MESSAGE_T* message );
+// Send message helper functions
+BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus );
 
 // Test Support Messaging Functions **************************
 
@@ -157,11 +158,12 @@
 void handleIncomingMessage( MESSAGE_T *message );
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 
+BOOL testTDSoftwareResetRequest( MESSAGE_T *message );
+
+// Test send message helper functions
 BOOL sendEvent( TD_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
+BOOL sendOffButtonMsgToUI( U08 prompt );
 
-// MSG_ID_TD_SOFTWARE_RESET_REQUEST
-BOOL handleTDSoftwareResetRequest( MESSAGE_T *message );
-
 /**@}*/
 
 #endif