aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Bootloader: added support for READ_MULTI

Browse Source 
this is useful for comparing the firmware on a board with the known
expected firmware
This commit is contained in:
Andrew Tridgell 2019-05-05 20:00:55 +10:00
parent 85da4955b6
commit bff040c58e
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Tools/AP_Bootloader/bl_protocol.cpp
View File

@ -92,6 +92,7 @@
#define PROTO_GET_DEVICE 0x22 // get device ID bytes #define PROTO_GET_DEVICE 0x22 // get device ID bytes
#define PROTO_CHIP_ERASE 0x23 // erase program area and reset program address #define PROTO_CHIP_ERASE 0x23 // erase program area and reset program address
#define PROTO_PROG_MULTI 0x27 // write bytes at program address and increment #define PROTO_PROG_MULTI 0x27 // write bytes at program address and increment
#define PROTO_READ_MULTI 0x28 // read bytes at address and increment
#define PROTO_GET_CRC 0x29 // compute & return a CRC #define PROTO_GET_CRC 0x29 // compute & return a CRC
#define PROTO_GET_OTP 0x2a // read a byte from OTP at the given address #define PROTO_GET_OTP 0x2a // read a byte from OTP at the given address
#define PROTO_GET_SN 0x2b // read a word from UDID area ( Serial) at the given address #define PROTO_GET_SN 0x2b // read a word from UDID area ( Serial) at the given address
@ -289,8 +290,6 @@ failure_response(void)
cout(data, sizeof(data)); cout(data, sizeof(data));
} }
static volatile unsigned cin_count;
/** /**
* Function to wait for EOC * Function to wait for EOC
* *
@ -458,6 +457,7 @@ bootloader(unsigned timeout)
#endif #endif
uint32_t address = board_info.fw_size; /* force erase before upload will work */ uint32_t address = board_info.fw_size; /* force erase before upload will work */
uint32_t read_address = 0;
uint32_t first_words[RESERVE_LEAD_WORDS]; uint32_t first_words[RESERVE_LEAD_WORDS];
bool done_sync = false; bool done_sync = false;
bool done_get_device = false; bool done_get_device = false;
@ -542,6 +542,9 @@ bootloader(unsigned timeout)
goto cmd_bad; goto cmd_bad;
} }
// reset read pointer
read_address = 0;
switch (arg) { switch (arg) {
case PROTO_DEVICE_BL_REV: { case PROTO_DEVICE_BL_REV: {
uint32_t bl_proto_rev = BL_PROTOCOL_VERSION; uint32_t bl_proto_rev = BL_PROTOCOL_VERSION;
@ -842,6 +845,30 @@ bootloader(unsigned timeout)
break; break;
#endif #endif
case PROTO_READ_MULTI: {
arg = cin(50);
if (arg < 0) {
goto cmd_bad;
}
if (arg % 4) {
goto cmd_bad;
}
if ((read_address + arg) > board_info.fw_size) {
goto cmd_bad;
}
// expect EOC
if (!wait_for_eoc(2)) {
goto cmd_bad;
}
arg /= 4;
while (arg-- > 0) {
cout_word(flash_func_read_word(read_address));
read_address += 4;
}
break;
}
// finalise programming and boot the system // finalise programming and boot the system
// //
// command: BOOT/EOC // command: BOOT/EOC