1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00

Merge branch 'next' into kilrah/extratrims

This commit is contained in:
Andre Bernet 2016-04-08 10:46:34 +04:00
commit 64a3c21c4e
156 changed files with 1798 additions and 1027 deletions

View file

@ -914,7 +914,8 @@ PACK(struct TrainerData {
NOBACKUP(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]); \
NOBACKUP(char anaNames[NUM_STICKS+NUM_POTS][LEN_ANA_NAME]); \
NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
NOBACKUP(uint8_t bluetoothEnable); \
NOBACKUP(uint8_t bluetoothEnable:1); \
NOBACKUP(uint8_t blOffBright:7); \
NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]);
#elif defined(PCBFLAMENCO)
#define EXTRA_GENERAL_FIELDS \