Merge remote-tracking branch 'upstream/master' into diff_press_filter

Conflicts:
	src/modules/sdlog2/sdlog2.c
This commit is contained in:
Thomas Gubler
2014-03-15 12:28:29 +01:00
21 changed files with 2902 additions and 725 deletions
+7 -7
View File
@@ -268,13 +268,13 @@ struct log_DIST_s {
/* --- TELE - TELEMETRY STATUS --- */
#define LOG_TELE_MSG 22
struct log_TELE_s {
uint8_t rssi;
uint8_t remote_rssi;
uint8_t noise;
uint8_t remote_noise;
uint16_t rxerrors;
uint16_t fixed;
uint8_t txbuf;
uint8_t rssi;
uint8_t remote_rssi;
uint8_t noise;
uint8_t remote_noise;
uint16_t rxerrors;
uint16_t fixed;
uint8_t txbuf;
};
/********** SYSTEM MESSAGES, ID > 0x80 **********/