diff --git a/radio/src/targets/taranis/extmodule_driver.cpp b/radio/src/targets/taranis/extmodule_driver.cpp index a59b9831d..16ff15c99 100644 --- a/radio/src/targets/taranis/extmodule_driver.cpp +++ b/radio/src/targets/taranis/extmodule_driver.cpp @@ -101,7 +101,7 @@ void extmoduleSerialStart(uint32_t /*baudrate*/, uint32_t period_half_us) EXTMODULE_TIMER->CR1 &= ~TIM_CR1_CEN; EXTMODULE_TIMER->PSC = EXTMODULE_TIMER_FREQ / 2000000 - 1; // 0.5uS from 30MHz EXTMODULE_TIMER->ARR = period_half_us; - EXTMODULE_TIMER->CCER = EXTMODULE_TIMER_OUTPUT_ENABLE | EXTMODULE_TIMER_OUTPUT_POLARITY; + EXTMODULE_TIMER->CCER = EXTMODULE_TIMER_OUTPUT_ENABLE; EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs EXTMODULE_TIMER->CCR1 = 0; EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high @@ -312,7 +312,7 @@ void extmoduleSendNextFrame() #if defined(DSM2) case PROTOCOL_CHANNELS_SBUS: - EXTMODULE_TIMER->CCER = EXTMODULE_TIMER_OUTPUT_ENABLE | (GET_SBUS_POLARITY(EXTERNAL_MODULE) ? EXTMODULE_TIMER_OUTPUT_POLARITY : 0); // reverse polarity for Sbus if needed + EXTMODULE_TIMER->CCER = EXTMODULE_TIMER_OUTPUT_ENABLE | (GET_SBUS_POLARITY(EXTERNAL_MODULE) ? 0 : EXTMODULE_TIMER_OUTPUT_POLARITY); // reverse polarity for Sbus if needed // no break case PROTOCOL_CHANNELS_DSM2_LP45: case PROTOCOL_CHANNELS_DSM2_DSM2: diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0e4fcb55a..1f60ab49f 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -782,10 +782,10 @@ #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF1 #define EXTMODULE_TIMER_OUTPUT_ENABLE TIM_CCER_CC1E #define EXTMODULE_TIMER_OUTPUT_POLARITY TIM_CCER_CC1P - #define EXTMODULE_USART_GPIO_AF GPIO_AF_USART6 - #define EXTMODULE_USART USART6 - #define EXTMODULE_USART_IRQn USART6_IRQn - #define EXTMODULE_USART_IRQHandler USART6_IRQHandler + #define EXTMODULE_USART_GPIO_AF GPIO_AF_USART6 + #define EXTMODULE_USART USART6 + #define EXTMODULE_USART_IRQn USART6_IRQn + #define EXTMODULE_USART_IRQHandler USART6_IRQHandler #define EXTMODULE_USART_DMA_CHANNEL DMA_Channel_5 #define EXTMODULE_USART_DMA_STREAM DMA2_Stream6 #define EXTMODULE_USART_DMA_STREAM_IRQn DMA2_Stream6_IRQn diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 94f6fe229..859ade415 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -669,7 +669,7 @@ #define TR_INACTIVITYALARM INDENT "Inactivité" #define TR_MEMORYWARNING INDENT "Mémoire pleine" #define TR_ALARMWARNING TR(INDENT "Silence", INDENT "Sons désactivés") -#define TR_RSSISHUTDOWNALARM TR(INDENT "RSSI extinction", INDENT "Vérif RSSI à l'extinction") +#define TR_RSSISHUTDOWNALARM TR(INDENT "RSSI extinct.", INDENT "Vérif RSSI à l'extinction") #define TR_MODEL_STILL_POWERED TR("Modèle allumé", "Modèle encore allumé") #define TR_MODEL_SHUTDOWN "Eteindre ?" #define TR_PRESS_ENTER_TO_CONFIRM "Presser [Enter] pour confirmer" @@ -698,7 +698,7 @@ #define TR_STICKS "Manches" #define TR_POTS "Potentiomètres" #define TR_SWITCHES "Inters" -#define TR_SWITCHES_DELAY "Délai inters son" +#define TR_SWITCHES_DELAY "Délai inter son" #define TR_SLAVE "Elève" #define TR_MODESRC "Mode\006% Source" #define TR_MULTIPLIER "Multiplieur" @@ -829,9 +829,9 @@ #define TR_LONGITUDE "Longitude" #define TR_GPSCOORD TR("Coordonnées", "Coordonnées GPS") #define TR_VARIO TR("Vario", "Variomètre") -#define TR_PITCH_AT_ZERO INDENT "Tonalité au zéro" -#define TR_PITCH_AT_MAX INDENT "Tonalité au max" -#define TR_REPEAT_AT_ZERO TR(INDENT "Interv. au zéro", INDENT "Intervalle au zéro") +#define TR_PITCH_AT_ZERO INDENT "Tonalité zéro" +#define TR_PITCH_AT_MAX INDENT "Tonalité max" +#define TR_REPEAT_AT_ZERO TR(INDENT "Interv. zéro", INDENT "Intervalle au zéro") #define TR_POWEROFF "\037\120ARRET..." #define TR_SHUTDOWN "ARRET EN COURS" #define TR_SAVEMODEL "Sauvegarde modèle..."