Merged master_uavcan_modular src/modules/uavcan/

src/modules/uavcan/module.mk

@@ -44,6 +44,7 @@ WFRAME_LARGER_THAN = 1400
 
 # Main
 SRCS += uavcan_main.cpp              \
+	uavcan_servers.cpp           \
         uavcan_clock.cpp             \
         uavcan_params.c
 
@@ -65,7 +66,11 @@ SRCS += $(subst  $(PX4_MODULE_SRC),../../,$(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
 # because this platform lacks most of the standard library and STL. Hence we need to force C++03 mode.
-override EXTRADEFINES := $(EXTRADEFINES) -DUAVCAN_CPP_VERSION=UAVCAN_CPP03 -DUAVCAN_NO_ASSERTIONS
+override EXTRADEFINES := $(EXTRADEFINES) \
+-DUAVCAN_CPP_VERSION=UAVCAN_CPP03 \
+-DUAVCAN_NO_ASSERTIONS \
+-DUAVCAN_MEM_POOL_BLOCK_SIZE=48 \
+-DUAVCAN_MAX_NETWORK_SIZE_HINT=16
 
 #
 # libuavcan drivers for STM32