dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 13:21:23 +01:00
Code Releases Activity

Adanrg ethernet shield fixes (#107)

Browse Source 
* Ethernet Shield can be configured with static IP

* Use MAC address in config.h, if configured.

* Fix library name typos

* Update EthernetInterface.h

Remove MAC address define here and remind people with a compile time error that it must be defined in the config.h

Co-authored-by: Fred <fndecker@gmail.com>
This commit is contained in:
ADA 2020-12-28 00:06:31 +01:00 committed by GitHub
parent 7963b02839
commit d70f76e80e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EthernetInterface.cpp
View File

@ -50,11 +50,15 @@ EthernetInterface::EthernetInterface()
DIAG(F("\n+++++ Ethernet Setup ")); DIAG(F("\n+++++ Ethernet Setup "));
connected=false; connected=false;
#ifdef IP_ADDRESS
Ethernet.begin(mac, IP_ADDRESS);
#else
if (Ethernet.begin(mac) == 0) if (Ethernet.begin(mac) == 0)
{ {
DIAG(F("begin FAILED\n")); DIAG(F("begin FAILED\n"));
return; return;
} }
#endif
DIAG(F("begin OK.")); DIAG(F("begin OK."));
if (Ethernet.hardwareStatus() == EthernetNoHardware) { if (Ethernet.hardwareStatus() == EthernetNoHardware) {
DIAG(F("shield not found\n")); DIAG(F("shield not found\n"));

18
EthernetInterface.h
View File

@ -30,24 +30,14 @@
#include <Ethernet.h> #include <Ethernet.h>
#include "RingStream.h" #include "RingStream.h"
/* some generated mac addresses as EthernetShields don't have one by default in HW.
* Sometimes they come on a sticker on the EthernetShield then use this address otherwise
* just choose one from below or generate one yourself. Only condition is that there is no
* other device on your network with the same Mac address.
*
* 52:b8:8a:8e:ce:21
* e3:e9:73:e1:db:0d
* 54:2b:13:52:ac:0c
* c2:d8:d4:7d:7c:cb
* 86:cf:fa:9f:07:79
*/
/** /**
* @brief Network Configuration * @brief Network Configuration
* *
*/ */
#define MAC_ADDRESS { 0x52, 0xB8, 0x8A, 0x8E, 0xCE, 0x21 } // MAC address of your networking card found on the sticker on your card or take one from above #ifndef MAC_ADDRESS
// this one is not used elsewhere and corresponds to your network layout #error define MAC_ADDRESS in config.h
#endif
#define LISTEN_PORT 2560 // default listen port for the server #define LISTEN_PORT 2560 // default listen port for the server
#define MAX_ETH_BUFFER 512 #define MAX_ETH_BUFFER 512
#define OUTBOUND_RING_SIZE 2048 #define OUTBOUND_RING_SIZE 2048