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

Implement Serial 123 Branch by hand due to merge conflicts

This commit is contained in:
dexslab 2020-09-22 15:20:33 -04:00
parent 28efc0ffef
commit 9ad8dd6cbd
2 changed files with 16 additions and 1 deletions

View File

@ -116,8 +116,22 @@ void setup()
#endif #endif
#if ENABLE_WIFI #if ENABLE_WIFI
bool wifiUp = false;
Serial1.begin(WIFI_SERIAL_LINK_SPEED); Serial1.begin(WIFI_SERIAL_LINK_SPEED);
WifiInterface::setup(Serial1, F("Your network name"), F("your network password"), F("DCCEX"), 3532); wifiUp = WifiInterface::setup(Serial1, WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, WIFI_PORT);
#if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
if (!wifiUp)
{
Serial2.begin(WIFI_SERIAL_LINK_SPEED);
wifiUp = WifiInterface::setup(Serial2, WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, WIFI_PORT);
}
if (!wifiUp)
{
Serial3.begin(WIFI_SERIAL_LINK_SPEED);
wifiUp = WifiInterface::setup(Serial3, WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, WIFI_PORT);
}
#endif
#endif #endif
// Responsibility 3: Start the DCC engine. // Responsibility 3: Start the DCC engine.

View File

@ -58,6 +58,7 @@ The configuration file for DCC++ EX Command Station
#define WIFI_SSID "" #define WIFI_SSID ""
#define WIFI_PASSWORD "" #define WIFI_PASSWORD ""
#define WIFI_HOSTNAME "" #define WIFI_HOSTNAME ""
#define WIFI_PORT 3252
// This defines the speed at which the Arduino will communicate with the ESP8266 module. // This defines the speed at which the Arduino will communicate with the ESP8266 module.