Back Port of Git Versioning - without side effects Part 2

This commit is contained in:
David Sidrane
2015-06-12 06:54:04 -10:00
parent 17fddb1556
commit 5acc4ee43b
5 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ all: $(FIRMWARES)
.PHONY: $(FIRMWARES)
$(BUILD_DIR)%.build/firmware.a: config = $(patsubst $(BUILD_DIR)%.build/firmware.a,%,$@)
$(BUILD_DIR)%.build/firmware.a: work_dir = $(BUILD_DIR)$(config).build/
$(FIRMWARES): $(BUILD_DIR)%.build/firmware.a: generateuorbtopicheaders
$(FIRMWARES): $(BUILD_DIR)%.build/firmware.a: checkgitversion generateuorbtopicheaders
@$(ECHO) %%%%
@$(ECHO) %%%% Building $(config) in $(work_dir)
@$(ECHO) %%%%
+1
View File
@@ -19,6 +19,7 @@ MODULES += modules/sensors
MODULES += systemcmds/param
MODULES += systemcmds/mixer
MODULES += systemcmds/topic_listener
MODULES += systemcmds/ver
#
# General system control
@@ -9,3 +9,5 @@
#define PX4_I2C_BUS_LED 3
#define PX4_I2C_OBDEV_LED 0x55
#define STM32_SYSMEM_UID "SIMULATIONID"
+1
View File
@@ -125,6 +125,7 @@ typedef param_t px4_param_t;
/* FIXME - Used to satisfy build */
//STM DocID018909 Rev 8 Sect 39.1 (Unique device ID Register)
#define UNIQUE_ID 0x1FFF7A10
#define STM32_SYSMEM_UID "SIMULATIONID"
/* FIXME - Used to satisfy build */
#define getreg32(a) (*(volatile uint32_t *)(a))
+5 -2
View File
@@ -41,6 +41,7 @@
*/
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <version/version.h>
#include <systemlib/err.h>
@@ -91,7 +92,8 @@ int ver_main(int argc, char *argv[])
return ret;
} else {
errx(1, "Not enough arguments, try 'ver hwcmp PX4FMU_V2'");
warn("Not enough arguments, try 'ver hwcmp PX4FMU_V2'");
return 1;
}
}
@@ -158,7 +160,8 @@ int ver_main(int argc, char *argv[])
if (ret == 1) {
errx(1, "unknown command.\n");
warn("unknown command.\n");
return 1;
}
} else {