Merge branch 'next' into kilrah/telemetry_enhancements

This commit is contained in:
Andre Bernet
2015-03-22 22:00:34 +04:00
26 changed files with 425 additions and 289 deletions
+1 -1
View File
@@ -751,7 +751,7 @@ PACK(typedef struct {
uint8_t disableAlarmWarning:1;
uint8_t stickMode:2;
int8_t timezone:5;
uint8_t spare1:1;
uint8_t adjustRTC:1;
uint8_t inactivityTimer;
uint8_t mavbaud:3;
SPLASH_MODE; /* 3bits */