From a26879dca8c709629147047c7b86a56bb05cf044 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sat, 30 Jun 2018 00:36:38 +0200 Subject: [PATCH 1/7] Revert "Remove -nostartfiles linker option from bootloader (#5996)" This reverts commit 17b4aa24668bc4b223dd0613a48d2cc050e39358. Removing the -nostartfiles caused the Taranis bootloader to include a number of strange functions. Instead define _fini to avoid the linker issues. --- .../targets/common/arm/stm32/bootloader/CMakeLists.txt | 3 ++- radio/src/targets/common/arm/stm32/bootloader/boot.cpp | 6 +++++- radio/src/targets/common/arm/stm32/bootloader/init.c | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 radio/src/targets/common/arm/stm32/bootloader/init.c diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt index b1bc92ad8..c88ac1bb6 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt @@ -73,6 +73,7 @@ set(BOOTLOADER_SRC ../usb_bsp.c ../usb_driver.cpp ../flash_driver.cpp + init.c boot.cpp bin_files.cpp ) @@ -111,7 +112,7 @@ remove_definitions(-DCLI) remove_definitions(-DUSB_SERIAL) add_definitions(-DBOOT) -set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") +set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") add_executable(bootloader ${BOOTLOADER_SRC}) add_dependencies(bootloader ${BITMAPS_TARGET} firmware_translations) diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index 89e494ac0..48e42f342 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -526,4 +526,8 @@ int main() } return 0; -} \ No newline at end of file +} + +#if defined(PCBHORUS) +void *__dso_handle = 0; +#endif diff --git a/radio/src/targets/common/arm/stm32/bootloader/init.c b/radio/src/targets/common/arm/stm32/bootloader/init.c new file mode 100644 index 000000000..16bee9834 --- /dev/null +++ b/radio/src/targets/common/arm/stm32/bootloader/init.c @@ -0,0 +1,9 @@ +void _init (void) +{ + +} + +void _fini(void) +{ + +} From 5dd0ac75bc40bc92729f5e7e43468580694051d0 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sat, 30 Jun 2018 17:40:33 +0200 Subject: [PATCH 2/7] Use nano.spec for linking bootloader (#6004) This saves about 2kB on the Taranis X-Lite --- radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt index c88ac1bb6..770e03d3a 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt @@ -113,6 +113,9 @@ remove_definitions(-DUSB_SERIAL) add_definitions(-DBOOT) set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC_DIRECTORY}/targets/${TARGET_DIR}/stm32_ramboot.ld -Wl,-Map=bootloader.map,--cref,--no-warn-mismatch,--gc-sections") +# use smaller nano libc +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --specs=nano.specs") + add_executable(bootloader ${BOOTLOADER_SRC}) add_dependencies(bootloader ${BITMAPS_TARGET} firmware_translations) From eeaab1268e5c508dd1efab6b1eba0bab4d3cfd68 Mon Sep 17 00:00:00 2001 From: LapinFou Date: Sun, 1 Jul 2018 18:03:23 +0200 Subject: [PATCH 3/7] Initial version. --- companion/src/translations/companion_fr.ts | 68 ++++++++++++---------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index bee12f071..f4ac1f85b 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -1019,27 +1019,27 @@ Do you want to import them? Voulez-vous les importer ? - + Simulator for this firmware is not yet available Le simulateur n'est pas encore disponible pour ce firmware - + Uknown error during Simulator startup. Erreur inconnue pendant le démarrage du simulateur. - + Simulator Error Erreur Simulateur - + Data Load Error Erreur de chargement des données - + Error occurred while starting simulator. Une erreur s'est produite lors du démarrage du simulateur. @@ -1182,22 +1182,22 @@ Voulez-vous les importer ? CurveGroup - + Diff - + Expo - + Func Fonc - + Curve Courbe @@ -1632,82 +1632,88 @@ Voulez-vous les importer ? CustomFunctionsPanel - + Switch Interrupteur - + Action - + Parameters Paramètres - + Enable Actif - + SF%1 FS%1 - + GF%1 FG%1 - + ON - + + Error occurred while trying to play sound, possibly the file is already opened. (Err: %1 [%2]) + + + + + Unable to find or open sound file: +%1 + + + + Value Valeur - + Source Source - + GVAR VG - + Increment Incrément - - Unable to find sound file %1! - Impossible de trouver le fichier son %1 ! - - - + &Delete &Supprimer - + &Copy &Copier - + &Cut &Couper - + &Paste &Coller @@ -3759,12 +3765,12 @@ p, li { white-space: pre-wrap; } VG - + Own value Valeur indépendante - + Flight mode %1 value Valeur de la phase de vol %1 From 8dda878c627cd756bc94a6a642412ac670a02e55 Mon Sep 17 00:00:00 2001 From: LapinFou Date: Sun, 1 Jul 2018 18:05:56 +0200 Subject: [PATCH 4/7] Updated French Translation. --- companion/src/translations/companion_fr.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index f4ac1f85b..a9970c284 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -1669,13 +1669,14 @@ Voulez-vous les importer ? Error occurred while trying to play sound, possibly the file is already opened. (Err: %1 [%2]) - + Une erreur s'est produite lors de la tentative de lecture du son, le fichier est peut-être déjà ouvert. (Err: %1 [%2]) Unable to find or open sound file: %1 - + Impossible de trouver ou d'ouvrir le fichier son: +%1 From 337e224ad354316dfd03e3527323e2fe75c2a5e1 Mon Sep 17 00:00:00 2001 From: LapinFou Date: Mon, 2 Jul 2018 10:17:25 +0200 Subject: [PATCH 5/7] Shorten translation. --- companion/src/translations/companion_fr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/translations/companion_fr.ts b/companion/src/translations/companion_fr.ts index a9970c284..dcdc7065d 100644 --- a/companion/src/translations/companion_fr.ts +++ b/companion/src/translations/companion_fr.ts @@ -1669,7 +1669,7 @@ Voulez-vous les importer ? Error occurred while trying to play sound, possibly the file is already opened. (Err: %1 [%2]) - Une erreur s'est produite lors de la tentative de lecture du son, le fichier est peut-être déjà ouvert. (Err: %1 [%2]) + Une erreur s'est produite lors de la lecture du son, le fichier est peut-être déjà ouvert. (Err: %1 [%2]) From daedeed8d73b60f7761af17457170560d28c7b41 Mon Sep 17 00:00:00 2001 From: Kilrah Date: Mon, 2 Jul 2018 12:29:54 +0200 Subject: [PATCH 6/7] Display stick type when applicable --- radio/src/gui/128x64/radio_diaganas.cpp | 4 ++++ radio/src/gui/480x272/view_statistics.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 2d1d7e6be..c015832ae 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -127,4 +127,8 @@ void menuRadioDiagAnalogs(event_t event) if (menuVerticalPosition==TEMP_CALIB_MENU_POS) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100); #endif + +#if (NUM_PWMSTICKS > 0) && !defined(SIMU) + lcdDrawTextAlignedLeft(7*FH, STICKS_PWM_ENABLED() ? "Sticks: PWM" : "Sticks: ANA"); +#endif } diff --git a/radio/src/gui/480x272/view_statistics.cpp b/radio/src/gui/480x272/view_statistics.cpp index c6f11bca5..045bb8509 100644 --- a/radio/src/gui/480x272/view_statistics.cpp +++ b/radio/src/gui/480x272/view_statistics.cpp @@ -185,6 +185,10 @@ bool menuStatsAnalogs(event_t event) lcdDrawNumber(LCD_W/2 + MENUS_MARGIN_LEFT+100, MENU_CONTENT_TOP+7*FH, telemetryData.xjtVersion); } +#if (NUM_PWMSTICKS > 0) && !defined(SIMU) + lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP+8*FH, STICKS_PWM_ENABLED() ? "Sticks: PWM" : "Sticks: ANA"); +#endif + return true; } From 47cfd7da989c400fde840639cb1457aea72e7ba1 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 5 Jul 2018 10:05:07 +0200 Subject: [PATCH 7/7] Fix some files permission --- tools/nightly22/build-sdcard.sh | 0 tools/rc22/build-sdcard.sh | 0 tools/release22/build-sdcard.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools/nightly22/build-sdcard.sh mode change 100644 => 100755 tools/rc22/build-sdcard.sh mode change 100644 => 100755 tools/release22/build-sdcard.sh diff --git a/tools/nightly22/build-sdcard.sh b/tools/nightly22/build-sdcard.sh old mode 100644 new mode 100755 diff --git a/tools/rc22/build-sdcard.sh b/tools/rc22/build-sdcard.sh old mode 100644 new mode 100755 diff --git a/tools/release22/build-sdcard.sh b/tools/release22/build-sdcard.sh old mode 100644 new mode 100755