Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Periph: fix include order network build error

This commit is contained in:
Tom Pittenger 2023-11-28 13:26:02 -08:00 committed by Peter Barker
parent f72dd8cc89
commit 7da434d1e0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/AP_Periph/AP_Periph.h
View File

@ -26,7 +26,6 @@
#include <AP_Scripting/AP_Scripting.h> #include <AP_Scripting/AP_Scripting.h>
#include <AP_HAL/CANIface.h> #include <AP_HAL/CANIface.h>
#include <AP_Stats/AP_Stats.h> #include <AP_Stats/AP_Stats.h>
#include <AP_Networking/AP_Networking.h>
#include <AP_RPM/AP_RPM.h> #include <AP_RPM/AP_RPM.h>
#include <AP_SerialManager/AP_SerialManager.h> #include <AP_SerialManager/AP_SerialManager.h>
#include <AP_ESC_Telem/AP_ESC_Telem_config.h> #include <AP_ESC_Telem/AP_ESC_Telem_config.h>

4
Tools/AP_Periph/networking.h
View File

@ -1,9 +1,11 @@
#pragma once #pragma once
#include "AP_Periph.h" #include <AP_HAL/AP_HAL_Boards.h>
#ifdef HAL_PERIPH_ENABLE_NETWORKING #ifdef HAL_PERIPH_ENABLE_NETWORKING
#include <AP_Networking/AP_Networking.h>
#ifndef HAL_PERIPH_NETWORK_NUM_PASSTHRU #ifndef HAL_PERIPH_NETWORK_NUM_PASSTHRU
#define HAL_PERIPH_NETWORK_NUM_PASSTHRU 2 #define HAL_PERIPH_NETWORK_NUM_PASSTHRU 2
#endif #endif

2
Tools/AP_Periph/networking_passthru.cpp
View File

@ -13,7 +13,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "networking.h" #include "AP_Periph.h"
#if defined(HAL_PERIPH_ENABLE_NETWORKING) && HAL_PERIPH_NETWORK_NUM_PASSTHRU > 0 #if defined(HAL_PERIPH_ENABLE_NETWORKING) && HAL_PERIPH_NETWORK_NUM_PASSTHRU > 0