Merge remote-tracking branch 'dc42/dev' into v2-dev-lpc

Author: sdavi

.cproject

@@ -49,6 +49,8 @@ RepRapFirmware is built from several Github projects. You need to use compatible
 
 14. Build CoreNG first, also build FreeRTOS and RRFLibraries if needed. Then clean and build RepRapFirmware (the clean step is needed to make Eclipse notice that the output library files in the other projects have been built). The Duet WiFi and Duet Ethernet builds of RRF use the SAM4E_RTOS builds of CoreNG and RRFLibraries and the SAM4E build of FreeRTOS. The Duet Maestro uses the SAM4S_RTOS build of CoreNG and RRFLibraries, and the SAM4S build of FreeRTOS. The Duet085 build of RRF (which also runs on the Duet06) uses the SAM3X build of CoreNG and RRFLibraries. The RADDS build of RRF uses the RADDS_RTOS build of CoreNG and the SAM3X_RTOS build of RRFLibraries.
 
+Note: you do not need to build the DuetWiFiSocketServer project, but it does need to be in the workspace because the RepRapFirmware project uses one of its include fies.
+
 **Instructions for building under macOS**
 
 Using Homebrew-Cask makes it very easy to install new software on macOS: https://caskroom.github.io/
@@ -64,3 +66,8 @@ Using Homebrew-Cask makes it very easy to install new software on macOS: https:/
 6. The build depends on the Eclipse workspace variable 'ArmGccPath" being set to the directory where your arm-none-eabi-g++ compiler resides. To set it, go to Windows -> Preferences -> C/C++ -> Build -> Build Variables and click "Add..."
 
 7. Build CoreNG, FreeRTOS and RRFLibraries first, then RepRapFirmware. See the instructions for Windows (above) for the configurations needed.
+
+**Building under Debian Linux**
+
+See this forum post https://forum.duet3d.com/topic/11703/building-reprap-firmware-on-debian-buster
+

BuildInstructions.md

@@ -1,30 +1,48 @@
 Summary of important changes in recent versions
 ===============================================
 
-Version 2.04RC1
-============
+Version 2.04
+===============
 Compatible files:
 - DuetWiFiServer 1.23
-- DuetWebControl 1.22.6 or 2.0.0-RC6 or 2.0.0-RC7
+- DuetWebControl 2.0.4 (recommended) or 1.22.6
 
 Upgrade notes:
+- If using this release to control a laser cutter/engraver, see the notes below on changed handling of the G1 S parameter
+- If you are using a simple microswitch as a filament monitor, you may need to add a pullup resistor (see below)
 - The P parameter of the G29 S0 (or plain G29) command has been withdrawn. See below under "changed behaviour".
 
 Feature improvements/changed behaviour:
+- File uploads are now done to temporary files that are renamed when the upload succeeds; so that if an upload fails, an original file with the same name is not lost (thanks wilriker)
+- HTTP reply buffers now time out 8 seconds after they are allocated. This may resolve the out-of-buffer issues that some users experience.
+- In the resurrect.g file, the current tool is now selected (without running tool change files) before resurrect-prologue is called, so that resurrect-prologue can do extrusion commands after first doing M116 to wait for temperatures. After running resurrect-prologue.g, the tool is deselected (without running tfree#.g), then reselected this time running tpre#.g and tpost#.g.
+- Pullup resistors are no longer enabled on endstop inputs used to connect filament monitors when they are configured using M591. This is to increase noise immunity when running Duet3D or other active filament monitors. If you are using a simple microswitch connected between STP and GND of an endstop input, you might need to add an external pullup resistor between STP and +3.3V, especially when using the endstop inputs on the CONN_LCD connector.
+- The new status information provided by Duet3D magnetic filament monitors with version 3 firmware is now supported
+- Estimated print time and filament usage comments written by KISSLicer 2 alpha are recognised
+- mDNS is now supported on the Duet Ethernet and Duet Maestro
+- In Laser mode, if sticky laser power mode is selected, the power set by the S parameter in a G1 command is remembered across G0 moves to the next G1 move
+- CRC checking of uploaded file data is now supported (requires DWC 2.0.4)
+- When an error occurs reading or writing SD card data, the number of retries is increased to 5 and the delay between retries increases with each retry
+- Increased minimum motor current for open load warnings from 300 to 500mA
+- When writing the resurrect.g file, the active tool is selected before calling resurrect-prologue.g. This is to allow extrusion to be done in resurrect-prologue.g.
 - The P parameter of the G29 S0 (or plain G29) command has been withdrawn, because it didn't work when deployprobe.g and retractprobe.g files were used and wasn't easy to fix without wasting memory. A new subfunction G29 S3 P"name.csv" has been added to facilitate saving the height map file under a different name. It behaves the same as M374 P"name.csv".
 - M118 now appends '\n' to the message text except when the destination is http
 - G31 with no parameters now reports the G31 parameters of the current Z probe as well as the current reading
 - Support for pulse-generating filament sensors has been improved for the case that the sensor produces a high number of pulses per mm of filament movement
+- The M115 P parameter is now only supported in firmware builds that support more than one board variant, and only from within config.g during startup
+- If the SD card annote be mounted because no FAT filesystem was found, an explicit error messsge to this effect is provided instead of an error code
 
 Bug fixes:
+- Fixed G30 commands when the M208 minimum Z position is much less than zero
+- Attempts to use file paths that are too long to store internally are now handled better
+- M675 did not take workplace coordinate offsets into account
+- Duet WiFi/Ethernet + DueX configurations did not start up if noise was present on the DueX endstop or GPIO inputs
+- The SHA1 hash reported by M38 sometimes had one or more zero digits missing
 - When auto delta calibration adjusted the delta radius and/or the diagonal rod length, it made an incorrect adjustment to the homed height
-- On a delta printer, if multiple rod lengths are specified in the M665 command and the first 3 rod lengths were not equal to each other, this resulted in incorrect motion
+- On a delta printer, if multiple rod lengths were specified in the M665 command and the first 3 rod lengths were not equal to each other, this resulted in incorrect motion
 - M557 with a P parameter but no XY or R parameters now reports an error
 - Attempts to jog axes 0.05mm beyond the limits set by M208 alternately succeeded/returned the axis to the limit
 
-Internal changes:
-- Changes for compatibility with latest versions of CoreNG and RRFLibraries projects
-
 Version 2.03
 ============
 Compatible files:

WHATS_NEW.md

@@ -52,8 +52,6 @@ constexpr float DefaultMinFeedrate = 0.5;				// The minimum movement speed (extr
 constexpr float DefaultAxisMinimum = 0.0;
 constexpr float DefaultAxisMaximum = 200.0;
 
-constexpr float MinimumOpenLoadMotorCurrent = 300;		// minimum current in mA for the open load status to be taken seriously
-
 // Timeouts
 constexpr uint32_t FanCheckInterval = 500;				// Milliseconds
 constexpr uint32_t OpenLoadTimeout = 500;				// Milliseconds
@@ -84,15 +82,13 @@ constexpr float HOT_ENOUGH_TO_RETRACT = 90.0;			// Celsius
 
 constexpr unsigned int MaxBadTemperatureCount = 2000/HeatSampleIntervalMillis;	// Number of bad temperature samples permitted before a heater fault is reported (2 seconds)
 constexpr float BadLowTemperature = -10.0;				// Celsius
-constexpr float DefaultExtruderTemperatureLimit = 290.0; // Celsius - E3D say to tighten the hot end at 285C
+constexpr float DefaultHotEndTemperatureLimit = 290.0;	// Celsius - E3D say to tighten the hot end at 285C
 constexpr float DefaultBedTemperatureLimit = 125.0;		// Celsius
-constexpr float HotEndFanTemperature = 45.0;			// Temperature at which a thermostatic hot end fan comes on
+constexpr float DefaultHotEndFanTemperature = 45.0;		// Temperature at which a thermostatic hot end fan comes on
 constexpr float ThermostatHysteresis = 1.0;				// How much hysteresis we use to prevent noise turning fans on/off too often
 constexpr float BadErrorTemperature = 2000.0;			// Must exceed any reasonable temperature limit including DEFAULT_TEMPERATURE_LIMIT
 constexpr uint32_t DefaultHeaterFaultTimeout = 10 * 60 * 1000;	// How long we wait (in milliseconds) for user intervention after a heater fault before shutting down
 
-constexpr PwmFrequency MaxHeaterPwmFrequency = 1000;	// maximum supported heater PWM frequency, to avoid overheating the mosfets
-
 // Heating model default parameters. For the chamber heater, we use the same values as for the bed heater.
 // These parameters are about right for an E3Dv6 hot end with 30W heater.
 constexpr float DefaultHotEndHeaterGain = 340.0;
@@ -162,10 +158,13 @@ constexpr unsigned int FirstTmcDriversSenseChannel = 1001; // Sensors 1001..1002
 constexpr unsigned int NumTmcDriversSenseChannels = 2;	// Sensors 1001..1002 are the TMC2660 driver temperature sense
 
 // PWM frequencies
-constexpr unsigned int SlowHeaterPwmFreq = 10;			// slow PWM frequency for bed and chamber heaters, compatible with DC/AC SSRs
-constexpr unsigned int NormalHeaterPwmFreq = 250;		// normal PWM frequency used for hot ends
+constexpr PwmFrequency SlowHeaterPwmFreq = 10;			// slow PWM frequency for bed and chamber heaters, compatible with DC/AC SSRs
+constexpr PwmFrequency NormalHeaterPwmFreq = 250;		// normal PWM frequency used for hot ends
+constexpr PwmFrequency MaxHeaterPwmFrequency = 1000;	// maximum supported heater PWM frequency, to avoid overheating the mosfets
+
 constexpr PwmFrequency DefaultFanPwmFreq = 250;			// increase to 25kHz using M106 command to meet Intel 4-wire PWM fan specification
-constexpr unsigned int DefaultPinWritePwmFreq = 500;	// default PWM frequency for M42 pin writes and extrusion ancillary PWM
+constexpr PwmFrequency DefaultPinWritePwmFreq = 500;	// default PWM frequency for M42 pin writes and extrusion ancillary PWM
+constexpr PwmFrequency ServoRefreshFrequency = 50;
 
 // Default Z probe values
 
@@ -207,8 +206,8 @@ static_assert(MaxCalibrationPoints <= MaxProbePoints, "MaxCalibrationPoints must
 
 // SD card
 constexpr uint32_t SdCardDetectDebounceMillis = 200;	// How long we give the SD card to settle in the socket
-constexpr unsigned int MaxSdCardTries = 3;				// Number of read or write attempts before giving up
-constexpr uint32_t SdCardRetryDelay = 30;				// Number of milliseconds delay between SD transfer retries. Looks like 10ms may be too low.
+constexpr unsigned int MaxSdCardTries = 5;				// Number of read or write attempts before giving up
+constexpr uint32_t SdCardRetryDelay = 20;				// Number of milliseconds delay between SD transfer retries. We now double for each retry.
 
 // Z probing
 constexpr float DefaultZDive = 5.0;						// Millimetres
@@ -357,6 +356,7 @@ constexpr size_t FILE_BUFFER_SIZE = 128;
 #define SCANS_DIRECTORY "0:/scans/"					// Directory for uploaded 3D scans
 #define FILAMENTS_DIRECTORY "0:/filaments/"			// Directory for filament configurations
 #define MENU_DIR "0:/menu/"							// Directory for menu files
+#define UPLOAD_EXTENSION ".part"					// Extension to a filename for a file being uploaded
 
 #define CONFIG_FILE "config.g"
 #define CONFIG_BACKUP_FILE "config.g.bak"

src/Configuration.h

@@ -32,7 +32,6 @@ const size_t NumFirmwareUpdateModules = 4;		// 3 modules, plus one for manual up
 #define SUPPORT_OBJECT_MODEL	1
 #define SUPPORT_FTP				1
 #define SUPPORT_TELNET			1
-#define SUPPORT_ASYNC_MOVES		1
 
 #define USE_CACHE				0					// Cache controller disabled for now
 

src/Duet3_V03/Pins_Duet3_V03.h

@@ -31,7 +31,6 @@ const size_t NumFirmwareUpdateModules = 1;
 #define SUPPORT_OBJECT_MODEL	1
 #define SUPPORT_FTP				1
 #define SUPPORT_TELNET			1
-#define SUPPORT_ASYNC_MOVES		1
 
 #define USE_CACHE				0					// Cache controller disabled for now
 

src/Duet3_V05/Pins_Duet3_V05.h

@@ -131,10 +131,20 @@ namespace DuetExpansion
 			dueXnExpander.pinModeMultiple(AllFanBits, OUTPUT_PWM_LOW);		// Initialise the PWM pins
 			const uint16_t stopBits = (dueXnBoardType == ExpansionBoardType::DueX5) ? AllStopBitsX5 : AllStopBitsX2;	// I am assuming that the X0 has 2 endstop inputs
 			dueXnExpander.pinModeMultiple(stopBits | AllGpioBits, INPUT);	// Initialise the endstop inputs and GPIO pins (no pullups because 5V-tolerant)
-
-			// Set up the interrupt on any input change
 			dueXnInputMask = stopBits | AllGpioBits;
 			dueXnExpander.enableInterruptMultiple(dueXnInputMask, INTERRUPT_MODE_CHANGE);
+		}
+
+		return dueXnBoardType;
+	}
+
+	// Create the DueXn task and enable the associated interrupt from the DueXn.
+	// This must be called after interrupt priorities have been configured, to comply with FreeRTOS constraints.
+	void DueXnTaskInit()
+	{
+		if (dueXnBoardType != ExpansionBoardType::none)
+		{
+			// Set up the interrupt on any input change
 			attachInterrupt(DueX_INT, DueXIrq, InterruptMode::INTERRUPT_MODE_FALLING, nullptr);
 
 			// Clear any initial interrupts
@@ -143,8 +153,6 @@ namespace DuetExpansion
 			dueXTask = new Task<DueXTaskStackWords>();
 			dueXTask->Create(DueXTask, "DUEX", nullptr, TaskPriority::DueXPriority);
 		}
-
-		return dueXnBoardType;
 	}
 
 	// Look for an additional output pin expander

src/DuetNG/DueXn.cpp

@@ -24,8 +24,9 @@ namespace DuetExpansion
 {
 	ExpansionBoardType DueXnInit();								// Look for a DueXn, initialise it and return which expansion board is attached
 	void AdditionalOutputInit();								// Look for an additional output pin expander
-	const char* array null GetExpansionBoardName();				// Return the name of the expansion board, or nullptr if no expansion board
-	const char* array null GetAdditionalExpansionBoardName();	// Return the name of the additional expansion board, or nullptr if no expansion board
+	void DueXnTaskInit();										// Create the DueXn task and enable the associated interrupt from the DueXn
+	const char* _ecv_array null GetExpansionBoardName();		// Return the name of the expansion board, or nullptr if no expansion board
+	const char* _ecv_array null GetAdditionalExpansionBoardName();	// Return the name of the additional expansion board, or nullptr if no expansion board
 	void SetPinMode(Pin pin, PinMode mode);						// Set the I/O mode of a pin
 	bool DigitalRead(Pin pin);									// Read a pin
 	void DigitalWrite(Pin pin, bool high);						// Write a pin

src/DuetNG/DueXn.h

@@ -24,7 +24,7 @@ void Fan::Init(Pin p_pin, LogicalPin lp, bool hwInverted, PwmFrequency p_freq)
 	hardwareInverted = hwInverted;
 	inverted = blipping = false;
 	heatersMonitored = 0;
-	triggerTemperatures[0] = triggerTemperatures[1] = HotEndFanTemperature;
+	triggerTemperatures[0] = triggerTemperatures[1] = DefaultHotEndFanTemperature;
 	lastPwm = -1.0;				// force a refresh
 	Refresh();
 }

src/Fans/Fan.cpp

@@ -58,6 +58,7 @@ bool FilamentMonitor::ConfigurePin(GCodeBuffer& gb, const StringRef& reply, Inte
 			reply.copy("unsuitable endstop number");
 			return true;
 		}
+		setPullup(pin, false);				// disable the pullup resistor to provide greater noise immunity when using a Duet3D laser of magnetic filament monitor
 	}
 	else if (seen)
 	{