mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-26 12:46:39 +00:00
Merge pull request #2989 from rgregg/fix-nrf52-ethernet-build
Fix nRF52 builds broken by unconditional RAK Ethernet include
This commit is contained in:
@@ -1,3 +1,5 @@
|
|||||||
|
#ifdef ETHERNET_ENABLED
|
||||||
|
|
||||||
#include "SerialEthernetInterface.h"
|
#include "SerialEthernetInterface.h"
|
||||||
#include "EthernetMac.h"
|
#include "EthernetMac.h"
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
@@ -262,3 +264,5 @@ bool SerialEthernetInterface::isConnected() const {
|
|||||||
void SerialEthernetInterface::loop() {
|
void SerialEthernetInterface::loop() {
|
||||||
Ethernet.maintain();
|
Ethernet.maintain();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // ETHERNET_ENABLED
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef ETHERNET_ENABLED
|
||||||
|
|
||||||
#include "helpers/BaseSerialInterface.h"
|
#include "helpers/BaseSerialInterface.h"
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <RAK13800_W5100S.h>
|
#include <RAK13800_W5100S.h>
|
||||||
@@ -76,3 +78,5 @@ class SerialEthernetInterface : public BaseSerialInterface {
|
|||||||
#define ETHERNET_DEBUG_PRINTLN(...) {}
|
#define ETHERNET_DEBUG_PRINTLN(...) {}
|
||||||
#define ETHERNET_DEBUG_PRINT_IP(...) {}
|
#define ETHERNET_DEBUG_PRINT_IP(...) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#endif // ETHERNET_ENABLED
|
||||||
|
|||||||
Reference in New Issue
Block a user