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

Merge branch 'next' into schwabe/spektrum_dsm2_bind

Browse source 
# Conflicts:
#	radio/src/translations/de.h.txt
This commit is contained in:
Andre Bernet 2016-10-21 19:35:46 +02:00
commit 978867d509
92 changed files with 11241 additions and 9188 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/datastructs.h
View file

@ -920,7 +920,7 @@ PACK(struct TrainerData {
char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]; \
char anaNames[NUM_STICKS+NUM_POTS+NUM_SLIDERS][LEN_ANA_NAME];
#elif defined(PCBTARANIS)
#if defined(PCBX9E)
#if defined(PCBX9E) || defined(PCBX7D)
#define BLUETOOTH_FIELDS \
uint8_t bluetoothEnable; \
char bluetoothName[LEN_BLUETOOTH_NAME];