@@ -122,9 +122,10 @@ uint8_t _findCanPacketSlot(long unsigned int from, long unsigned int currentPart
122
122
uint8_t slot = CAN_BUF_SIZE;
123
123
uint8_t i;
124
124
for (i = 0 ; i < CAN_BUF_SIZE; i++) {
125
- CAN_DEBUG (PSTR (" CAN:RCV:LCK=%" PRIu8 " ,ADDR=%" PRIu8
126
- " ,PACK_ID=%" PRIu8 " ,LAST_PART=%" PRIu8 " \n " ), packets[i].locked , packets[i].address , packets[i].packetId ,
127
- packets[i].lastReceivedPart );
125
+ CAN_DEBUG (PSTR (" CAN:RCV:LCK=%" PRIu8 " ,ADDR=%" PRIu8
126
+ " ,PACK_ID=%" PRIu8 " ,LAST_PART=%" PRIu8 " \n " ), packets[i].locked , packets[i].address ,
127
+ packets[i].packetId ,
128
+ packets[i].lastReceivedPart );
128
129
if (packets[i].locked && packets[i].address == from && packets[i].packetId == messageId &&
129
130
packets[i].lastReceivedPart == currentPart) {
130
131
slot = i;
@@ -162,8 +163,9 @@ long unsigned int _buildHeader(uint8_t messageId, uint8_t totalPartCount, uint8_
162
163
header += toAddress;// set destination address
163
164
header = header << 8 ;
164
165
header += fromAddress;// set source address
165
- CAN_DEBUG (PSTR (" CAN:SND:CANH=%" PRIu32 " ,ID=%" PRIu8
166
- " ,TOTAL=%" PRIu8 " ,CURR=%" PRIu8 " ,TO=%" PRIu8 " ,FROM=%" PRIu8 " \n " ), header, messageId, totalPartCount,
166
+ CAN_DEBUG (PSTR (" CAN:SND:CANH=%" PRIu32 " ,ID=%" PRIu8
167
+ " ,TOTAL=%" PRIu8 " ,CURR=%" PRIu8 " ,TO=%" PRIu8 " ,FROM=%" PRIu8 " \n " ), header, messageId,
168
+ totalPartCount,
167
169
currentPartNumber, toAddress, fromAddress);
168
170
return header;
169
171
}
@@ -210,11 +212,11 @@ bool transportSend(const uint8_t to, const void *data, const uint8_t len, const
210
212
if (sndStat == CAN_OK) {
211
213
CAN_DEBUG (PSTR (" CAN:SND:OK\n " ));
212
214
} else {
213
- CAN_DEBUG (PSTR (" !CAN:SND:FAIL\n " ));
214
- return false ;
215
- }
216
- }
217
- return true ;
215
+ CAN_DEBUG (PSTR (" !CAN:SND:FAIL\n " ));
216
+ return false ;
217
+ }
218
+ }
219
+ return true ;
218
220
}
219
221
220
222
bool transportDataAvailable (void )
@@ -231,10 +233,10 @@ bool transportDataAvailable(void)
231
233
" ,TOTAL=%" PRIu32 " ,CURR=%" PRIu32 " ,TO=%" PRIu32 " ,FROM=%" PRIu32 " \n " ), rxId, messageId,
232
234
totalPartCount,
233
235
currentPart, to, from);
234
- CAN_DEBUG (PSTR (" CAN:RCV:LN=%" PRIu8 " ,DTA0=%" PRIu8 " ,DTA1=%" PRIu8 " ,DTA2=%" PRIu8 " ,DTA3=%" PRIu8
235
- " ,DTA4=%" PRIu8 " ,DTA5=%" PRIu8 " ,DTA6=%" PRIu8 " ,DTA7=%" PRIu8 " \n " ), len, rxBuf[0 ],
236
- rxBuf[1 ],
237
- rxBuf[2 ], rxBuf[3 ], rxBuf[4 ], rxBuf[5 ], rxBuf[6 ], rxBuf[7 ]);
236
+ CAN_DEBUG (PSTR (" CAN:RCV:LN=%" PRIu8 " ,DTA0=%" PRIu8 " ,DTA1=%" PRIu8 " ,DTA2=%" PRIu8 " ,DTA3=%" PRIu8
237
+ " ,DTA4=%" PRIu8 " ,DTA5=%" PRIu8 " ,DTA6=%" PRIu8 " ,DTA7=%" PRIu8 " \n " ), len, rxBuf[0 ],
238
+ rxBuf[1 ],
239
+ rxBuf[2 ], rxBuf[3 ], rxBuf[4 ], rxBuf[5 ], rxBuf[6 ], rxBuf[7 ]);
238
240
uint8_t slot;
239
241
if (currentPart == 0 ) {
240
242
slot = _findCanPacketSlot ();
0 commit comments