Merge with latest 2.3

2020-03-18 17:09:38 +01:00
parent 34aa1e4327 5444cd1ab6
commit 1d96af49c4
52 changed files with 514 additions and 295 deletions
@@ -80,6 +80,7 @@ ISTR(SWTYPES);
 ISTR(POTTYPES);
 ISTR(SLIDERTYPES);
 ISTR(ANTENNA_MODES);
+ISTR(SPORT_UPDATE_POWER_MODES);
 ISTR(CRSF_BAUDRATE);
 ISTR(PPM_POL);

@@ -693,6 +694,7 @@ const char STR_RTC_CHECK[]  = TR_RTC_CHECK;
 const char STR_EXIT[] = TR_EXIT;
 const char STR_MODULE_RANGE[] = TR_MODULE_RANGE;
 const char STR_RECEIVER_OPTIONS[] = TR_RECEIVER_OPTIONS;
+const char STR_SPORT_UPDATE_POWER_MODE[] = TR_SPORT_UPDATE_POWER_MODE;

 #if defined(PCBHORUS)
 const char STR_ASSIGN_SPLASH[] = TR_ASSIGN_SPLASH;