fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 16:53: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/systemcmds/ver/module.mk
-2
View File
@@ -42,5 +42,3 @@ SRCS = ver.c
MODULE_STACKSIZE = 1024
MAXOPTIMIZATION = -Os
EXTRADEFINES = -DGIT_VERSION='"$(GIT_DESC)"'
src/systemcmds/ver/ver.c
+2 -1
View File
@@ -45,6 +45,7 @@
#include <version/version.h>
#include <systemlib/err.h>
#include <systemlib/mcu_version.h>
#include <systemlib/git_version.h>
/* string constants for version commands */
static const char sz_ver_hw_str[] = "hw";
@@ -101,7 +102,7 @@ int ver_main(int argc, char *argv[])
}
if (show_all || !strncmp(argv[1], sz_ver_git_str, sizeof(sz_ver_git_str))) {
printf("FW git-hash: %s\n", GIT_VERSION);
printf("FW git-hash: %s\n", px4_git_version);
ret = 0;
}