Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -ra74a984a7059f75d86ad87d6d9499bd8f94cc976 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 1c80d60fe6a95297a8a8033a3c7eade53e72779a) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision a74a984a7059f75d86ad87d6d9499bd8f94cc976) @@ -19,6 +19,7 @@ #include "Common.h" #include "MsgQueues.h" +#include "DialOutFlow.h" // ********** public definitions ********** @@ -35,6 +36,8 @@ MSG_ID_DIALYSATE_FLOW_DATA, // 8 MSG_ID_PRESSURE_OCCLUSION_DATA, // 9 MSG_ID_RTC_EPOCH, // 10 + MSG_ID_DIALYSATE_OUT_FLOW_DATA, // 11 + MSG_ID_LOAD_CELL_READINGS, // 12 // service/test CAN messages @@ -79,10 +82,18 @@ BOOL sendACKMsg( MESSAGE_T *message ); #endif +// MSG_ID_DG_CHECK_IN +void handleDGCheckIn( MESSAGE_T *message ); +// MSG_ID_UI_CHECK_IN +void handleUICheckIn( MESSAGE_T *message ); + // MSG_ID_OFF_BUTTON_PRESS BOOL sendOffButtonMsgToUI( U08 cmd ); void handleOffButtonConfirmMsgFromUI( MESSAGE_T *message ); +// MSG_ID_LOAD_CELL_READINGS +void handleLoadCellReadingsFromDG( MESSAGE_T *message ); + // MSG_ID_ALARM_STATUS BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus ); // MSG_ID_ALARM_TRIGGERED @@ -96,17 +107,15 @@ // MSG_ID_DIALYSATE_FLOW_DATA BOOL broadcastDialInFlowData( U32 flowStPt, F32 measFlow, F32 measRotorSpd, F32 measSpd, F32 measMCSpd, F32 measMCCurr, F32 pwmDC ); +// MSG_ID_DIALYSATE_OUT_FLOW_DATA +BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData ); + // MSG_ID_PRESSURE_OCCLUSION_DATA BOOL broadcastPresOcclData( F32 artPres, F32 venPres, F32 bpOccl, F32 diOccl, F32 doOccl ); // MSG_ID_RTC_EPOCH BOOL broadcastRTCEpoch( U32 epoch ); -// MSG_ID_DG_CHECK_IN -void handleDGCheckIn( MESSAGE_T *message ); -// MSG_ID_UI_CHECK_IN -void handleUICheckIn( MESSAGE_T *message ); - // *********** public test support message functions ********** // DEBUG OUTPUT