fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-07 04:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2692 from PX4/logging_fix

Browse Source 
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
parent 133f5a38a9 1dab361c2d
commit 4fa8394031
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/sdlog2_messages.h
+3 -1
View File
@@ -165,7 +165,7 @@ struct log_GPS_s {
/* --- ATTC - ATTITUDE CONTROLS (ACTUATOR_0 CONTROLS)--- */ /* --- ATTC - ATTITUDE CONTROLS (ACTUATOR_0 CONTROLS)--- */
#define LOG_ATTC_MSG 9 #define LOG_ATTC_MSG 9
#define LOG_ATC1_MSG 40 #define LOG_ATC1_MSG 46
struct log_ATTC_s { struct log_ATTC_s {
float roll; float roll;
float pitch; float pitch;
@@ -477,6 +477,8 @@ struct log_MACS_s {
float yaw_rate_integ; float yaw_rate_integ;
}; };
/* WARNING: ID 46 is already in use for ATTC1 */
/********** SYSTEM MESSAGES, ID > 0x80 **********/ /********** SYSTEM MESSAGES, ID > 0x80 **********/
/* --- TIME - TIME STAMP --- */ /* --- TIME - TIME STAMP --- */