Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -rf9b3862d01ce6c64bd05b8649e69b44fa155b8e0 -r28672c1c97532a025a2ca23148760904bde814e5 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f9b3862d01ce6c64bd05b8649e69b44fa155b8e0) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 28672c1c97532a025a2ca23148760904bde814e5) @@ -455,33 +455,25 @@ /*********************************************************************//** * @brief - * The broadcastHeatersData function sends out DG heaters data - * @details - * Inputs : heaters data - * Outputs : heatears data msg constructed and queued - * @param mainPrimaryDC main primary heater duty cycle - * @param smallPrimaryDC small primary heater duty cycle - * @param trimmerDC trimmer heater duty cycle + * The broadcastHeatersData function sends out DG heaters data. + * @details Inputs: none + * @details Outputs: heaters data msg constructed and queued + * @param heaters msg constructed and queued * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC ) +BOOL broadcastHeatersData ( HEATERS_DATA_T *heatersData ) { BOOL result; MESSAGE_T msg; U08 *payloadPtr = msg.payload; - HEATERS_DATA_T payload; // create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA; msg.hdr.payloadLen = sizeof( HEATERS_DATA_T ); - payload.mainPrimayHeaterDC = mainPrimaryDC; - payload.smallPrimaryHeaterDC = smallPrimaryDC; - payload.trimmerHeaterDC = trimmerDC; + memcpy( payloadPtr, heatersData, sizeof( HEATERS_DATA_T ) ); - memcpy( payloadPtr, &payload, sizeof( HEATERS_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 ); @@ -742,7 +734,7 @@ * @details * @details Inputs: none * @details Outputs: thermistors data msg constructed and queued - * @param UV reactors msg constructed and queued + * @param thermistors msg constructed and queued * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ BOOL broadcastThermistorsData( THERMISTORS_DATA_T *thermistorsData )