diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-03-06 12:23:38 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-03-06 12:23:38 +0300 |
| commit | 34d3b9a054aec83c1dff2f73ef9512545eb305a0 (patch) | |
| tree | 9260773ec740d9b6686edef951d9c57db4c3e1a1 /src/Networking | |
| parent | d57f9776902f6bd64405a757f11c95e43b890171 (diff) | |
Work on asynchronous moves and Duet 3
Renamed old Duet3 configuration (for version 0.3 hardware) to Duet3_V03
Added Duet3_V05 configuration
Added SUPPORT_ASYNC_MOVES macro setting
Reworked babystepping code to support live babystepping using async moves if supported. Async move support is incomplete, so babystepping will not work in this build if SUPPORT_ASYNC_MOVES is enabled.
Allow endstop corrections to be applied to all towers on a delta
Diffstat (limited to 'src/Networking')
| -rw-r--r-- | src/Networking/ESP8266WiFi/WiFiInterface.cpp | 2 | ||||
| -rw-r--r-- | src/Networking/Network.cpp | 4 | ||||
| -rw-r--r-- | src/Networking/Network.h | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index cc780507..e6337e8e 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -33,7 +33,7 @@ static_assert(SsidLength == SsidBufferLength, "SSID lengths in NetworkDefs.h and # define ESP_SPI_IRQn SPI_IRQn # define ESP_SPI_HANDLER SPI_Handler -#elif defined(DUET3) || defined(SAME70XPLD) +#elif defined(DUET3_V03) || defined(SAME70XPLD) # define USE_PDC 0 // use peripheral DMA controller # define USE_DMAC 0 // use general DMA controller diff --git a/src/Networking/Network.cpp b/src/Networking/Network.cpp index 28d20846..6f3557d5 100644 --- a/src/Networking/Network.cpp +++ b/src/Networking/Network.cpp @@ -51,9 +51,11 @@ static Task<NetworkStackWords> networkTask; Network::Network(Platform& p) : platform(p), responders(nullptr), nextResponderToPoll(nullptr) { -#if defined(DUET3) || defined(SAME70XPLD) +#if defined(DUET3_V03) || defined(SAME70XPLD) interfaces[0] = new LwipEthernetInterface(p); interfaces[1] = new WiFiInterface(p); +#elif defined(DUET3_V05) + interfaces[0] = new LwipEthernetInterface(p); #elif defined(DUET_NG) interfaces[0] = nullptr; // we set this up in Init() #elif defined(DUET_M) diff --git a/src/Networking/Network.h b/src/Networking/Network.h index 8bf0e76d..0f49be37 100644 --- a/src/Networking/Network.h +++ b/src/Networking/Network.h @@ -15,19 +15,19 @@ #include "RTOSIface/RTOSIface.h" #include "ObjectModel/ObjectModel.h" -#if defined(DUET3) || defined(SAME70XPLD) +#if defined(DUET3_V03) || defined(SAME70XPLD) const size_t NumNetworkInterfaces = 2; -#elif defined(DUET_NG) || defined(DUET_M) || defined(__LPC17xx__) +#elif defined(DUET3_V05) || defined(DUET_NG) || defined(DUET_M) || defined(__LPC17xx__) const size_t NumNetworkInterfaces = 1; #else # error Wrong Network.h file included #endif #if defined(__LPC17xx__) -// Only 1 http responder as we are tight on memory . -const size_t NumHttpResponders = 2; // the number of concurrent HTTP requests we can process -const size_t NumFtpResponders = 0; // the number of concurrent FTP sessions we support -const size_t NumTelnetResponders = 0; // the number of concurrent Telnet sessions we support +// Only 2 http responders as we are tight on memory . +const size_t NumHttpResponders = 2; // the number of concurrent HTTP requests we can process +const size_t NumFtpResponders = 0; // the number of concurrent FTP sessions we support +const size_t NumTelnetResponders = 0; // the number of concurrent Telnet sessions we support #else const size_t NumHttpResponders = 4; // the number of concurrent HTTP requests we can process const size_t NumFtpResponders = 1; // the number of concurrent FTP sessions we support |