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
@@ -813,7 +813,7 @@ PACK(struct RadioData {
  NOBACKUP(uint8_t  disableRssiPoweroffAlarm:1);
  NOBACKUP(uint8_t  USBMode:2);
  NOBACKUP(uint8_t  jackMode:2);
-  NOBACKUP(uint8_t  spare3:1 SKIP);
+  NOBACKUP(uint8_t  sportUpdatePower:1 SKIP);
  NOBACKUP(char     ttsLanguage[2]);
  NOBACKUP(int8_t   beepVolume:4);
  NOBACKUP(int8_t   wavVolume:4);
@@ -973,4 +973,4 @@ static inline void check_struct()

 #undef CHKSIZE
 }
-#endif /* BACKUP */
+#endif /* BACKUP */