Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r45263215b372cd579e8e16bb8073c287c726c55d -r1f500f8e6159a3fbab85ea68389e918a6df66400 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 45263215b372cd579e8e16bb8073c287c726c55d) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1f500f8e6159a3fbab85ea68389e918a6df66400) @@ -530,33 +530,25 @@ /*********************************************************************//** * @brief - * The broadcastDrainPumpData function sends out RO pump data. - * @details - * Inputs : none - * Outputs : Drain pump data msg constructed and queued - * @param tgtSpeed target speed for drain pump in RPM - * @param dac set DAC value + * The broadcastDrainPumpData function sends out the drain pump data. + * @details Inputs : none + * @details Outputs : Drain pump data msg constructed and queued + * @param drain pump data structure pointer * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL broadcastDrainPumpData( U32 tgtSpeed, U32 dac, F32 deltaP, U32 drainPumpState ) +BOOL broadcastDrainPumpData( DRAIN_PUMP_DATA_T *drainPumpData ) { BOOL result; MESSAGE_T msg; U08 *payloadPtr = msg.payload; - DRAIN_PUMP_DATA_T payload; // create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DRAIN_PUMP_DATA; msg.hdr.payloadLen = sizeof( DRAIN_PUMP_DATA_T ); - payload.setDrainPumpSpeed = tgtSpeed; - payload.dacValue = dac; - payload.deltaPressure = deltaP; - payload.drainPState = drainPumpState; + memcpy( payloadPtr, drainPumpData, sizeof( DRAIN_PUMP_DATA_T ) ); - memcpy( payloadPtr, &payload, sizeof( DRAIN_PUMP_DATA_T ) ); - // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); @@ -1185,7 +1177,7 @@ { U32 roPumpPWM; memcpy( &roPumpPWM, message->payload, sizeof(U32) ); - result = setROPumpTargetPWM( roPumpPWM ); + //result = setROPumpTargetPWM( roPumpPWM ); } return result;