From fb3f761fc72073df9f254ddd78c77918bcedb736 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 28 May 2019 12:18:36 +1000 Subject: [PATCH] AP_UAVCAN: fix redefinition of UAVCAN_NODE_POOL_BLOCK_SIZE warning --- libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp b/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp index da6860cdb4..bd865c9630 100644 --- a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp +++ b/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp @@ -41,6 +41,9 @@ void loop(); const AP_HAL::HAL& hal = AP_HAL::get_HAL(); #define UAVCAN_NODE_POOL_SIZE 8192 +#ifdef UAVCAN_NODE_POOL_BLOCK_SIZE +#undef UAVCAN_NODE_POOL_BLOCK_SIZE +#endif #define UAVCAN_NODE_POOL_BLOCK_SIZE 256 #define debug_uavcan(fmt, args...) do { hal.console->printf(fmt, ##args); } while (0)