Rev 1304 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 1304 | Rev 1686 | ||
|---|---|---|---|
| Line 306... | Line 306... | ||
| 306 | { |
306 | { |
| 307 | #if USE_STDCAN == 0 |
307 | #if USE_STDCAN == 0 |
| 308 | Can_Message_t cm; |
308 | Can_Message_t cm; |
| 309 | //cm.Id = 0; |
309 | //cm.Id = 0; |
| 310 | cm.DataLength = buf[UDP_DATA_P+7]; |
310 | cm.DataLength = buf[UDP_DATA_P+7]; |
| - | 311 | ||
| - | 312 | if (cm.DataLength > 8) |
|
| - | 313 | { |
|
| - | 314 | cm.DataLength = 8; |
|
| - | 315 | } |
|
| - | 316 | ||
| 311 | cm.RemoteFlag = buf[UDP_DATA_P+6]; |
317 | cm.RemoteFlag = buf[UDP_DATA_P+6]; |
| 312 | cm.ExtendedFlag = buf[UDP_DATA_P+5]; |
318 | cm.ExtendedFlag = buf[UDP_DATA_P+5]; |
| 313 | cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + |
319 | cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + |
| 314 | ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24); |
320 | ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24); |
| 315 | uint8_t i; |
321 | uint8_t i; |
| Line 319... | Line 325... | ||
| 319 | Can_Send(&cm); |
325 | Can_Send(&cm); |
| 320 | #else |
326 | #else |
| 321 | static StdCan_Msg_t cm; |
327 | static StdCan_Msg_t cm; |
| 322 | //cm.Id = 0; |
328 | //cm.Id = 0; |
| 323 | cm.Length = buf[UDP_DATA_P+7]; |
329 | cm.Length = buf[UDP_DATA_P+7]; |
| - | 330 | ||
| - | 331 | if (cm.Length > 8) |
|
| - | 332 | { |
|
| - | 333 | cm.Length = 8; |
|
| - | 334 | } |
|
| - | 335 | ||
| 324 | cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + |
336 | cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + |
| 325 | ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24); |
337 | ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24); |
| 326 | uint8_t i; |
338 | uint8_t i; |
| 327 | for (i = 0; i < cm.Length; i++) { |
339 | for (i = 0; i < cm.Length; i++) { |
| 328 | cm.Data[i] = buf[UDP_DATA_P+8+i]; |
340 | cm.Data[i] = buf[UDP_DATA_P+8+i]; |