Merge branch '2.3' into 2.4

# Conflicts:
#	radio/src/datastructs.h
This commit is contained in:
Raphael Coeffic
2021-06-10 17:31:39 +02:00
17 changed files with 94 additions and 14 deletions
+2
View File
@@ -85,6 +85,7 @@ ISTR(SWTYPES);
ISTR(POTTYPES);
ISTR(SLIDERTYPES);
ISTR(ANTENNA_MODES);
ISTR(SAMPLE_MODES);
ISTR(SPORT_UPDATE_POWER_MODES);
ISTR(CRSF_BAUDRATE);
ISTR(PPM_POL);
@@ -443,6 +444,7 @@ const char STR_FORMATTING[] = TR_FORMATTING;
const char STR_TEMP_CALIB[] = TR_TEMP_CALIB;
const char STR_TIME[] = TR_TIME;
const char STR_MAXBAUDRATE[] = TR_MAXBAUDRATE;
const char STR_SAMPLE_MODE[] = TR_SAMPLE_MODE;
const char STR_BAUDRATE[] = TR_BAUDRATE;
const char STR_SD_INFO_TITLE[] = TR_SD_INFO_TITLE;
const char STR_SD_TYPE[] = TR_SD_TYPE;