HAL_ChibiOS: disable code for CAN for non UAVCAN supported

libraries/AP_HAL_ChibiOS/CANClock.cpp

@@ -38,6 +38,9 @@
  * Modified for Ardupilot by Siddharth Bharat Purohit
  */
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
 #include "CANClock.h"
 #include "CANThread.h"
 #include "CANInternal.h"
@@ -406,3 +409,4 @@ UAVCAN_STM32_IRQ_HANDLER(TIMX_IRQHandler)
 }
 
 #endif
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CANClock.h

@@ -40,6 +40,9 @@
 
 #pragma once
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
 #include <uavcan/driver/system_clock.hpp>
 
 namespace ChibiOS_CAN {
@@ -159,3 +162,4 @@ public:
 };
 
 }
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CANIface.h

@@ -40,6 +40,10 @@
 
 #pragma once
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
+
 #include "CANThread.h"
 #include "CANIface.h"
 #include "bxcan.hpp"
@@ -440,3 +444,5 @@ public:
 }
 
 #include "CANSerialRouter.h"
+
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CANInternal.h

@@ -40,6 +40,10 @@
 
 #pragma once
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
+
 #include <hal.h>
 #include <ch.h>
 /**
@@ -97,3 +101,5 @@ namespace clock {
 uint64_t getUtcUSecFromCanInterrupt();
 }
 }
+
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CANThread.cpp

@@ -38,6 +38,9 @@
  * Modified for Ardupilot by Siddharth Bharat Purohit
  */
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
 #include "CANThread.h"
 #include "CANClock.h"
 #include "CANIface.h"
@@ -115,3 +118,5 @@ void Mutex::unlock()
 }
 
 }
+
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CANThread.h

@@ -40,6 +40,10 @@
 
 #pragma once
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
+
 # include <ch.hpp>
 
 #include <uavcan/uavcan.hpp>
@@ -89,3 +93,5 @@ public:
 };
 
 }
+
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/CanIface.cpp

@@ -38,6 +38,9 @@
  * Code by Siddharth Bharat Purohit
  */
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
 #include <cassert>
 #include <cstring>
 #include "CANIface.h"
@@ -1242,3 +1245,5 @@ UAVCAN_STM32_IRQ_HANDLER(CAN2_RX1_IRQHandler)
 # endif
 
 } // extern "C"
+
+#endif //HAL_WITH_UAVCAN

libraries/AP_HAL_ChibiOS/bxcan.hpp

@@ -40,6 +40,10 @@
 
 #pragma once
 
+#include "AP_HAL_ChibiOS.h"
+
+#if HAL_WITH_UAVCAN
+
 #include <uavcan_stm32/build_config.hpp>
 
 #include <uavcan/uavcan.hpp>
@@ -322,3 +326,4 @@ constexpr unsigned long FMR_FINIT =           (1U << 0); /* Bit 0:  Filter Init
 #if UAVCAN_CPP_VERSION < UAVCAN_CPP11
 # undef constexpr
 #endif
+#endif //HAL_WITH_UAVCAN