1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-03-15 18:43:06 +01:00

Compare commits

..

No commits in common. "519cabffb6192cc2a748ffcbaa63f69d1e39d082" and "6b0dc272ea8f8191ba7e3fd20c1f835b975bb699" have entirely different histories.

4 changed files with 5 additions and 26 deletions

View File

@ -1 +1 @@
#define GITHUB_SHA "devel-more-ether-202412052105Z"
#define GITHUB_SHA "devel-202411041626Z"

View File

@ -20,10 +20,6 @@
//
// Rewrite of the STM32lwipopts.h file from STM
// To be copied into where lwipopts_default.h resides
// typically into STM32Ethernet/src/STM32lwipopts.h
// or STM32Ethernet\src\STM32lwipopts.h
// search for `lwipopts_default.h` and copy this file into the
// same directory but name it STM32lwipopts.h
//
#ifndef __STM32LWIPOPTS_H__
#define __STM32LWIPOPTS_H__
@ -33,15 +29,7 @@
// we can not include our "defines.h" here
// so we need to duplicate that define
#define MAX_NUM_TCP_CLIENTS_HERE 9
#ifdef MAX_NUM_TCP_CLIENTS
#if MAX_NUM_TCP_CLIENTS != MAX_NUM_TCP_CLIENTS_HERE
#error MAX_NUM_TCP_CLIENTS and MAX_NUM_TCP_CLIENTS_HERE must be same
#endif
#else
#define MAX_NUM_TCP_CLIENTS MAX_NUM_TCP_CLIENTS_HERE
#endif
#define MAX_NUM_TCP_CLIENTS 20
// increase ARP cache
#undef MEMP_NUM_APR_QUEUE

View File

@ -140,10 +140,7 @@ The configuration file for DCC-EX Command Station
/////////////////////////////////////////////////////////////////////////////////////
//
// MAX_NUM_TCP_CLIENTS: If you on STM32 Ethernet (and only there) want more than
// 9 (*) TCP clients, change this number to for example 20 here **AND** in
// STM32lwiopts.h and follow the instructions in STM32lwiopts.h
//
// (*) It would be 10 if there would not be a bug in LwIP by STM32duino.
// 10 TCP clients, enable this here **AND** follow the instructions in STM32lwiopts.h
//
//#define MAX_NUM_TCP_CLIENTS 20

View File

@ -240,15 +240,9 @@
#endif
#if defined(ARDUINO_ARCH_STM32)
// The LwIP library for the STM32 wired ethernet has by default 10 TCP
// clients defined but because of a bug in the library #11 is not
// rejected but kicks out any old connection. By restricting our limit
// to 9 the #10 will be rejected by our code so that the number can
// never get to 11 which would kick an existing connection.
// If you want to change this value, do that in
// config.h AND in STM32lwipopts.h.
// Allow override of MAX_NUM_TCP_CLIENTS but default is 10
#ifndef MAX_NUM_TCP_CLIENTS
#define MAX_NUM_TCP_CLIENTS 9
#define MAX_NUM_TCP_CLIENTS 10
#endif
#else
#if defined(ARDUINO_ARCH_ESP32)