fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged release_v1.0.0 into master

Browse Source
This commit is contained in:
Lorenz Meier
2015-05-23 11:07:10 +02:00
parent 38535b4d2f ccac324f5b
commit 8fd00f4d6d
12 changed files with 114 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/module.mk
-2
View File
@@ -49,5 +49,3 @@ MAXOPTIMIZATION = -Os
ifeq ($(PX4_TARGET_OS),nuttx)
EXTRACFLAGS = -Wframe-larger-than=1400
endif
EXTRADEFINES = -DGIT_VERSION='"$(GIT_DESC)"'
src/modules/sdlog2/sdlog2.c
+2 -1
View File
@@ -105,6 +105,7 @@
#include <systemlib/systemlib.h>
#include <systemlib/param/param.h>
#include <systemlib/perf_counter.h>
#include <systemlib/git_version.h>
#include <version/version.h>
#include <mavlink/mavlink_log.h>
@@ -798,7 +799,7 @@ int write_version(int fd)
};
/* fill version message and write it */
strncpy(log_msg_VER.body.fw_git, GIT_VERSION, sizeof(log_msg_VER.body.fw_git));
strncpy(log_msg_VER.body.fw_git, px4_git_version, sizeof(log_msg_VER.body.fw_git));
strncpy(log_msg_VER.body.arch, HW_ARCH, sizeof(log_msg_VER.body.arch));
return write(fd, &log_msg_VER, sizeof(log_msg_VER));
}