mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 08:36:14 +01:00
Compare commits
No commits in common. "718e78fca686c4dee836e0e84ab3c9a1556ab054" and "39d0cbb791020e69be0a1da37a4ba7dcdc3a33e5" have entirely different histories.
718e78fca6
...
39d0cbb791
|
@ -59,15 +59,15 @@ EthernetInterface::EthernetInterface()
|
||||||
DCCTimer::getSimulatedMacAddress(mac);
|
DCCTimer::getSimulatedMacAddress(mac);
|
||||||
connected=false;
|
connected=false;
|
||||||
|
|
||||||
#ifdef IP_ADDRESS
|
#ifdef IP_ADDRESS
|
||||||
if (Ethernet.begin(mac, IP_ADDRESS) == 0)
|
Ethernet.begin(mac, IP_ADDRESS);
|
||||||
#else
|
#else
|
||||||
if (Ethernet.begin(mac) == 0)
|
if (Ethernet.begin(mac) == 0)
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
DIAG(F("Ethernet.begin FAILED"));
|
DIAG(F("Ethernet.begin FAILED"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
|
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
|
||||||
DIAG(F("Ethernet shield not found or W5100"));
|
DIAG(F("Ethernet shield not found or W5100"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202401081219Z"
|
#define GITHUB_SHA "devel-202401072123Z"
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.20"
|
#define VERSION "5.2.19"
|
||||||
// 5.2.20 - Check return of Ethernet.begin()
|
|
||||||
// 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC
|
// 5.2.19 - ESP32: Determine if the RMT hardware can handle DCC
|
||||||
// 5.2.18 - Display network IP fix
|
// 5.2.18 - Display network IP fix
|
||||||
// 5.2.17 - ESP32 simplify network logic
|
// 5.2.17 - ESP32 simplify network logic
|
||||||
|
|
Loading…
Reference in New Issue
Block a user