Merge branch 'next' into schwabe/spektrum_dsm2_bind

# Conflicts:
#	radio/src/translations/de.h.txt
This commit is contained in:
Andre Bernet
2016-10-21 19:36:31 +02:00
92 changed files with 11238 additions and 9185 deletions
+1 -1
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];