From 17e272412e2392ea2c0978bc484bd603f282cf31 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 15 Jan 2021 18:01:16 +0100 Subject: [PATCH] Fixes --- radio/src/storage/storage_common.cpp | 6 +++++- radio/src/targets/taranis/hal.h | 2 +- radio/src/translations/pl.h.txt | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/radio/src/storage/storage_common.cpp b/radio/src/storage/storage_common.cpp index b21cc007d..40bac6a67 100644 --- a/radio/src/storage/storage_common.cpp +++ b/radio/src/storage/storage_common.cpp @@ -52,8 +52,12 @@ void preModelLoad() pausePulses(); } pauseMixerCalculations(); + +#if defined(INTMODULE_PWR_GPIO) + INTERNAL_MODULE_OFF(); +#endif #if defined(EXTMODULE_PWR_GPIO) - EXTERNAL_MODULE_PWR_OFF(); + EXTERNAL_MODULE_OFF(); #endif stopTrainer(); diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0647a236a..14626fc91 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1241,7 +1241,7 @@ #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream5_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF5 #define INTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) -#elif defined(RADIO_T12) || defined(RADIO_TX12) || defined(RADIO_T8) +#elif (defined(RADIO_T12) && defined(HARDWARE_INTERNAL_MODULE))|| defined(RADIO_TX12) || defined(RADIO_T8) #define INTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) #define INTMODULE_RCC_APB1Periph (RCC_APB1Periph_USART3 | RCC_APB1Periph_TIM2) #define INTMODULE_RCC_APB2Periph 0 diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4ff16cc53..367694cde 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1136,18 +1136,18 @@ #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" #define TR_ABOUT_HARDWARE_3 "Współautor firmware" -#elif defined(MANUFACTURER_RADI OMASTER) +#elif defined(MANUFACTURER_RADIOMASTER) #define TR_ABOUT_HARDWARE_1 "Radiomaster" #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" #define TR_ABOUT_HARDWARE_3 "Współautor firmware" -#elif defined(MANUFACTURER_JUMP ER) +#elif defined(MANUFACTURER_JUMPER) #define TR_ABOUT_HARDWARE_1 "JumperRC" #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" #define TR_ABOUT_HARDWARE_3 "Współautor firmware" #else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/výrobce" - #define TR_ABOUT_HARDWARE_3 "" + #define TR_ABOUT_HARDWARE_1 "Brent Nelson" + #define TR_ABOUT_HARDWARE_2 "Sky9x designer/výrobce" + #define TR_ABOUT_HARDWARE_3 "" #endif #define TR_ABOUT_PARENTS_1 "Projekty macierzyste"