From 128cde891db315a891e38497d9251c040abae9d3 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 18 Aug 2019 16:23:28 +0200 Subject: [PATCH] X10 / X12S fixes (tested on X12S and X10 Express) --- radio/src/targets/horus/extmodule_driver.cpp | 2 +- radio/src/targets/horus/pwr_driver.cpp | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/radio/src/targets/horus/extmodule_driver.cpp b/radio/src/targets/horus/extmodule_driver.cpp index fe3d2cb63..99c5f811f 100644 --- a/radio/src/targets/horus/extmodule_driver.cpp +++ b/radio/src/targets/horus/extmodule_driver.cpp @@ -176,7 +176,7 @@ void extmoduleSerialStart(uint32_t /*baudrate*/, uint32_t period_half_us, bool i EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_0; #endif - EXTMODULE_TIMER->ARR = period_half_us; + EXTMODULE_TIMER->ARR = 45000; EXTMODULE_TIMER->CCR2 = 40000; // The first frame will be sent in 20ms EXTMODULE_TIMER->SR &= ~TIM_SR_CC2IF; // Clear flag EXTMODULE_TIMER->DIER |= TIM_DIER_UDE | TIM_DIER_CC2IE; diff --git a/radio/src/targets/horus/pwr_driver.cpp b/radio/src/targets/horus/pwr_driver.cpp index fd8c7b110..0a4ad4846 100644 --- a/radio/src/targets/horus/pwr_driver.cpp +++ b/radio/src/targets/horus/pwr_driver.cpp @@ -53,14 +53,10 @@ void pwrInit() GPIO_Init(PWR_SWITCH_GPIO, &GPIO_InitStructure); // PCBREV -#if defined(PCBX10) +#if defined(PCBREV_GPIO_PIN) GPIO_InitStructure.GPIO_Pin = PCBREV_GPIO_PIN; GPIO_Init(PCBREV_GPIO, &GPIO_InitStructure); hardwareOptions.pcbrev = PCBREV_VALUE(); -#else - GPIO_ResetBits(PCBREV_GPIO, PCBREV_GPIO_PIN); - GPIO_InitStructure.GPIO_Pin = PCBREV_GPIO_PIN; - GPIO_Init(PCBREV_GPIO, &GPIO_InitStructure); #endif // SD-DETECT PIN