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

AP_Bootloader: save some flash space

Browse Source 
gets our largest F4 bootloaders under 16k again
This commit is contained in:
Andrew Tridgell 2021-03-16 17:20:49 +11:00
parent 5b7723d3d0
commit 188e3d6974
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Tools/AP_Bootloader/support.cpp
View File

@ -35,32 +35,34 @@ static uint8_t last_uart;
// #pragma GCC optimize("O0")
int16_t cin(unsigned timeout_ms)
static bool cin_data(uint8_t *data, uint8_t len, unsigned timeout_ms)
{
uint8_t b = 0;
for (uint8_t i=0; i<ARRAY_SIZE(uarts); i++) {
if (locked_uart == -1 || locked_uart == i) {
if (chnReadTimeout(uarts[i], &b, 1, chTimeMS2I(timeout_ms)) == 1) {
if (chnReadTimeout(uarts[i], data, len, chTimeMS2I(timeout_ms)) == len) {
last_uart = i;
return b;
return true;
}
}
}
chThdSleepMicroseconds(500);
return false;
}
int16_t cin(unsigned timeout_ms)
{
uint8_t b = 0;
if (cin_data(&b, 1, timeout_ms)) {
return b;
}
return -1;
}
int cin_word(uint32_t *wp, unsigned timeout_ms)
{
for (uint8_t i=0; i<ARRAY_SIZE(uarts); i++) {
if (locked_uart == -1 || locked_uart == i) {
if (chnReadTimeout(uarts[i], (uint8_t *)wp, 4, chTimeMS2I(timeout_ms)) == 4) {
last_uart = i;
return 0;
}
}
if (cin_data((uint8_t *)wp, 4, timeout_ms)) {
return 0;
}
chThdSleepMicroseconds(500);
return -1;
}