2020-09-26 13:01:00 +02:00
|
|
|
/*
|
2024-02-01 11:15:08 +01:00
|
|
|
* © 2024 Morten "Doc" Nielsen
|
|
|
|
* © 2023-2024 Paul M. Antoine
|
2022-11-04 16:08:43 +01:00
|
|
|
* © 2022 Bruno Sanches
|
2022-01-07 02:28:35 +01:00
|
|
|
* © 2021 Fred Decker
|
2022-11-04 16:08:43 +01:00
|
|
|
* © 2020-2022 Harald Barth
|
2022-01-07 02:28:35 +01:00
|
|
|
* © 2020-2021 Chris Harlow
|
|
|
|
* © 2020 Gregor Baues
|
|
|
|
* All rights reserved.
|
2020-09-26 13:01:00 +02:00
|
|
|
*
|
|
|
|
* This file is part of DCC-EX/CommandStation-EX
|
|
|
|
*
|
|
|
|
* This is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* It is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with CommandStation. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
#include "defines.h"
|
2020-11-29 10:48:39 +01:00
|
|
|
#if ETHERNET_ON == true
|
2020-09-26 13:01:00 +02:00
|
|
|
#include "EthernetInterface.h"
|
|
|
|
#include "DIAG.h"
|
2020-10-30 14:00:02 +01:00
|
|
|
#include "CommandDistributor.h"
|
2022-08-06 00:34:35 +02:00
|
|
|
#include "WiThrottle.h"
|
Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
#include "DCCTimer.h"
|
2024-01-28 05:31:43 +01:00
|
|
|
#include "MDNS_Generic.h"
|
|
|
|
|
|
|
|
EthernetUDP udp;
|
|
|
|
MDNS mdns(udp);
|
2020-09-26 13:01:00 +02:00
|
|
|
|
2020-10-30 14:00:02 +01:00
|
|
|
EthernetInterface * EthernetInterface::singleton=NULL;
|
|
|
|
/**
|
|
|
|
* @brief Setup Ethernet Connection
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void EthernetInterface::setup()
|
|
|
|
{
|
2022-11-04 16:08:43 +01:00
|
|
|
if (singleton!=NULL) {
|
|
|
|
DIAG(F("Prog Error!"));
|
|
|
|
return;
|
|
|
|
}
|
2023-10-23 15:28:25 +02:00
|
|
|
DIAG(F("Ethernet Class setup, attempting to instantiate"));
|
|
|
|
if ((singleton=new EthernetInterface())) {
|
|
|
|
DIAG(F("Ethernet Class initialized"));
|
2022-11-04 16:08:43 +01:00
|
|
|
return;
|
2023-10-23 15:28:25 +02:00
|
|
|
}
|
2022-11-04 16:08:43 +01:00
|
|
|
DIAG(F("Ethernet not initialized"));
|
2020-10-30 14:00:02 +01:00
|
|
|
};
|
2020-09-26 13:01:00 +02:00
|
|
|
|
|
|
|
|
2024-01-10 15:09:22 +01:00
|
|
|
#ifdef IP_ADDRESS
|
|
|
|
static IPAddress myIP(IP_ADDRESS);
|
|
|
|
#endif
|
|
|
|
|
2020-09-26 13:01:00 +02:00
|
|
|
/**
|
2020-10-30 14:00:02 +01:00
|
|
|
* @brief Aquire IP Address from DHCP and start server
|
2020-09-26 13:01:00 +02:00
|
|
|
*
|
|
|
|
* @return true
|
|
|
|
* @return false
|
|
|
|
*/
|
2020-10-30 14:00:02 +01:00
|
|
|
EthernetInterface::EthernetInterface()
|
2020-09-26 13:01:00 +02:00
|
|
|
{
|
Nano every2 (#129)
* Start adding back unowifi stuffz
* Uno Wifi compiling
* Fixes for compile arduino unowifi r2
* FlasString and Timers for Uno Wifi
ALL these changes should be portable back to master
* Remove extra timer that was already added
* Changed to EveryTimerB
* Add everytimerb.h
* Cleanup
* Linear address <a> cmd
* Allow lower case keywords
* Add the F define to be on safe side if it is not present in the library core code
* Clean simple Timer interface
Removes overkill files, puts all timer in a single small file. (DCCTimer)
* Timer port
* Timer working
And slow wave command removed
* Correcting non-portables merged from master
* Wave-state machine ( part 11)
* Microtuning waveform
Significant reduction in code paths and call overheads
* Current check cleanup
* Fix no-loco id
Has to handle -1 correctly
* fix wrong format letter
* redo flow through wifisetup again
* version++
* bugfixes wifi setup
* Retry harder for AP mode
* Remove unued if
* DIO2 replacement
Currently for writing signal pins during waveform.
* Drop analogReadFast (see DCCTimer)
AnalogRead speed set in DCCTimer for ease of porting.
Code tidy and diagnostics in MotorDriver
* UNTESTED fast power,brake,fault pins
* Distunguish between in/out of FASTPIN
* minor performance tweaks
* Config comments and example use
* Config/example loading
* IP/PORT on LCD
* Ethernet simulated mac
Plus fixed listening port
* Github SHA
* Committing a SHA
* Fix for nano compile
* Comments and a reliability fix.
* UnoRev2 protection
* PWM pin implementation
* fix wifi setup issue
* Reinstate IP_PORT
* Wifi channel and code cleaninga
* Reduce duplicated F() macros
Compiler isn't as clever as one might expect
* Committing a SHA
* Update config.example.h
Add comment to wifi channel section
* Committing a SHA
* Handle shields with common fault pins (Pololu)
* Committing a SHA
* remove warning
* Committing a SHA
* only do the sha generation on master
* yaml syntax
* Fast SSD1306 OLED driver
Incorporate code from SSD1306Ascii library to speed up OLED screen updates, reduce memory requirements and eliminate some library dependences.
* Fix auto-configure from cold boot.
Add call to Wire.begin().
* Update comment for OLED_DRIVER define.
* Update MotorDrivers.h
Add a motor board definition for using the IBT_2 board for a high current to the main track and keep the Arduino Motor Shield for operating the programming track.
* Committing a SHA
* Fix missing F in motor drivers
* JOIN relay pin
* Swap Join Relay high/low
* Hide WIFI_CONNECT_TIMEOUT
This is not what the config suggests it is... The timeout is in the ES and defaults to 15 seconds. Abandoning it early leads to confused setup.
* Enhance OLED/LCD speed
Write one character or position command per loop entry so as not to hold up the loop. Add support for SH1106 OLED as 132x64 size option.
* Enhance OLED/LCD speed
* Delete comment about OLED on UNO.
* Trim unwanted code
* Handle display types correctly
* Update comments
* Speed up OLED writes
Add new flushDisplay() to end any in-progress I2C transaction. Previously, an redundant command was sent that ended the in-progress transaction but also sent another complete, but unnecessary, transaction.
* Comments and copyright update
* Reduce RAM and flash requirement a few more bytes.
* Move statics into LCDDisplay class, and reduce RAM.
Some state variables were static in LCDDisplay.write(). Moved to class members. Also, types of data items like row, column & character position changed to int8_t to save a few bytes of RAM.
* Type lcdCols and lcdRows to unsigned.
Since lcdCols is normally 128, it needs to be uint8_t, not int8_t.
* remove timeout from user config
* faultpin is common only if it exists ; make code prettier
* Rationalisation of SSD1306 driver
Merge SSD1306AsciiWire.cpp into SSD1306Ascii.cpp and rename SSD1306AsciiWire.h as SSD1306Ascii.h.
Merge allFonts.h into System5x7.h and rename as SSD1306font.h.
Move all SSD1306 files into root folder to facilitate compilation in Arduino IDE.
* Fix some font attributes as const.
* Remove unused initialisation sequences for tiny oled screens
* Add m_ to variables
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Revert "Bump up I2C speed"
This reverts commit 1c1168f43314d3a6855738fbc406d5654e801831.
* Bump up I2C speed
Speed was 100kHz (default). Max for OLEDis 400kHz.
* Drop duplicate DIAG
* ignore mySetup.h files
* Restore uno to default_envs
Restore uno (previously commented out) to default_envs.
* Update objdump.bat
Allows other editors as Notepad is very slow on large files
* Prog Track overload during cv read
* Faster LCD Driver
Extract LCD driver from library;
Trim unused functionality;
Reduce I2C communications to minimum;
Speed up I2C clock to 400kHz.
* Update config.example.h
Add IBT_2_WITH_ARDUINO to example config
* Update config.example.h
* Screen enhancements (#126)
* Add I2CManager to coordinate I2C shared parameters.
* Add use of I2CManager, and experimental scrolling strategies.
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
* Scrolling updates
New scrolling capability by defining SCROLLMODE in Config.h to 0 (original), 1 (by page) or 2 (by line). If not defined, defaults to 0.
Reformat.
* Add I2CManager calls. Remove unnecessary delays.
* Add I2CManager calls, remove unnecessary I2C delays.
* SSD1306: Move methods from .h to .cpp and reformat.
* Fix compiler warning in LiquidCrystal_I2C
* Allow forcing of I2C clock speed.
New method forceClock allows the I2C speed to be overridden. For example, if the I2C bus is long then the speed can be forced lower. It can also be forced higher to gain performance if devices are capable.
* Make Config.h conditionally included.
Allow for non-existence of Config.h.
* Correct scrolling and allow longer messages
Correct the handling of scrolling in scrollmode 1 to avoid a blank page being displayed. Also, allow MAX_MSG_SIZE to be optionally configured to override maximum message length on screens.
* compiler warning on uno
Co-authored-by: dexslab <dex35803@gmail.com>
Co-authored-by: Asbelos <asbelos@btinternet.com>
Co-authored-by: Harald Barth <haba@kth.se>
Co-authored-by: Neil McKechnie <neilmck999@gmail.com>
Co-authored-by: Neil McKechnie <75813993+Neil-McK@users.noreply.github.com>
2021-03-07 21:58:35 +01:00
|
|
|
connected=false;
|
2023-10-23 15:28:25 +02:00
|
|
|
#if defined(STM32_ETHERNET)
|
|
|
|
// Set a HOSTNAME for the DHCP request - a nice to have, but hard it seems on LWIP for STM32
|
|
|
|
// The default is "lwip", which is **always** set in STM32Ethernet/src/utility/ethernetif.cpp
|
|
|
|
// for some reason. One can edit it to instead read:
|
|
|
|
// #if LWIP_NETIF_HOSTNAME
|
|
|
|
// /* Initialize interface hostname */
|
|
|
|
// if (netif->hostname == NULL)
|
|
|
|
// netif->hostname = "lwip";
|
|
|
|
// #endif /* LWIP_NETIF_HOSTNAME */
|
|
|
|
// Which seems more useful! We should propose the patch... so the following line actually works!
|
|
|
|
netif_set_hostname(&gnetif, WIFI_HOSTNAME); // Should probably be passed in the contructor...
|
|
|
|
#ifdef IP_ADDRESS
|
2024-01-10 15:09:22 +01:00
|
|
|
Ethernet.begin(myIP);
|
2023-10-23 15:28:25 +02:00
|
|
|
#else
|
|
|
|
if (Ethernet.begin() == 0)
|
|
|
|
{
|
|
|
|
DIAG(F("Ethernet.begin FAILED"));
|
|
|
|
return;
|
|
|
|
}
|
2024-01-10 15:09:22 +01:00
|
|
|
#endif // IP_ADDRESS
|
2023-10-23 15:28:25 +02:00
|
|
|
#else // All other architectures
|
|
|
|
byte mac[6]= { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
|
|
|
|
DIAG(F("Ethernet attempting to get MAC address"));
|
|
|
|
DCCTimer::getSimulatedMacAddress(mac);
|
|
|
|
DIAG(F("Ethernet got MAC address"));
|
|
|
|
#ifdef IP_ADDRESS
|
2024-01-10 15:09:22 +01:00
|
|
|
Ethernet.begin(mac, myIP);
|
2024-01-09 00:08:21 +01:00
|
|
|
#else
|
2020-10-30 14:00:02 +01:00
|
|
|
if (Ethernet.begin(mac) == 0)
|
2020-09-26 13:01:00 +02:00
|
|
|
{
|
2021-03-25 15:23:38 +01:00
|
|
|
DIAG(F("Ethernet.begin FAILED"));
|
2020-10-30 14:00:02 +01:00
|
|
|
return;
|
2024-01-10 15:09:22 +01:00
|
|
|
}
|
|
|
|
#endif // IP_ADDRESS
|
2022-11-04 16:08:43 +01:00
|
|
|
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
|
2022-11-06 21:32:54 +01:00
|
|
|
DIAG(F("Ethernet shield not found or W5100"));
|
2020-11-05 11:54:16 +01:00
|
|
|
}
|
2024-01-10 16:29:21 +01:00
|
|
|
#endif // STM32_ETHERNET
|
2023-10-23 15:28:25 +02:00
|
|
|
|
|
|
|
uint32_t startmilli = millis();
|
2022-11-04 16:08:43 +01:00
|
|
|
while ((millis() - startmilli) < 5500) { // Loop to give time to check for cable connection
|
2021-06-11 01:02:20 +02:00
|
|
|
if (Ethernet.linkStatus() == LinkON)
|
|
|
|
break;
|
|
|
|
DIAG(F("Ethernet waiting for link (1sec) "));
|
|
|
|
delay(1000);
|
|
|
|
}
|
2022-11-04 16:08:43 +01:00
|
|
|
// now we either do have link of we have a W5100
|
|
|
|
// where we do not know if we have link. That's
|
|
|
|
// the reason to now run checkLink.
|
|
|
|
// CheckLinks sets up outboundRing if it does
|
|
|
|
// not exist yet as well.
|
|
|
|
checkLink();
|
|
|
|
}
|
2021-06-11 01:02:20 +02:00
|
|
|
|
2022-11-04 16:08:43 +01:00
|
|
|
/**
|
|
|
|
* @brief Cleanup any resources
|
|
|
|
*
|
|
|
|
* @return none
|
|
|
|
*/
|
|
|
|
EthernetInterface::~EthernetInterface() {
|
|
|
|
delete server;
|
|
|
|
delete outboundRing;
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2020-10-30 14:00:02 +01:00
|
|
|
* @brief Main loop for the EthernetInterface
|
2020-09-26 13:01:00 +02:00
|
|
|
*
|
|
|
|
*/
|
2020-10-30 14:00:02 +01:00
|
|
|
void EthernetInterface::loop()
|
2020-09-26 13:01:00 +02:00
|
|
|
{
|
2022-11-04 16:08:43 +01:00
|
|
|
if (!singleton || (!singleton->checkLink()))
|
|
|
|
return;
|
2020-10-30 14:00:02 +01:00
|
|
|
|
2022-11-04 16:08:43 +01:00
|
|
|
switch (Ethernet.maintain()) {
|
2020-10-30 14:00:02 +01:00
|
|
|
case 1:
|
|
|
|
//renewed fail
|
2021-03-25 15:23:38 +01:00
|
|
|
DIAG(F("Ethernet Error: renewed fail"));
|
2020-10-30 14:00:02 +01:00
|
|
|
singleton=NULL;
|
|
|
|
return;
|
|
|
|
case 3:
|
|
|
|
//rebind fail
|
2021-03-25 15:23:38 +01:00
|
|
|
DIAG(F("Ethernet Error: rebind fail"));
|
2020-10-30 14:00:02 +01:00
|
|
|
singleton=NULL;
|
|
|
|
return;
|
|
|
|
default:
|
|
|
|
//nothing happened
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
singleton->loop2();
|
2022-11-04 16:08:43 +01:00
|
|
|
}
|
2020-09-26 13:01:00 +02:00
|
|
|
|
2022-11-04 16:08:43 +01:00
|
|
|
/**
|
|
|
|
* @brief Checks ethernet link cable status and detects when it connects / disconnects
|
|
|
|
*
|
|
|
|
* @return true when cable is connected, false otherwise
|
|
|
|
*/
|
|
|
|
bool EthernetInterface::checkLink() {
|
|
|
|
if (Ethernet.linkStatus() != LinkOFF) { // check for not linkOFF instead of linkON as the W5100 does return LinkUnknown
|
|
|
|
//if we are not connected yet, setup a new server
|
|
|
|
if(!connected) {
|
|
|
|
DIAG(F("Ethernet cable connected"));
|
|
|
|
connected=true;
|
2022-12-04 20:09:14 +01:00
|
|
|
#ifdef IP_ADDRESS
|
2024-01-10 16:29:21 +01:00
|
|
|
#ifndef STM32_ETHERNET
|
2024-01-10 15:09:22 +01:00
|
|
|
Ethernet.setLocalIP(myIP); // for static IP, set it again
|
2022-12-04 20:09:14 +01:00
|
|
|
#endif
|
2024-01-10 16:29:21 +01:00
|
|
|
#endif
|
2022-11-04 16:08:43 +01:00
|
|
|
server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
|
|
|
|
server->begin();
|
2024-02-01 11:15:08 +01:00
|
|
|
IPAddress ip = Ethernet.localIP(); // look what IP was obtained (dynamic or static)
|
|
|
|
if (ip[0] == 0)
|
|
|
|
LCD(4,F("Awaiting DHCP..."));
|
|
|
|
while (ip[0] == 0) { // wait until we are given an IP address from the DHCP server
|
|
|
|
ip = Ethernet.localIP(); // look what IP was obtained (dynamic or static)
|
|
|
|
}
|
2024-02-05 06:23:56 +01:00
|
|
|
if (MAX_MSG_SIZE < 20) {
|
|
|
|
LCD(4,F("%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
|
|
|
|
LCD(5,F("Port:%d Eth"), IP_PORT);
|
|
|
|
} else {
|
|
|
|
LCD(4,F("Ethernet UP"));
|
|
|
|
LCD(5,F("%d.%d.%d.%d:%d"), ip[0], ip[1], ip[2], ip[3], IP_PORT);
|
|
|
|
}
|
2024-02-01 12:22:32 +01:00
|
|
|
mdns.begin(Ethernet.localIP(), WIFI_HOSTNAME); // hostname
|
|
|
|
mdns.addServiceRecord(WIFI_HOSTNAME "._withrottle", IP_PORT, MDNSServiceTCP);
|
2022-11-04 16:08:43 +01:00
|
|
|
// only create a outboundRing it none exists, this may happen if the cable
|
|
|
|
// gets disconnected and connected again
|
|
|
|
if(!outboundRing)
|
2024-02-01 11:15:08 +01:00
|
|
|
outboundRing=new RingStream(OUTBOUND_RING_SIZE);
|
2022-11-04 16:08:43 +01:00
|
|
|
}
|
|
|
|
return true;
|
2024-02-01 11:15:08 +01:00
|
|
|
} else { // LinkOFF
|
2024-02-01 12:22:32 +01:00
|
|
|
if (connected) { // Were connected, but no longer without a LINK!
|
2024-02-01 11:15:08 +01:00
|
|
|
DIAG(F("Ethernet cable disconnected"));
|
|
|
|
connected=false;
|
|
|
|
//clean up any client
|
|
|
|
for (byte socket = 0; socket < MAX_SOCK_NUM; socket++) {
|
|
|
|
if(clients[socket].connected())
|
|
|
|
clients[socket].stop();
|
|
|
|
}
|
2024-02-01 12:22:32 +01:00
|
|
|
mdns.removeServiceRecord(IP_PORT, MDNSServiceTCP);
|
2024-02-01 11:15:08 +01:00
|
|
|
// tear down server
|
|
|
|
delete server;
|
|
|
|
server = nullptr;
|
2024-02-05 06:23:56 +01:00
|
|
|
LCD(4,F("Ethernet DOWN"));
|
|
|
|
LCD(5,F(" "));
|
2022-11-04 16:08:43 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
|
|
|
|
2022-11-04 16:08:43 +01:00
|
|
|
void EthernetInterface::loop2() {
|
2022-11-07 11:53:56 +01:00
|
|
|
if (!outboundRing) { // no idea to call loop2() if we can't handle outgoing data in it
|
|
|
|
if (Diag::ETHERNET) DIAG(F("No outboundRing"));
|
|
|
|
return;
|
|
|
|
}
|
2020-09-26 13:01:00 +02:00
|
|
|
// get client from the server
|
2023-10-23 15:28:25 +02:00
|
|
|
#if defined (STM32_ETHERNET)
|
|
|
|
// STM32Ethernet doesn't use accept(), just available()
|
|
|
|
EthernetClient client = server->available();
|
|
|
|
#else
|
2020-10-30 14:00:02 +01:00
|
|
|
EthernetClient client = server->accept();
|
2023-10-23 15:28:25 +02:00
|
|
|
#endif
|
2020-09-26 13:01:00 +02:00
|
|
|
// check for new client
|
|
|
|
if (client)
|
|
|
|
{
|
2020-11-05 11:54:16 +01:00
|
|
|
byte socket;
|
2024-01-27 21:12:09 +01:00
|
|
|
bool sockfound = false;
|
|
|
|
for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
|
|
|
|
if (clients[socket] && (clients[socket] == client)) {
|
|
|
|
sockfound = true;
|
|
|
|
if (Diag::ETHERNET) DIAG(F("Ethernet: Old client socket %d"),socket);
|
|
|
|
break;
|
2023-10-23 15:28:25 +02:00
|
|
|
}
|
2024-01-27 21:12:09 +01:00
|
|
|
}
|
|
|
|
if (!sockfound) { // new client
|
|
|
|
for (socket = 0; socket < MAX_SOCK_NUM; socket++) {
|
|
|
|
if (!clients[socket]) {
|
|
|
|
// On accept() the EthernetServer doesn't track the client anymore
|
|
|
|
// so we store it in our client array
|
|
|
|
clients[socket] = client;
|
|
|
|
if (Diag::ETHERNET) DIAG(F("Ethernet: New client socket %d"),socket);
|
|
|
|
break;
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
2024-01-27 21:12:09 +01:00
|
|
|
}
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
2021-03-25 15:23:38 +01:00
|
|
|
if (socket==MAX_SOCK_NUM) DIAG(F("new Ethernet OVERFLOW"));
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// check for incoming data from all possible clients
|
2020-10-30 14:00:02 +01:00
|
|
|
for (byte socket = 0; socket < MAX_SOCK_NUM; socket++)
|
2020-09-26 13:01:00 +02:00
|
|
|
{
|
2024-01-27 21:29:25 +01:00
|
|
|
if (clients[socket]) {
|
|
|
|
if (!clients[socket].connected()) { // stop any clients which disconnect
|
|
|
|
CommandDistributor::forget(socket);
|
|
|
|
clients[socket].stop();
|
2024-01-28 05:31:43 +01:00
|
|
|
#if defined(ARDUINO_ARCH_AVR)
|
2024-01-28 01:47:05 +01:00
|
|
|
clients[socket]=NULL;
|
2024-01-28 05:31:43 +01:00
|
|
|
#else
|
|
|
|
clients[socket]=(EthernetClient)nullptr;
|
|
|
|
#endif
|
2024-01-27 21:29:25 +01:00
|
|
|
//if (Diag::ETHERNET)
|
|
|
|
DIAG(F("Ethernet: disconnect %d "), socket);
|
2024-01-28 01:47:05 +01:00
|
|
|
return; // Trick: So that we do not continue in this loop with client that is NULL
|
2024-01-27 21:29:25 +01:00
|
|
|
}
|
2020-10-30 14:00:02 +01:00
|
|
|
|
2024-01-27 21:29:25 +01:00
|
|
|
int available=clients[socket].available();
|
|
|
|
if (available > 0) {
|
|
|
|
if (Diag::ETHERNET) DIAG(F("Ethernet: available socket=%d,avail=%d"), socket, available);
|
|
|
|
// read bytes from a client
|
|
|
|
int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
|
|
|
|
buffer[count] = '\0'; // terminate the string properly
|
|
|
|
if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer);
|
|
|
|
// execute with data going directly back
|
|
|
|
CommandDistributor::parse(socket,buffer,outboundRing);
|
|
|
|
return; // limit the amount of processing that takes place within 1 loop() cycle.
|
|
|
|
}
|
|
|
|
}
|
2020-11-05 11:54:16 +01:00
|
|
|
}
|
2022-08-06 00:34:35 +02:00
|
|
|
|
2024-01-28 05:31:43 +01:00
|
|
|
mdns.run();
|
|
|
|
|
2022-08-06 00:34:35 +02:00
|
|
|
WiThrottle::loop(outboundRing);
|
2020-11-05 11:54:16 +01:00
|
|
|
|
2020-10-30 14:00:02 +01:00
|
|
|
// handle at most 1 outbound transmission
|
|
|
|
int socketOut=outboundRing->read();
|
2022-11-07 11:53:56 +01:00
|
|
|
if (socketOut >= MAX_SOCK_NUM) {
|
|
|
|
DIAG(F("Ethernet outboundRing socket=%d error"), socketOut);
|
|
|
|
} else if (socketOut >= 0) {
|
2020-10-30 14:00:02 +01:00
|
|
|
int count=outboundRing->count();
|
2021-03-25 15:23:38 +01:00
|
|
|
if (Diag::ETHERNET) DIAG(F("Ethernet reply socket=%d, count=:%d"), socketOut,count);
|
2020-10-30 14:00:02 +01:00
|
|
|
for(;count>0;count--) clients[socketOut].write(outboundRing->read());
|
|
|
|
clients[socketOut].flush(); //maybe
|
2020-09-26 13:01:00 +02:00
|
|
|
}
|
2020-11-29 10:48:39 +01:00
|
|
|
}
|
|
|
|
#endif
|