Release 1.19beta10

New features:

Refactored and completed 4-leadscrew bed levelling code
Probe deployment and retraction for G30 and G29 commands is now handled
automatically. You should still include a M401 command before the first
G30 command in bed.g and a M402 command after the last one, so that the
probe deploys and retracts once for the entire sequence instead of once
per G30 command.
M577 now allows separate X and Y spacings, use Sxxx:yyy
Volumetric extrusion is now supported (M200)
Additional tool/heater data is provided to DWC (thanks chrishamm). Using
Heater 0 as a tool heater should now work.
The '(' character in a gcode file now introduces a comment, just as the
';' character does. The comment is terminated at end-of-line. This is
not the same as in some CNC gcodes, where a comment introduced by '(' is
terminated by ')'.
Heater tuning peak detection algorithm changed (but still needs more
work). This may fix some "no peak detected" reports during auto tuning.
The heater dead time is how taken as 60% of the peak delay time intead
of 100%, which results in more aggressive PID parameters.
Bug fixes:

M669 with no parameters now reports the bed offset on a SCARA machine as
well as the other parameters
M671 with no parameters now reports the maximum correction as well as
the leadscrew positions
Heater model max PWM is now set to tuning PWM after auto tuning (thanks
cangelis)
If an HTML file uploaded over USB contained an embedded leading
substring of the EOF string, incorrect data was written to file (thanks
cangelis)
Fixed incorrect movement following a tool change on an IDEX machine
(thanks lars)
RADDS build would not start up
Other changes:

TEMPERATURE_CLOSE_ENOUGH reduced from 2.5C to 1.0C
Reduced the maximum number of random probe points on Duet WiFi/Ethernet
to 32 to avoid running out of memory during delta auto calibration
Simplified the axis orthogonality correction code
Added new bitmap types along with function templates to work on them
Clear HSMCI callback when exiting RepRap module e.g. to flash new
firmware
Use lrintf() instead of round()
DriveMovement structures are now allocated dynamically from a freelist,
to allow more moves to be queued in typical cases. The number free and
minimum ever free is included in the M122 report.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/Storage/FileData.h b/src/Storage/FileData.h
index 11824a72..94f9a527 100644
--- a/src/Storage/FileData.h
+++ b/src/Storage/FileData.h
@@ -19,7 +19,7 @@ class FileData
 public:
 	friend class FileGCodeInput;
 
-	FileData() : f(NULL) {}
+	FileData() : f(nullptr) {}
 
 	// Set this to refer to a newly-opened file
 	void Set(FileStore* pfile)
@@ -28,14 +28,14 @@ public:
 		f = pfile;
 	}
 
-	bool IsLive() const { return f != NULL; }
+	bool IsLive() const { return f != nullptr; }
 
 	bool Close()
 	{
-		if (f != NULL)
+		if (f != nullptr)
 		{
 			bool ok = f->Close();
-			f = NULL;
+			f = nullptr;
 			return ok;
 		}
 		return false;
@@ -83,7 +83,7 @@ public:
 
 	float FractionRead() const
 	{
-		return (f == NULL ? -1.0 : f->FractionRead());
+		return (f == nullptr ? -1.0 : f->FractionRead());
 	}
 
 	FilePosition Length() const
@@ -96,7 +96,7 @@ public:
 	{
 		Close();
 		f = other.f;
-		if (f != NULL)
+		if (f != nullptr)
 		{
 			f->Duplicate();
 		}
@@ -115,7 +115,7 @@ private:
 
 	void Init()
 	{
-		f = NULL;
+		f = nullptr;
 	}
 
 	// Private assignment operator to prevent us assigning these objects
diff --git a/src/Storage/MassStorage.cpp b/src/Storage/MassStorage.cpp
index eae17f9c..12cf1bc2 100644
--- a/src/Storage/MassStorage.cpp
+++ b/src/Storage/MassStorage.cpp
@@ -104,7 +104,7 @@ const char* MassStorage::CombineName(const char* directory, const char* fileName
 	size_t inIndex = 0;
 
 	// DC 2015-11-25 Only prepend the directory if the filename does not have an absolute path or volume specifier
-	if (directory != NULL && fileName[0] != '/' && (strlen(fileName) < 2 || !isdigit(fileName[0]) || fileName[1] != ':'))
+	if (directory != nullptr && fileName[0] != '/' && (strlen(fileName) < 2 || !isdigit(fileName[0]) || fileName[1] != ':'))
 	{
 		while (directory[inIndex] != 0 && directory[inIndex] != '\n')
 		{
@@ -224,7 +224,7 @@ const char* MassStorage::GetMonthName(const uint8_t month)
 // Delete a file or directory
 bool MassStorage::Delete(const char* directory, const char* fileName)
 {
-	const char* location = (directory != NULL)
+	const char* location = (directory != nullptr)
 							? platform->GetMassStorage()->CombineName(directory, fileName)
 								: fileName;
 	if (f_unlink(location) != FR_OK)
@@ -359,7 +359,7 @@ bool MassStorage::Mount(size_t card, StringRef& reply, bool reportSuccess)
 
 	if (!mounting)
 	{
-		f_mount(card, NULL);			// un-mount it from FATFS
+		f_mount(card, nullptr);			// un-mount it from FATFS
 		sd_mmc_unmount(card);			// this forces it to re-initialise the card
 		isMounted[card] = false;
 		startTime = millis();
@@ -426,7 +426,7 @@ bool MassStorage::Unmount(size_t card, StringRef& reply)
 	}
 
 	platform->InvalidateFiles(&fileSystems[card]);
-	f_mount(card, NULL);
+	f_mount(card, nullptr);
 	sd_mmc_unmount(card);
 	isMounted[card] = false;
 	reply.Clear();