From a50e6c6dd7baa50e1fbf85a1ac4d0eeece832853 Mon Sep 17 00:00:00 2001 From: Nikita Tomilov Date: Thu, 28 Dec 2017 11:56:29 +0300 Subject: [PATCH] AP_HAL: board: linux: Add default CAN interface name --- libraries/AP_HAL/board/linux.h | 4 ++++ libraries/AP_HAL_Linux/CAN.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL/board/linux.h b/libraries/AP_HAL/board/linux.h index 501504f1a4..b60c40737b 100644 --- a/libraries/AP_HAL/board/linux.h +++ b/libraries/AP_HAL/board/linux.h @@ -430,3 +430,7 @@ #ifndef HAL_BOARD_STORAGE_DIRECTORY #define HAL_BOARD_STORAGE_DIRECTORY "/var/lib/ardupilot" #endif + +#ifndef HAL_BOARD_CAN_IFACE_NAME +#define HAL_BOARD_CAN_IFACE_NAME "can0" +#endif diff --git a/libraries/AP_HAL_Linux/CAN.cpp b/libraries/AP_HAL_Linux/CAN.cpp index 7bbbbe0b15..1d7618c384 100644 --- a/libraries/AP_HAL_Linux/CAN.cpp +++ b/libraries/AP_HAL_Linux/CAN.cpp @@ -68,7 +68,7 @@ bool LinuxCAN::begin(uint32_t bitrate) { if (_initialized) return _initialized; // TODO: Add possibility change bitrate - _fd = openSocket("can0"); + _fd = openSocket(HAL_BOARD_CAN_IFACE_NAME); if (_fd > 0) { _bitrate = bitrate; _initialized = true;