Merged GIT version changes

This commit is contained in:
David Sidrane
2015-06-12 19:32:55 +02:00
committed by Lorenz Meier
parent bca13e3e1b
commit 428611119f
5 changed files with 55 additions and 9 deletions
+2
View File
@@ -41,6 +41,8 @@
#include <stdint.h>
#include "build_git_version.h"
__BEGIN_DECLS
__EXPORT extern const char* px4_git_version;
+2 -2
View File
@@ -55,8 +55,8 @@ SRCS = err.c \
pwm_limit/pwm_limit.c \
circuit_breaker.cpp \
circuit_breaker_params.c \
mcu_version.c \
$(BUILD_DIR)git_version.c
mcu_version.c
circuit_breaker_params.c
MAXOPTIMIZATION = -Os
+3
View File
@@ -57,6 +57,9 @@ static const char sz_ver_all_str[] = "all";
static const char mcu_ver_str[] = "mcu";
static const char mcu_uid_str[] = "uid";
const char* px4_git_version = PX4_GIT_VERSION_STR;
const uint64_t px4_git_version_binary = PX4_GIT_VERSION_BINARY;
static void usage(const char *reason)
{
if (reason != NULL) {