zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Tools/AP_Bootloader: differentiate FAIL_REASON_BAD_LENGTH errors

zr-v5.1
Tom Pittenger 4 years ago committed by Andrew Tridgell
parent
d0c1fd701f
commit
f62a27ca8a
1 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      Tools/AP_Bootloader/can.cpp

9
Tools/AP_Bootloader/can.cpp
Unescape View File

@ -85,11 +85,12 @@ static struct {
enum { enum {
FAIL_REASON_NO_APP_SIG = 10, FAIL_REASON_NO_APP_SIG = 10,
FAIL_REASON_BAD_LENGTH = 11, FAIL_REASON_BAD_LENGTH_APP = 11,
FAIL_REASON_BAD_BOARD_ID = 12, FAIL_REASON_BAD_BOARD_ID = 12,
FAIL_REASON_BAD_CRC = 13, FAIL_REASON_BAD_CRC = 13,
FAIL_REASON_IN_UPDATE = 14, FAIL_REASON_IN_UPDATE = 14,
FAIL_REASON_WATCHDOG = 15, FAIL_REASON_WATCHDOG = 15,
FAIL_REASON_BAD_LENGTH_DESCRIPTOR = 16,
}; };
/* /*
@ -644,7 +645,7 @@ bool can_check_firmware(void)
} }
// check length // check length
if (ad->image_size > flash_size) { if (ad->image_size > flash_size) {
node_status.vendor_specific_status_code = FAIL_REASON_BAD_LENGTH; node_status.vendor_specific_status_code = FAIL_REASON_BAD_LENGTH_APP;
printf("Bad fw length %u\n", ad->image_size); printf("Bad fw length %u\n", ad->image_size);
return false; return false;
} }
@ -658,8 +659,8 @@ bool can_check_firmware(void)
const uint8_t desc_len = offsetof(app_descriptor, version_major) - offsetof(app_descriptor, image_crc1); const uint8_t desc_len = offsetof(app_descriptor, version_major) - offsetof(app_descriptor, image_crc1);
uint32_t len1 = ((const uint8_t *)&ad->image_crc1) - flash; uint32_t len1 = ((const uint8_t *)&ad->image_crc1) - flash;
if ((len1 + desc_len) > ad->image_size) { if ((len1 + desc_len) > ad->image_size) {
node_status.vendor_specific_status_code = FAIL_REASON_BAD_LENGTH; node_status.vendor_specific_status_code = FAIL_REASON_BAD_LENGTH_DESCRIPTOR;
printf("Bad fw length %u\n", ad->image_size); printf("Bad fw descriptor length %u\n", ad->image_size);
return false; return false;
} }

Write Preview
Loading…
Cancel
Save