Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-21 07:15:09 +03:00
Code Activity

Checks bootloader size not greater than 32k. Bug fixes.

Browse source
This commit is contained in:
bsongis 2014-03-17 17:32:14 +01:00
parent 8bc28248e0
commit f907abb730
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/Makefile
View file

@ -1104,10 +1104,8 @@ else
endif endif
# build bootloader # 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 bootloader.lbm: bootloader/bootloader_ramBoot.bin
test -z "$$(find $^ -size +32k)"
$(BIN2LBM) $^ $@ $(BIN2LBM) $^ $@
.PHONY bootloader/bootloader_ramBoot.bin: .PHONY bootloader/bootloader_ramBoot.bin:

4
radio/src/bootloader/boot.cpp
View file

@ -699,8 +699,6 @@ int main()
for (;;) { for (;;) {
wdt_reset(); wdt_reset();
uint8_t event = getEvent();
if (Tenms) { if (Tenms) {
wdt_reset(); // Retrigger hardware watchdog wdt_reset(); // Retrigger hardware watchdog
@ -718,6 +716,8 @@ int main()
lcd_putsLeft(0, BOOTLOADER_TITLE); lcd_putsLeft(0, BOOTLOADER_TITLE);
lcd_hline(0, 10, LCD_W); lcd_hline(0, 10, LCD_W);
uint8_t event = getEvent();
if (usbPlugged()) { if (usbPlugged()) {
state = ST_USB; state = ST_USB;
} }

4
radio/src/targets/taranis/diskio.cpp
View file

@ -950,7 +950,9 @@ FIL g_telemetryFile = {0};
#if defined(BOOT) #if defined(BOOT)
void sdInit(void) void sdInit(void)
{ {
f_mount(0, &g_FATFS_Obj); if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
f_chdir("/");
}
} }
#else #else
// TODO shouldn't be there! // TODO shouldn't be there!