From 0c57666e05655f382addb00c574796d3c1f110c4 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Wed, 5 Oct 2022 09:03:47 +0100 Subject: Changed version to 3.4.3 --- src/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index 0aec94ab..bfb084f2 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.3rc1" +# define MAIN_VERSION "3.4.3" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else -- cgit v1.2.3 From bcbb99337daa737218ce16b651e8f3a6dbffafe8 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Thu, 6 Oct 2022 12:32:32 +0100 Subject: Fix report of spurious driver 6 when using a MB6HC or 6XD as expansion --- src/CAN/CommandProcessor.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/CAN/CommandProcessor.cpp b/src/CAN/CommandProcessor.cpp index a430d366..545cc677 100644 --- a/src/CAN/CommandProcessor.cpp +++ b/src/CAN/CommandProcessor.cpp @@ -353,14 +353,17 @@ static GCodeResult EutGetInfo(const CanMessageReturnInfo& msg, const StringRef& extra = LastDiagnosticsPart; { const size_t driver = msg.type - (CanMessageReturnInfo::typeDiagnosticsPart0 + 1); - reply.lcatf("Driver %u: position %" PRIi32 ", %.1f steps/mm" + if (driver < NumDirectDrivers) // we have up to 7 drivers on the Duet 3 Mini but only 6 on the 6HC and 6XD + { + reply.lcatf("Driver %u: position %" PRIi32 ", %.1f steps/mm" #if HAS_SMART_DRIVERS - "," + "," #endif - , driver, reprap.GetMove().GetEndPoint(driver), (double)reprap.GetPlatform().DriveStepsPerUnit(driver)); + , driver, reprap.GetMove().GetEndPoint(driver), (double)reprap.GetPlatform().DriveStepsPerUnit(driver)); #if HAS_SMART_DRIVERS - SmartDrivers::AppendDriverStatus(driver, reply); + SmartDrivers::AppendDriverStatus(driver, reply); #endif + } } break; -- cgit v1.2.3 From 15225e47b827c0752d35e4abef7cd751f8941217 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Thu, 6 Oct 2022 14:09:54 +0100 Subject: Increase wifi timeout to avoid errors when FTP+Telnet enabled --- src/Networking/ESP8266WiFi/WiFiInterface.cpp | 2 +- src/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Networking/ESP8266WiFi/WiFiInterface.cpp b/src/Networking/ESP8266WiFi/WiFiInterface.cpp index e978e071..67eae626 100644 --- a/src/Networking/ESP8266WiFi/WiFiInterface.cpp +++ b/src/Networking/ESP8266WiFi/WiFiInterface.cpp @@ -88,7 +88,7 @@ constexpr IRQn ESP_SPI_IRQn = WiFiSpiSercomIRQn; #endif const uint32_t WiFiSlowResponseTimeoutMillis = 500; // SPI timeout when when the ESP has to access the SPIFFS filesytem; highest measured is 234ms. -const uint32_t WiFiFastResponseTimeoutMillis = 20; // SPI timeout when when the ESP does not have to access SPIFFS filesystem. +const uint32_t WiFiFastResponseTimeoutMillis = 100; // SPI timeout when when the ESP does not have to access SPIFFS filesystem. 20ms is too short on Duet 2 with both FTP and Telnet enabled. const uint32_t WiFiWaitReadyMillis = 100; const uint32_t WiFiStartupMillis = 15000; // Formatting the SPIFFS partition can take up to 10s. const uint32_t WiFiStableMillis = 100; diff --git a/src/Version.h b/src/Version.h index bfb084f2..763cdb84 100644 --- a/src/Version.h +++ b/src/Version.h @@ -10,7 +10,7 @@ #ifndef VERSION // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it. -# define MAIN_VERSION "3.4.3" +# define MAIN_VERSION "3.4.3+" # ifdef USE_CAN0 # define VERSION_SUFFIX "(CAN0)" # else -- cgit v1.2.3