From 2aacfd2ccacdd78fe20ee7df9954a1c9883e55a2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 27 May 2019 18:43:46 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/212x64/radio_hardware.cpp | 12 ++++++++- .../src/targets/taranis/backlight_driver.cpp | 2 +- radio/src/targets/taranis/board.h | 18 ++++++------- radio/src/targets/taranis/haptic_driver.cpp | 4 +++ radio/src/targets/taranis/led_driver.cpp | 25 ++++++++++++++++--- radio/src/targets/taranis/trainer_driver.cpp | 4 ++- 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp index 1483f8c31..6645a7b92 100644 --- a/radio/src/gui/212x64/radio_hardware.cpp +++ b/radio/src/gui/212x64/radio_hardware.cpp @@ -58,12 +58,20 @@ enum menuRadioHwItems { #if defined(USEHORUSBT) CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME) #endif +#if defined(SERIAL2) ITEM_RADIO_HARDWARE_UART3_MODE, +#endif ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_HARDWARE_DEBUG, ITEM_RADIO_HARDWARE_MAX }; +#if defined(SERIAL2) + #define AUX_SERIAL_ROWS 0, +#else + #define AUX_SERIAL_ROWS +#endif + #define HW_SETTINGS_COLUMN 15*FW #if defined(PCBX9E) @@ -91,7 +99,7 @@ enum menuRadioHwItems { void menuRadioHardware(event_t event) { - MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0, 1 }); + MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS AUX_SERIAL_ROWS 1 }); uint8_t sub = menuVerticalPosition; @@ -225,12 +233,14 @@ void menuRadioHardware(event_t event) #endif #endif +#if defined(SERIAL2) case ITEM_RADIO_HARDWARE_UART3_MODE: g_eeGeneral.serial2Mode = editChoice(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.serial2Mode, 0, UART_MODE_MAX, attr, event); if (attr && checkIncDec_Ret) { serial2Init(g_eeGeneral.serial2Mode, modelTelemetryProtocol()); } break; +#endif case ITEM_RADIO_HARDWARE_JITTER_FILTER: { diff --git a/radio/src/targets/taranis/backlight_driver.cpp b/radio/src/targets/taranis/backlight_driver.cpp index ec62b2bb3..f61777262 100644 --- a/radio/src/targets/taranis/backlight_driver.cpp +++ b/radio/src/targets/taranis/backlight_driver.cpp @@ -62,7 +62,7 @@ uint8_t isBacklightEnabled() void backlightInit() { GPIO_InitTypeDef GPIO_InitStructure; - GPIO_InitStructure.GPIO_Pin = BACKLIGHT_GPIO_PIN_1|BACKLIGHT_GPIO_PIN_2; + GPIO_InitStructure.GPIO_Pin = BACKLIGHT_GPIO_PIN_1 | BACKLIGHT_GPIO_PIN_2; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index ecd80852c..3c15f108a 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -805,15 +805,7 @@ void ledGreen(void); void ledBlue(void); // LCD driver -#if defined(STATUS_LEDS) -#define LCD_W 128 -#define LCD_H 64 -#define LCD_DEPTH 1 -#define IS_LCD_RESET_NEEDED() true -#define LCD_CONTRAST_MIN 10 -#define LCD_CONTRAST_MAX 30 -#define LCD_CONTRAST_DEFAULT 20 -#else +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) #define LCD_W 212 #define LCD_H 64 #define LCD_DEPTH 4 @@ -821,6 +813,14 @@ void ledBlue(void); #define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MAX 45 #define LCD_CONTRAST_DEFAULT 25 +#else +#define LCD_W 128 +#define LCD_H 64 +#define LCD_DEPTH 1 +#define IS_LCD_RESET_NEEDED() true +#define LCD_CONTRAST_MIN 10 +#define LCD_CONTRAST_MAX 30 +#define LCD_CONTRAST_DEFAULT 20 #endif void lcdInit(void); void lcdInitFinish(void); diff --git a/radio/src/targets/taranis/haptic_driver.cpp b/radio/src/targets/taranis/haptic_driver.cpp index 892d69cda..ea1e6ca9a 100644 --- a/radio/src/targets/taranis/haptic_driver.cpp +++ b/radio/src/targets/taranis/haptic_driver.cpp @@ -49,7 +49,11 @@ void hapticInit(void) HAPTIC_TIMER->ARR = 100; HAPTIC_TIMER->PSC = HAPTIC_TIMER_FREQ / 10000 - 1; +#if defined(HAPTIC_CCMR1) HAPTIC_TIMER->CCMR1 = HAPTIC_CCMR1; // PWM +#elif defined(HAPTIC_CCMR2) + HAPTIC_TIMER->CCMR2 = HAPTIC_CCMR2; // PWM +#endif HAPTIC_TIMER->CCER = HAPTIC_CCER; HAPTIC_COUNTER_REGISTER = 0; HAPTIC_TIMER->EGR = 0; diff --git a/radio/src/targets/taranis/led_driver.cpp b/radio/src/targets/taranis/led_driver.cpp index c84d23a3c..511a62b43 100644 --- a/radio/src/targets/taranis/led_driver.cpp +++ b/radio/src/targets/taranis/led_driver.cpp @@ -23,41 +23,60 @@ void ledInit() { GPIO_InitTypeDef GPIO_InitStructure; - GPIO_InitStructure.GPIO_Pin = LED_GREEN_GPIO_PIN; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; + +#if defined(LED_GREEN_GPIO) + GPIO_InitStructure.GPIO_Pin = LED_GREEN_GPIO_PIN; GPIO_Init(LED_GREEN_GPIO, &GPIO_InitStructure); - +#endif + +#if defined(LED_RED_GPIO) GPIO_InitStructure.GPIO_Pin = LED_RED_GPIO_PIN; GPIO_Init(LED_RED_GPIO, &GPIO_InitStructure); - +#endif + +#if defined(LED_BLUE_GPIO) GPIO_InitStructure.GPIO_Pin = LED_BLUE_GPIO_PIN; GPIO_Init(LED_BLUE_GPIO, &GPIO_InitStructure); +#endif } void ledOff() { +#if defined(LED_RED_GPIO) GPIO_LED_GPIO_OFF(LED_RED_GPIO, LED_RED_GPIO_PIN); +#endif +#if defined(LED_BLUE_GPIO) GPIO_LED_GPIO_OFF(LED_BLUE_GPIO, LED_BLUE_GPIO_PIN); +#endif +#if defined(LED_GREEN_GPIO) GPIO_LED_GPIO_OFF(LED_GREEN_GPIO, LED_GREEN_GPIO_PIN); +#endif } void ledRed() { +#if defined(LED_RED_GPIO) ledOff(); GPIO_LED_GPIO_ON(LED_RED_GPIO, LED_RED_GPIO_PIN); +#endif } void ledGreen() { +#if defined(LED_GREEN_GPIO) ledOff(); GPIO_LED_GPIO_ON(LED_GREEN_GPIO, LED_GREEN_GPIO_PIN); +#endif } void ledBlue() { +#if defined(LED_BLUE_GPIO) ledOff(); GPIO_LED_GPIO_ON(LED_BLUE_GPIO, LED_BLUE_GPIO_PIN); +#endif } diff --git a/radio/src/targets/taranis/trainer_driver.cpp b/radio/src/targets/taranis/trainer_driver.cpp index 21e542e20..9ad582d74 100644 --- a/radio/src/targets/taranis/trainer_driver.cpp +++ b/radio/src/targets/taranis/trainer_driver.cpp @@ -301,6 +301,7 @@ void stop_sbus_on_heartbeat_capture() } #endif +#if defined(SBUS) int sbusGetByte(uint8_t * byte) { switch (currentTrainerMode) { @@ -308,7 +309,7 @@ int sbusGetByte(uint8_t * byte) case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE: return heartbeatFifo.pop(*byte); #endif -#if !defined(PCBX7) && !defined(PCBX9E) && !defined(PCBX9LITE) && !defined(PCBXLITE) +#if defined(SERIAL_USART) case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: return serial2RxFifo.pop(*byte); #endif @@ -316,3 +317,4 @@ int sbusGetByte(uint8_t * byte) return false; } } +#endif