diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 14:34:53 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-23 14:34:53 +0100 |
| commit | 84d744707d07ae60dcf201a828d529057061fe47 (patch) | |
| tree | b0272221e74099e2c450313abeab4c1b44e54d08 | |
| parent | ba4b8c8e003d5dba3b547f4b75407b584df5d965 (diff) | |
| download | px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.tar.gz px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.tar.bz2 px4-firmware-84d744707d07ae60dcf201a828d529057061fe47.zip | |
UAVCAN: Move into lib directory
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Tools/px4params/srcparser.py | 2 | ||||
| -rw-r--r-- | Tools/px4params/srcscanner.py | 7 | ||||
| m--------- | src/lib/uavcan (renamed from uavcan) | 0 | ||||
| -rw-r--r-- | src/modules/uavcan/module.mk | 4 |
5 files changed, 10 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 4b84afac2..17a098431 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,5 +5,5 @@ path = NuttX url = git://github.com/PX4/NuttX.git [submodule "uavcan"] - path = uavcan + path = src/lib/uavcan url = git://github.com/pavel-kirienko/uavcan.git diff --git a/Tools/px4params/srcparser.py b/Tools/px4params/srcparser.py index 0a4d21d26..8e6092195 100644 --- a/Tools/px4params/srcparser.py +++ b/Tools/px4params/srcparser.py @@ -103,7 +103,7 @@ class SourceParser(object): Returns list of supported file extensions that can be parsed by this parser. """ - return ["cpp", "c"] + return [".cpp", ".c"] def Parse(self, contents): """ diff --git a/Tools/px4params/srcscanner.py b/Tools/px4params/srcscanner.py index d7eca72d7..1f0ea4e89 100644 --- a/Tools/px4params/srcscanner.py +++ b/Tools/px4params/srcscanner.py @@ -26,5 +26,10 @@ class SourceScanner(object): parser.Parse method. """ with codecs.open(path, 'r', 'utf-8') as f: - contents = f.read() + try: + contents = f.read() + except: + contents = '' + print('Failed reading file: %s, skipping content.' % path) + pass parser.Parse(contents) diff --git a/uavcan b/src/lib/uavcan -Subproject 1efd24427539fa332a15151143466ec760fa5ff +Subproject 1efd24427539fa332a15151143466ec760fa5ff diff --git a/src/modules/uavcan/module.mk b/src/modules/uavcan/module.mk index f92bc754f..e5d30f6c4 100644 --- a/src/modules/uavcan/module.mk +++ b/src/modules/uavcan/module.mk @@ -57,7 +57,7 @@ SRCS += sensors/sensor_bridge.cpp \ # # libuavcan # -include $(UAVCAN_DIR)/libuavcan/include.mk +include $(PX4_LIB_DIR)/uavcan/libuavcan/include.mk SRCS += $(LIBUAVCAN_SRC) INCLUDE_DIRS += $(LIBUAVCAN_INC) # Since actual compiler mode is C++11, the library will default to UAVCAN_CPP11, but it will fail to compile @@ -67,7 +67,7 @@ override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAV # # libuavcan drivers for STM32 # -include $(UAVCAN_DIR)/libuavcan_drivers/stm32/driver/include.mk +include $(PX4_LIB_DIR)/uavcan/libuavcan_drivers/stm32/driver/include.mk SRCS += $(LIBUAVCAN_STM32_SRC) INCLUDE_DIRS += $(LIBUAVCAN_STM32_INC) override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_STM32_NUTTX -DUAVCAN_STM32_NUM_IFACES=2 |