From 08c1123c4901186b4c8d5191ba56e50f593e278b Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 7 Aug 2015 14:40:18 +0200 Subject: [PATCH 1/2] Airframes meta scanner: Do not require particular file ending --- Tools/px4airframes/srcscanner.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Tools/px4airframes/srcscanner.py b/Tools/px4airframes/srcscanner.py index c1f280668d..cb31906a30 100644 --- a/Tools/px4airframes/srcscanner.py +++ b/Tools/px4airframes/srcscanner.py @@ -16,10 +16,9 @@ class SourceScanner(object): extensions = tuple(parser.GetSupportedExtensions()) for dirname, dirnames, filenames in os.walk(srcdir): for filename in filenames: - if filename.endswith(extensions): - path = os.path.join(dirname, filename) - if not self.ScanFile(path, parser): - return False + path = os.path.join(dirname, filename) + if not self.ScanFile(path, parser): + return False return True def ScanFile(self, path, parser): From f4d5149a842bfbcc73262b5b8659a207a3dae160 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 7 Aug 2015 15:49:23 +0200 Subject: [PATCH 2/2] Fix airframe generation by adding missing slash (Windows) --- makefiles/firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 0aff25cfea..2d971e1c58 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -503,7 +503,7 @@ $(PRODUCT_BUNDLE): $(PRODUCT_BIN) @$(ECHO) %% Generating $@ 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_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 \ --git_identity $(PX4_BASE) \ --parameter_xml $(PRODUCT_PARAMXML) \