Index: Accel.c =================================================================== diff -u -r14434061a23aa02218e1f3c6cc3024123e79b153 -r9226df9ba2c91f938cac0e6d798bd7bd25a02c0d --- Accel.c (.../Accel.c) (revision 14434061a23aa02218e1f3c6cc3024123e79b153) +++ Accel.c (.../Accel.c) (revision 9226df9ba2c91f938cac0e6d798bd7bd25a02c0d) @@ -363,18 +363,24 @@ { // publish accelerometer data on interval if ( ++accelDataPublicationTimerCounter >= getPublishAccelDataInterval() ) - { - F32 x = accelAvgVector[ ACCEL_AXIS_X ]; - F32 y = accelAvgVector[ ACCEL_AXIS_Y ]; - F32 z = accelAvgVector[ ACCEL_AXIS_Z ]; - F32 xm = getMaxAccelAxis( ACCEL_AXIS_X ); - F32 ym = getMaxAccelAxis( ACCEL_AXIS_Y ); - F32 zm = getMaxAccelAxis( ACCEL_AXIS_Z ); - F32 xt = accelTilt[ ACCEL_AXIS_X ]; - F32 yt = accelTilt[ ACCEL_AXIS_Y ]; - F32 zt = accelTilt[ ACCEL_AXIS_Z ]; + { + ACCEL_DATA_PAYLOAD_T accData; - broadcastAccelData( x, y, z, xm, ym, zm, xt, yt, zt ); + accData.x = accelAvgVector[ ACCEL_AXIS_X ]; + accData.y = accelAvgVector[ ACCEL_AXIS_Y ]; + accData.z = accelAvgVector[ ACCEL_AXIS_Z ]; + accData.xMax = getMaxAccelAxis( ACCEL_AXIS_X ); + accData.yMax = getMaxAccelAxis( ACCEL_AXIS_Y ); + accData.zMax = getMaxAccelAxis( ACCEL_AXIS_Z ); + accData.xTilt = accelTilt[ ACCEL_AXIS_X ]; + accData.yTilt = accelTilt[ ACCEL_AXIS_Y ]; + accData.zTilt = accelTilt[ ACCEL_AXIS_Z ]; + +#ifdef _DG_ + broadcastData( MSG_ID_DG_ACCELEROMETER_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&accData, sizeof( ACCEL_DATA_PAYLOAD_T ) ); +#else + broadcastData( MSG_ID_HD_ACCELEROMETER_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&accData, sizeof( ACCEL_DATA_PAYLOAD_T ) ); +#endif // Reset publication timer counter accelDataPublicationTimerCounter = 0; // Reset max axes