Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rc8c95741c34a1768808a40152f0f2174bacb84ee -rd0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision c8c95741c34a1768808a40152f0f2174bacb84ee) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision d0c2c5ec93f7fae9772c14e9aa0baec0b20ed5ce) @@ -357,33 +357,25 @@ * @details * Inputs : none * Outputs : dialysate flow data msg constructed and queued. - * @param dialOutFlowState : 0 is Stop, 1 is Run, 2 is Paused - * @param dialOutTotalTargetUFVolumeInMl : target volume in ml - * @param dialOutTotalMeasuredUFVolumeInMl : actual volume in ml - * @param dialOutControlSignalPWM : PWM round to the nearest integer + * @param ptrBroadcastData Pointer to the broadcast structure * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL broadcastDialOutFlowData( S16 dialOutFlowState, S16 dialOutTotalTargetUFVolumeInMl, - S16 dialOutTotalMeasuredUFVolumeInMl, S16 dialOutControlSignalPWM ) +BOOL broadcastDialOutFlowData( DIALOUT_BROADCASTING_T *ptrBroadcastData ) { BOOL result; MESSAGE_T msg; U32 msgSize; U08 data[ sizeof( MESSAGE_WRAPPER_T ) + 1 + CAN_MESSAGE_PAYLOAD_SIZE ]; // must hold full (wrapped) message + sync + any CAN padding U08 *payloadPtr = msg.payload; - DIAL_OUT_UF_STATUS_PAYLOAD_T payload; + DIALOUT_BROADCASTING_T payload; // create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DIALYSATE_UF_DATA; - msg.hdr.payloadLen = sizeof( DIAL_OUT_UF_STATUS_PAYLOAD_T ); + msg.hdr.payloadLen = sizeof( DIALOUT_BROADCASTING_T ); - payload.doState = dialOutFlowState; - payload.tgtVol = dialOutTotalTargetUFVolumeInMl; - payload.measVol = dialOutTotalMeasuredUFVolumeInMl; - payload.pwmDC = dialOutControlSignalPWM; - memcpy( payloadPtr, &payload, sizeof( DIAL_OUT_UF_STATUS_PAYLOAD_T ) ); + memcpy( payloadPtr, ptrBroadcastData, sizeof( DIALOUT_BROADCASTING_T ) ); // serialize the message (w/ sync, CRC, and appropriate CAN padding) msgSize = serializeMessage( msg, data );