mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-22 23:56:13 +01:00
make it compile on all default platforms
This commit is contained in:
parent
001c4664c1
commit
1235c288dc
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include "EthernetInterface.h"
|
#include "EthernetInterface.h"
|
||||||
|
#ifdef DO_MDNS
|
||||||
#include "EXmDNS.h"
|
#include "EXmDNS.h"
|
||||||
|
|
||||||
// fixed values for mDNS
|
// fixed values for mDNS
|
||||||
|
@ -193,3 +194,4 @@ void MDNS::run() {
|
||||||
_udp->flush();
|
_udp->flush();
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
#endif //DO_MDNS
|
||||||
|
|
3
EXmDNS.h
3
EXmDNS.h
|
@ -17,7 +17,7 @@
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
#ifdef DO_MDNS
|
||||||
#define BROADCASTTIME 15 //seconds
|
#define BROADCASTTIME 15 //seconds
|
||||||
|
|
||||||
typedef enum _MDNSServiceProtocol_t
|
typedef enum _MDNSServiceProtocol_t
|
||||||
|
@ -41,3 +41,4 @@ private:
|
||||||
char* _serviceProto;
|
char* _serviceProto;
|
||||||
int _servicePort;
|
int _servicePort;
|
||||||
};
|
};
|
||||||
|
#endif //DO_MDNS
|
||||||
|
|
|
@ -32,10 +32,11 @@
|
||||||
#include "WiThrottle.h"
|
#include "WiThrottle.h"
|
||||||
#include "DCCTimer.h"
|
#include "DCCTimer.h"
|
||||||
|
|
||||||
|
#ifdef DO_MDNS
|
||||||
#include "EXmDNS.h"
|
#include "EXmDNS.h"
|
||||||
#define DO_MDNS
|
|
||||||
EthernetUDP udp;
|
EthernetUDP udp;
|
||||||
MDNS mdns(udp);
|
MDNS mdns(udp);
|
||||||
|
#endif
|
||||||
|
|
||||||
//extern void looptimer(unsigned long timeout, const FSH* message);
|
//extern void looptimer(unsigned long timeout, const FSH* message);
|
||||||
#define looptimer(a,b)
|
#define looptimer(a,b)
|
||||||
|
|
|
@ -31,13 +31,16 @@
|
||||||
#define EthernetInterface_h
|
#define EthernetInterface_h
|
||||||
|
|
||||||
#include "defines.h"
|
#include "defines.h"
|
||||||
|
#if ETHERNET_ON == true
|
||||||
#include "DCCEXParser.h"
|
#include "DCCEXParser.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
//#include <avr/pgmspace.h>
|
//#include <avr/pgmspace.h>
|
||||||
#if defined (ARDUINO_TEENSY41)
|
#if defined (ARDUINO_TEENSY41)
|
||||||
#include <NativeEthernet.h> //TEENSY Ethernet Treiber
|
#include <NativeEthernet.h> //TEENSY Ethernet Treiber
|
||||||
#include <NativeEthernetUdp.h>
|
#include <NativeEthernetUdp.h>
|
||||||
|
#ifndef MAX_SOCK_NUM
|
||||||
#define MAX_SOCK_NUM 4
|
#define MAX_SOCK_NUM 4
|
||||||
|
#endif
|
||||||
#elif defined (ARDUINO_NUCLEO_F429ZI) || defined (ARDUINO_NUCLEO_F439ZI) || defined (ARDUINO_NUCLEO_F4X9ZI)
|
#elif defined (ARDUINO_NUCLEO_F429ZI) || defined (ARDUINO_NUCLEO_F439ZI) || defined (ARDUINO_NUCLEO_F4X9ZI)
|
||||||
#include <LwIP.h>
|
#include <LwIP.h>
|
||||||
// #include "STM32lwipopts.h"
|
// #include "STM32lwipopts.h"
|
||||||
|
@ -46,6 +49,7 @@
|
||||||
extern "C" struct netif gnetif;
|
extern "C" struct netif gnetif;
|
||||||
#define STM32_ETHERNET
|
#define STM32_ETHERNET
|
||||||
#define MAX_SOCK_NUM MAX_NUM_TCP_CLIENTS
|
#define MAX_SOCK_NUM MAX_NUM_TCP_CLIENTS
|
||||||
|
#define DO_MDNS
|
||||||
#else
|
#else
|
||||||
#include "Ethernet.h"
|
#include "Ethernet.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -77,5 +81,5 @@ class EthernetInterface {
|
||||||
static void dropClient(byte socketnum);
|
static void dropClient(byte socketnum);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
#endif // ETHERNET_ON
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user