Cosmetics

This commit is contained in:
Bertrand Songis
2019-05-27 18:43:46 +02:00
parent 64ff78b598
commit 2aacfd2cca
6 changed files with 50 additions and 15 deletions
+11 -1
View File
@@ -58,12 +58,20 @@ enum menuRadioHwItems {
#if defined(USEHORUSBT) #if defined(USEHORUSBT)
CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME) CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME)
#endif #endif
#if defined(SERIAL2)
ITEM_RADIO_HARDWARE_UART3_MODE, ITEM_RADIO_HARDWARE_UART3_MODE,
#endif
ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_HARDWARE_DEBUG, ITEM_RADIO_HARDWARE_DEBUG,
ITEM_RADIO_HARDWARE_MAX ITEM_RADIO_HARDWARE_MAX
}; };
#if defined(SERIAL2)
#define AUX_SERIAL_ROWS 0,
#else
#define AUX_SERIAL_ROWS
#endif
#define HW_SETTINGS_COLUMN 15*FW #define HW_SETTINGS_COLUMN 15*FW
#if defined(PCBX9E) #if defined(PCBX9E)
@@ -91,7 +99,7 @@ enum menuRadioHwItems {
void menuRadioHardware(event_t event) 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; uint8_t sub = menuVerticalPosition;
@@ -225,12 +233,14 @@ void menuRadioHardware(event_t event)
#endif #endif
#endif #endif
#if defined(SERIAL2)
case ITEM_RADIO_HARDWARE_UART3_MODE: 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); 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) { if (attr && checkIncDec_Ret) {
serial2Init(g_eeGeneral.serial2Mode, modelTelemetryProtocol()); serial2Init(g_eeGeneral.serial2Mode, modelTelemetryProtocol());
} }
break; break;
#endif
case ITEM_RADIO_HARDWARE_JITTER_FILTER: case ITEM_RADIO_HARDWARE_JITTER_FILTER:
{ {
@@ -62,7 +62,7 @@ uint8_t isBacklightEnabled()
void backlightInit() void backlightInit()
{ {
GPIO_InitTypeDef GPIO_InitStructure; 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_Mode = GPIO_Mode_AF;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
+9 -9
View File
@@ -805,15 +805,7 @@ void ledGreen(void);
void ledBlue(void); void ledBlue(void);
// LCD driver // LCD driver
#if defined(STATUS_LEDS) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
#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
#define LCD_W 212 #define LCD_W 212
#define LCD_H 64 #define LCD_H 64
#define LCD_DEPTH 4 #define LCD_DEPTH 4
@@ -821,6 +813,14 @@ void ledBlue(void);
#define LCD_CONTRAST_MIN 0 #define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 45 #define LCD_CONTRAST_MAX 45
#define LCD_CONTRAST_DEFAULT 25 #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 #endif
void lcdInit(void); void lcdInit(void);
void lcdInitFinish(void); void lcdInitFinish(void);
@@ -49,7 +49,11 @@ void hapticInit(void)
HAPTIC_TIMER->ARR = 100; HAPTIC_TIMER->ARR = 100;
HAPTIC_TIMER->PSC = HAPTIC_TIMER_FREQ / 10000 - 1; HAPTIC_TIMER->PSC = HAPTIC_TIMER_FREQ / 10000 - 1;
#if defined(HAPTIC_CCMR1)
HAPTIC_TIMER->CCMR1 = HAPTIC_CCMR1; // PWM HAPTIC_TIMER->CCMR1 = HAPTIC_CCMR1; // PWM
#elif defined(HAPTIC_CCMR2)
HAPTIC_TIMER->CCMR2 = HAPTIC_CCMR2; // PWM
#endif
HAPTIC_TIMER->CCER = HAPTIC_CCER; HAPTIC_TIMER->CCER = HAPTIC_CCER;
HAPTIC_COUNTER_REGISTER = 0; HAPTIC_COUNTER_REGISTER = 0;
HAPTIC_TIMER->EGR = 0; HAPTIC_TIMER->EGR = 0;
+21 -2
View File
@@ -23,41 +23,60 @@
void ledInit() void ledInit()
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = LED_GREEN_GPIO_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_Init(LED_GREEN_GPIO, &GPIO_InitStructure);
#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_InitStructure.GPIO_Pin = LED_RED_GPIO_PIN;
GPIO_Init(LED_RED_GPIO, &GPIO_InitStructure); GPIO_Init(LED_RED_GPIO, &GPIO_InitStructure);
#endif
#if defined(LED_BLUE_GPIO)
GPIO_InitStructure.GPIO_Pin = LED_BLUE_GPIO_PIN; GPIO_InitStructure.GPIO_Pin = LED_BLUE_GPIO_PIN;
GPIO_Init(LED_BLUE_GPIO, &GPIO_InitStructure); GPIO_Init(LED_BLUE_GPIO, &GPIO_InitStructure);
#endif
} }
void ledOff() void ledOff()
{ {
#if defined(LED_RED_GPIO)
GPIO_LED_GPIO_OFF(LED_RED_GPIO, LED_RED_GPIO_PIN); 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); 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); GPIO_LED_GPIO_OFF(LED_GREEN_GPIO, LED_GREEN_GPIO_PIN);
#endif
} }
void ledRed() void ledRed()
{ {
#if defined(LED_RED_GPIO)
ledOff(); ledOff();
GPIO_LED_GPIO_ON(LED_RED_GPIO, LED_RED_GPIO_PIN); GPIO_LED_GPIO_ON(LED_RED_GPIO, LED_RED_GPIO_PIN);
#endif
} }
void ledGreen() void ledGreen()
{ {
#if defined(LED_GREEN_GPIO)
ledOff(); ledOff();
GPIO_LED_GPIO_ON(LED_GREEN_GPIO, LED_GREEN_GPIO_PIN); GPIO_LED_GPIO_ON(LED_GREEN_GPIO, LED_GREEN_GPIO_PIN);
#endif
} }
void ledBlue() void ledBlue()
{ {
#if defined(LED_BLUE_GPIO)
ledOff(); ledOff();
GPIO_LED_GPIO_ON(LED_BLUE_GPIO, LED_BLUE_GPIO_PIN); GPIO_LED_GPIO_ON(LED_BLUE_GPIO, LED_BLUE_GPIO_PIN);
#endif
} }
+3 -1
View File
@@ -301,6 +301,7 @@ void stop_sbus_on_heartbeat_capture()
} }
#endif #endif
#if defined(SBUS)
int sbusGetByte(uint8_t * byte) int sbusGetByte(uint8_t * byte)
{ {
switch (currentTrainerMode) { switch (currentTrainerMode) {
@@ -308,7 +309,7 @@ int sbusGetByte(uint8_t * byte)
case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE: case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
return heartbeatFifo.pop(*byte); return heartbeatFifo.pop(*byte);
#endif #endif
#if !defined(PCBX7) && !defined(PCBX9E) && !defined(PCBX9LITE) && !defined(PCBXLITE) #if defined(SERIAL_USART)
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT: case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
return serial2RxFifo.pop(*byte); return serial2RxFifo.pop(*byte);
#endif #endif
@@ -316,3 +317,4 @@ int sbusGetByte(uint8_t * byte)
return false; return false;
} }
} }
#endif