Merge with latest changes from 2.3

This commit is contained in:
Bertrand Songis
2019-03-16 14:29:18 +01:00
27 changed files with 414 additions and 27 deletions
+4
View File
@@ -463,6 +463,10 @@ const char STR_SUBTYPE[] = TR_SUBTYPE;
#endif
const char STR_RESET_BTN[] = TR_RESET_BTN;
const char STR_DEBUG[] = TR_DEBUG;
const char STR_SWITCHES_BTN[] = TR_SWITCHES_BTN;
const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN;
const char STR_CALIB_BTN[] = TR_CALIB_BTN;
#if defined(SDCARD)
const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL;