Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

fix for X12s crossfire issues #5162 (#5533)

Browse source 
* fix X12s crossfire issues

* Update radio_hardware.cpp

* Update crossfire.h

* Update radio_hardware.cpp

* Removed now unnecessary macros.
This commit is contained in:
lfischer85 2017-12-18 15:15:28 +01:00 • committed by Andre Bernet
parent ed2becce88
commit bc6bfccade
3 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/480x272/radio_hardware.cpp
View file

@ -46,7 +46,7 @@ enum MenuRadioHardwareItems {
ITEM_RADIO_HARDWARE_SF, ITEM_RADIO_HARDWARE_SF,
ITEM_RADIO_HARDWARE_SG, ITEM_RADIO_HARDWARE_SG,
ITEM_RADIO_HARDWARE_SH, ITEM_RADIO_HARDWARE_SH,
CASE_PCBX10(ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE) ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE,
ITEM_RADIO_HARDWARE_BLUETOOTH_MODE, ITEM_RADIO_HARDWARE_BLUETOOTH_MODE,
ITEM_RADIO_HARDWARE_BLUETOOTH_NAME, ITEM_RADIO_HARDWARE_BLUETOOTH_NAME,
#if defined(SERIAL2) && defined(DEBUG) #if defined(SERIAL2) && defined(DEBUG)
@ -69,7 +69,7 @@ enum MenuRadioHardwareItems {
bool menuRadioHardware(event_t event) bool menuRadioHardware(event_t event)
{ {
MENU(STR_HARDWARE, RADIO_ICONS, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, CASE_PCBX10(0) BLUETOOTH_ROWS, 0, 0, 0 }); MENU(STR_HARDWARE, RADIO_ICONS, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0, BLUETOOTH_ROWS, 0, 0, 0 });
uint8_t sub = menuVerticalPosition; uint8_t sub = menuVerticalPosition;
@ -169,7 +169,6 @@ bool menuRadioHardware(event_t event)
break; break;
} }
#if defined (PCBX10)
case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE: case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MAXBAUDRATE); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MAXBAUDRATE);
lcdDrawNumber(HW_SETTINGS_COLUMN+50, y, CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate], attr|LEFT); lcdDrawNumber(HW_SETTINGS_COLUMN+50, y, CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate], attr|LEFT);
@ -187,7 +186,6 @@ bool menuRadioHardware(event_t event)
} }
} }
break; break;
#endif
case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE: case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLUETOOTH); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLUETOOTH);

6
radio/src/opentx.h
View file

@ -200,12 +200,6 @@
#define CASE_PCBX9E(x) #define CASE_PCBX9E(x)
#endif #endif
#if defined(PCBX10)
#define CASE_PCBX10(x) x,
#else
#define CASE_PCBX10(x)
#endif
#if defined(BLUETOOTH) && !(defined(PCBX9E) && !defined(USEHORUSBT)) #if defined(BLUETOOTH) && !(defined(PCBX9E) && !defined(USEHORUSBT))
#define CASE_BLUETOOTH(x) x, #define CASE_BLUETOOTH(x) x,
#else #else

2
radio/src/telemetry/crossfire.h
View file

@ -41,7 +41,7 @@ void processCrossfireTelemetryData(uint8_t data);
void crossfireSetDefault(int index, uint8_t id, uint8_t subId); void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
bool isCrossfireOutputBufferAvailable(); bool isCrossfireOutputBufferAvailable();
#if defined(PCBX7) || defined(PCBX10) #if defined(PCBX7) || defined(PCBHORUS)
const uint32_t CROSSFIRE_BAUDRATES[] = { const uint32_t CROSSFIRE_BAUDRATES[] = {
400000, 400000,
115200, 115200,