diff --git a/radio/src/targets/taranis/board_taranis.cpp b/radio/src/targets/taranis/board_taranis.cpp index dca639737..5efac5549 100644 --- a/radio/src/targets/taranis/board_taranis.cpp +++ b/radio/src/targets/taranis/board_taranis.cpp @@ -171,4 +171,16 @@ void boardInit() } #endif +#if defined(REVPLUS) +void turnBacklightOn(uint8_t level, uint8_t color) +{ + TIM4->CCR4 = (100-level)*color; + TIM4->CCR2 = (100-level)*(100-color); +} +void turnBacklightOff(void) +{ + TIM4->CCR4 = 0; + TIM4->CCR2 = 0; +} +#endif diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index adfed44b2..0e068f897 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -209,10 +209,19 @@ void pwrOff(void); #define EXTERNAL_RF_OFF() GPIO_ResetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR) // Backlight driver -#define setBacklight(xx) TIM10->CCR1 = 100-xx -#define __BACKLIGHT_ON TIM10->CCR1 = 100-g_eeGeneral.backlightBright -#define __BACKLIGHT_OFF TIM10->CCR1 = 0 -#define IS_BACKLIGHT_ON() (TIM10->CCR1 != 0) +#if defined(REVPLUS) +void turnBacklightOn(uint8_t level, uint8_t color); +void turnBacklightOff(void); + #define setBacklight(xx) turnBacklightOn(xx, g_eeGeneral.backlightColor) + #define __BACKLIGHT_ON turnBacklightOn(g_eeGeneral.backlightBright, g_eeGeneral.backlightColor) + #define __BACKLIGHT_OFF turnBacklightOff() + #define IS_BACKLIGHT_ON() (TIM4->CCR4 != 0) || (TIM4->CCR2 != 0) +#else + #define setBacklight(xx) TIM10->CCR1 = 100-xx + #define __BACKLIGHT_ON TIM10->CCR1 = 100-g_eeGeneral.backlightBright + #define __BACKLIGHT_OFF TIM10->CCR1 = 0 + #define IS_BACKLIGHT_ON() (TIM10->CCR1 != 0) +#endif // USB driver #define BOOTLOADER_REQUEST() (0) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 7361b0e69..b823e63a2 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -241,13 +241,16 @@ #if defined (REVPLUS) #define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOD #define GPIO_Pin_BL GPIO_Pin_15 //PD.15 + #define Pin_BL_AF GPIO_AF_TIM4 #define GPIOBL GPIOD #define GPIO_PinSource_BL GPIO_PinSource15 #define GPIO_Pin_BLW GPIO_Pin_13 //PD.13 + #define Pin_BLW_AF GPIO_AF_TIM4 #define GPIO_PinSource_BLW GPIO_PinSource13 #else #define RCC_AHB1Periph_GPIOBL RCC_AHB1Periph_GPIOB #define GPIO_Pin_BL GPIO_Pin_8 //PB.08 + #define Pin_BL_AF GPIO_AF_TIM10 #define GPIOBL GPIOB #define GPIO_PinSource_BL GPIO_PinSource8 #endif diff --git a/radio/src/targets/taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp index 8de433294..4ba9b57ff 100644 --- a/radio/src/targets/taranis/lcd_driver.cpp +++ b/radio/src/targets/taranis/lcd_driver.cpp @@ -137,24 +137,41 @@ static void LCD_BL_Config() { RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOBL, ENABLE); GPIO_InitTypeDef GPIO_InitStructure; - GPIO_InitStructure.GPIO_Pin =GPIO_Pin_BL; + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_BL; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; GPIO_Init(GPIOBL, &GPIO_InitStructure); + GPIO_PinAFConfig(GPIOBL, GPIO_PinSource_BL, Pin_BL_AF); - GPIO_PinAFConfig(GPIOBL, GPIO_PinSource_BL, GPIO_AF_TIM10); - +#if defined(REVPLUS) + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_BLW; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; + GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; + GPIO_Init(GPIOBL, &GPIO_InitStructure); + GPIO_PinAFConfig(GPIOBL, GPIO_PinSource_BLW, Pin_BLW_AF); + + RCC->APB1ENR |= RCC_APB1ENR_TIM4EN ; // Enable clock + TIM4->ARR = 100 ; + TIM4->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 10000 - 1; + TIM4->CCMR1 = 0x60 ; // PWM + TIM4->CCER = 1 ; + TIM4->CCR1 = 80; + TIM4->EGR = 0 ; + TIM4->CR1 = 1 ; +#else RCC->APB2ENR |= RCC_APB2ENR_TIM10EN ; // Enable clock TIM10->ARR = 100 ; TIM10->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 10000 - 1; TIM10->CCMR1 = 0x60 ; // PWM TIM10->CCER = 1 ; - TIM10->CCR1 = 80; TIM10->EGR = 0 ; TIM10->CR1 = 1 ; +#endif } /** Init the anolog spi gpio