mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
AP_PiccoloCAN: remove double-definition of HAL_PICCOLOCAN_ENABLED
also trust minimize_features.inc to remove this feature where not desired
This commit is contained in:
parent
5e68e473c9
commit
15dc15df3f
@ -29,11 +29,6 @@
|
|||||||
#include "AP_PiccoloCAN_Servo.h"
|
#include "AP_PiccoloCAN_Servo.h"
|
||||||
#include <AP_EFI/AP_EFI_Currawong_ECU.h>
|
#include <AP_EFI/AP_EFI_Currawong_ECU.h>
|
||||||
|
|
||||||
|
|
||||||
#ifndef HAL_PICCOLO_CAN_ENABLE
|
|
||||||
#define HAL_PICCOLO_CAN_ENABLE HAL_NUM_CAN_IFACES
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HAL_PICCOLO_CAN_ENABLE
|
#if HAL_PICCOLO_CAN_ENABLE
|
||||||
|
|
||||||
#define PICCOLO_MSG_RATE_HZ_MIN 1
|
#define PICCOLO_MSG_RATE_HZ_MIN 1
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include <AP_CANManager/AP_CANManager.h>
|
#include <AP_CANManager/AP_CANManager.h>
|
||||||
|
|
||||||
#ifndef HAL_PICCOLO_CAN_ENABLE
|
#ifndef HAL_PICCOLO_CAN_ENABLE
|
||||||
#define HAL_PICCOLO_CAN_ENABLE (HAL_NUM_CAN_IFACES && !HAL_MINIMIZE_FEATURES)
|
#define HAL_PICCOLO_CAN_ENABLE HAL_NUM_CAN_IFACES
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAL_PICCOLO_CAN_ENABLE
|
#if HAL_PICCOLO_CAN_ENABLE
|
||||||
|
Loading…
Reference in New Issue
Block a user