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

Ethernet should need a #define in config(.example).h

This commit is contained in:
Harald Barth 2020-11-29 10:48:39 +01:00
parent f2db288102
commit 01a6d1c8f4
4 changed files with 18 additions and 6 deletions

View File

@ -10,7 +10,9 @@
#include "DCCEXParser.h" #include "DCCEXParser.h"
#include "version.h" #include "version.h"
#include "WifiInterface.h" #include "WifiInterface.h"
#if ETHERNET_ON == true
#include "EthernetInterface.h" #include "EthernetInterface.h"
#endif
#include "LCD_Implementation.h" #include "LCD_Implementation.h"
#include "freeMemory.h" #include "freeMemory.h"
#include <Arduino.h> #include <Arduino.h>

View File

@ -18,6 +18,9 @@
* *
*/ */
#include "config.h"
#include "defines.h" // This should be changed to DCCEX.h when possible
#if ETHERNET_ON == true
#include "EthernetInterface.h" #include "EthernetInterface.h"
#include "DIAG.h" #include "DIAG.h"
#include "CommandDistributor.h" #include "CommandDistributor.h"
@ -166,8 +169,6 @@ void EthernetInterface::loop()
if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d\n"), socketOut,count); if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d\n"), socketOut,count);
for(;count>0;count--) clients[socketOut].write(outboundRing->read()); for(;count>0;count--) clients[socketOut].write(outboundRing->read());
clients[socketOut].flush(); //maybe clients[socketOut].flush(); //maybe
}
} }
}
#endif

View File

@ -25,6 +25,8 @@
// which libraray is involved. // which libraray is involved.
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
#ifndef LCD_Implementation_h
#define LCD_Implementation_h
#include "config.h" #include "config.h"
#include <Wire.h> #include <Wire.h>
#include "LCDDisplay.h" #include "LCDDisplay.h"
@ -51,5 +53,4 @@ LCDDisplay * LCDDisplay::lcdDisplay=0;
#define CONDITIONAL_LCD_START if (false) /* NO LCD CONFIG */ #define CONDITIONAL_LCD_START if (false) /* NO LCD CONFIG */
#endif #endif
#endif // LCD_Implementation_h

View File

@ -76,6 +76,14 @@ The configuration file for DCC++ EX Command Station
// //
//#define WIFI_CONNECT_TIMEOUT 14000 //#define WIFI_CONNECT_TIMEOUT 14000
/////////////////////////////////////////////////////////////////////////////////////
//
// ENABLE_ETHERNET: Set to true if you have an Arduino Ethernet card (wired). This
// is not for Wifi. You will then need the Arduino Ethernet library as well
//
//#define ENABLE_ETHERNET true
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// //
// DEFINE STATIC IP ADDRESS *OR* COMMENT OUT TO USE DHCP // DEFINE STATIC IP ADDRESS *OR* COMMENT OUT TO USE DHCP