Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48 -r1f3647830e9de0a1f0a4e445ce8d72d5525f51fb --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 6fc5e3596bfb7f27e93e4bfbe4909b9f58c17b48) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 1f3647830e9de0a1f0a4e445ce8d72d5525f51fb) @@ -23,10 +23,17 @@ // ********** public definitions ********** typedef enum Msg_IDs -{ +{ // normal CAN messages MSG_ID_UNUSED = 0, - MSG_ID_OFF_BUTTON_PRESS, - MSG_ID_FIRST_TESTER_MESSAGE = 0x8000, + MSG_ID_OFF_BUTTON_PRESS, // 1 + MSG_ID_ALARM_STATUS, // 2 + MSG_ID_ALARM_TRIGGERED, // 3 + MSG_ID_ALARM_CLEARED, // 4 + MSG_ID_BLOOD_FLOW_DATA, // 5 + + // service/test CAN messages + + MSG_ID_FIRST_TESTER_MESSAGE = 0x8000, // 0x8000 MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE, MSG_ID_HD_MESSAGE, // 0x8001 MSG_ID_OFF_BUTTON_STATE_OVERRIDE, // 0x8002 @@ -48,6 +55,14 @@ BOOL sendOffButtonMsgToUI( void ); void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message ); +// MSG_ID_ALARM_TRIGGERED +BOOL broadcastAlarmTriggered( ALARM_ID_T alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 ); +// MSG_ID_ALARM_CLEARED +BOOL broadcastAlarmCleared( ALARM_ID_T alarm ); + +// MSG_ID_BLOOD_FLOW_DATA +BOOL broadcastBloodFlowData( U32 flowStPt, F32 measFlow, F32 measSpd, F32 measCurr ); + // *********** public test support message functions ********** // DEBUG OUTPUT