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

Merge branch 'beta' into stable

Browse Source
This commit is contained in:
Lorenz Meier
2015-08-07 15:49:30 +02:00
parent 5e6aebc8fa f4d5149a84
commit 24c98ef14e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/px4airframes/srcscanner.py
+3 -4
View File
@@ -16,10 +16,9 @@ class SourceScanner(object):
extensions = tuple(parser.GetSupportedExtensions()) extensions = tuple(parser.GetSupportedExtensions())
for dirname, dirnames, filenames in os.walk(srcdir): for dirname, dirnames, filenames in os.walk(srcdir):
for filename in filenames: for filename in filenames:
if filename.endswith(extensions): path = os.path.join(dirname, filename)
path = os.path.join(dirname, filename) if not self.ScanFile(path, parser):
if not self.ScanFile(path, parser): return False
return False
return True return True
def ScanFile(self, path, parser): def ScanFile(self, path, parser):
makefiles/firmware.mk
+1 -1
View File
@@ -503,7 +503,7 @@ $(PRODUCT_BUNDLE): $(PRODUCT_BIN)
@$(ECHO) %% Generating $@ @$(ECHO) %% Generating $@
ifdef GEN_PARAM_XML ifdef GEN_PARAM_XML
$(Q) $(PYTHON) $(PX4_BASE)/Tools/px_process_params.py --src-path $(PX4_BASE)/src --board CONFIG_ARCH_BOARD_$(CONFIG_BOARD) --xml $(Q) $(PYTHON) $(PX4_BASE)/Tools/px_process_params.py --src-path $(PX4_BASE)/src --board CONFIG_ARCH_BOARD_$(CONFIG_BOARD) --xml
$(Q) $(PYTHON) $(PX4_BASE)/Tools/px_process_airframes.py -a $(PX4_BASE)/ROMFS/px4fmu_common/init.d --board CONFIG_ARCH_BOARD_$(CONFIG_BOARD) --xml $(Q) $(PYTHON) $(PX4_BASE)/Tools/px_process_airframes.py -a $(PX4_BASE)/ROMFS/px4fmu_common/init.d/ --board CONFIG_ARCH_BOARD_$(CONFIG_BOARD) --xml
$(Q) $(MKFW) --prototype $(IMAGE_DIR)/$(BOARD).prototype \ $(Q) $(MKFW) --prototype $(IMAGE_DIR)/$(BOARD).prototype \
--git_identity $(PX4_BASE) \ --git_identity $(PX4_BASE) \
--parameter_xml $(PRODUCT_PARAMXML) \ --parameter_xml $(PRODUCT_PARAMXML) \