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

Merge pull request #2245 from mcharleb/clean-fix

Browse Source 
git_version.* not removed on clean
This commit is contained in:
Lorenz Meier
2015-05-28 10:28:02 -07:00
parent be3551136a 77cc3cdde1
commit 9cb944b553
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2
View File
@@ -59,6 +59,7 @@ endif
GIT_DESC_SHORT := $(shell echo $(GIT_DESC) | cut -c1-16) GIT_DESC_SHORT := $(shell echo $(GIT_DESC) | cut -c1-16)
$(shell mkdir -p $(BUILD_DIR)) $(shell mkdir -p $(BUILD_DIR))
$(shell rm -f $(BUILD_DIR)git_version.*)
$(shell echo "#include <systemlib/git_version.h>" > $(BUILD_DIR)git_version.c) $(shell echo "#include <systemlib/git_version.h>" > $(BUILD_DIR)git_version.c)
$(shell echo "const char* px4_git_version = \"$(GIT_DESC)\";" >> $(BUILD_DIR)git_version.c) $(shell echo "const char* px4_git_version = \"$(GIT_DESC)\";" >> $(BUILD_DIR)git_version.c)
$(shell echo "const uint64_t px4_git_version_binary = 0x$(GIT_DESC_SHORT);" >> $(BUILD_DIR)git_version.c) $(shell echo "const uint64_t px4_git_version_binary = 0x$(GIT_DESC_SHORT);" >> $(BUILD_DIR)git_version.c)
@@ -317,6 +318,7 @@ check_format:
clean: clean:
@echo > /dev/null @echo > /dev/null
$(Q) $(RMDIR) $(BUILD_DIR)*.build $(Q) $(RMDIR) $(BUILD_DIR)*.build
$(Q) $(REMOVE) $(BUILD_DIR)git_version.*
$(Q) $(REMOVE) $(IMAGE_DIR)*.px4 $(Q) $(REMOVE) $(IMAGE_DIR)*.px4
.PHONY: distclean .PHONY: distclean
src/drivers/px4io/px4io.cpp
+1 -1
View File
@@ -1009,7 +1009,7 @@ PX4IO::task_main()
orb_copy(ORB_ID(vehicle_command), _t_vehicle_command, &cmd); orb_copy(ORB_ID(vehicle_command), _t_vehicle_command, &cmd);
// Check for a DSM pairing command // Check for a DSM pairing command
if (((int)cmd.command == vehicle_command_s::VEHICLE_CMD_START_RX_PAIR) && ((int)cmd.param1 == 0)) { if (((unsigned int)cmd.command == vehicle_command_s::VEHICLE_CMD_START_RX_PAIR) && ((int)cmd.param1 == 0)) {
dsm_bind_ioctl((int)cmd.param2); dsm_bind_ioctl((int)cmd.param2);
} }
} }