UAVCAN: Move into lib directory

.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

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):
         """

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)

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