mirror of
https://github.com/EdgeTX/edgetx.git
synced 2025-07-20 14:55:09 +03:00
Checks bootloader size not greater than 32k. Bug fixes.
This commit is contained in:
parent
8bc28248e0
commit
f907abb730
3 changed files with 6 additions and 6 deletions
|
@ -1104,10 +1104,8 @@ else
|
|||
endif
|
||||
|
||||
# build bootloader
|
||||
# TODO
|
||||
# BL_SIZE=${shell sh -c "wc -c $^ | cut -d\ -f1"}
|
||||
# if $(BL_SIZE)>32768 then $(error Bootloader doesn't fit in 32k flash); fi
|
||||
bootloader.lbm: bootloader/bootloader_ramBoot.bin
|
||||
test -z "$$(find $^ -size +32k)"
|
||||
$(BIN2LBM) $^ $@
|
||||
|
||||
.PHONY bootloader/bootloader_ramBoot.bin:
|
||||
|
|
|
@ -699,8 +699,6 @@ int main()
|
|||
for (;;) {
|
||||
wdt_reset();
|
||||
|
||||
uint8_t event = getEvent();
|
||||
|
||||
if (Tenms) {
|
||||
wdt_reset(); // Retrigger hardware watchdog
|
||||
|
||||
|
@ -718,6 +716,8 @@ int main()
|
|||
lcd_putsLeft(0, BOOTLOADER_TITLE);
|
||||
lcd_hline(0, 10, LCD_W);
|
||||
|
||||
uint8_t event = getEvent();
|
||||
|
||||
if (usbPlugged()) {
|
||||
state = ST_USB;
|
||||
}
|
||||
|
|
|
@ -950,7 +950,9 @@ FIL g_telemetryFile = {0};
|
|||
#if defined(BOOT)
|
||||
void sdInit(void)
|
||||
{
|
||||
f_mount(0, &g_FATFS_Obj);
|
||||
if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
|
||||
f_chdir("/");
|
||||
}
|
||||
}
|
||||
#else
|
||||
// TODO shouldn't be there!
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue