Merge pull request #2692 from PX4/logging_fix

logging fix: do not use same ID for two messages
This commit is contained in:
Roman Bapst 2015-08-14 09:00:02 +02:00
commit 4fa8394031

View File

@ -165,7 +165,7 @@ struct log_GPS_s {
/* --- ATTC - ATTITUDE CONTROLS (ACTUATOR_0 CONTROLS)--- */
#define LOG_ATTC_MSG 9
#define LOG_ATC1_MSG 40
#define LOG_ATC1_MSG 46
struct log_ATTC_s {
float roll;
float pitch;
@ -477,6 +477,8 @@ struct log_MACS_s {
float yaw_rate_integ;
};
/* WARNING: ID 46 is already in use for ATTC1 */
/********** SYSTEM MESSAGES, ID > 0x80 **********/
/* --- TIME - TIME STAMP --- */