Merge remote-tracking branch 'origin/v3-dev' into v3-chrishamm

Author: chrishamm

Driver/duet.inf

@@ -8,6 +8,7 @@ DUET06 = "Duet 06 or 085 3D printer control electronics"
 ALLIGATOR = "Alligator 3D printer control electronics"
 DUETNG = "Duet 2 WiFi or Duet 2 Ethernet 3D printer control electronics"
 DUETMAESTRO = "Duet 2 Maestro 3D printer control electronics"
+DUET3 = "Duet 3 motion control electronics
 Serial.SvcDesc = "USB Serial emulation driver" 
 BOSSAPORT = "Bossa Program Port"
 
@@ -21,7 +22,7 @@ ClassGuid   = {4D36E978-E325-11CE-BFC1-08002BE10318}
 DriverPackageDisplayName = %DriverPackageDisplayName%
 Provider    = %Provider% 
 CatalogFile = duetinf.cat
-DriverVer   = 02/03/2018,1.21.0.0	; date in US format
+DriverVer   = 10/21/2019,1.22.0.0	; date in US format
 
 [Manufacturer] 
 %Provider% = DeviceList, NTAMD64, NT 
@@ -37,6 +38,7 @@ FakeModemCopyFileSection = 12
 %ALLIGATOR% = DriverInstall, USB\VID_1209&PID_AB3D
 %DUETNG% = DriverInstall, USB\VID_1D50&PID_60EC
 %DUETMAESTRO% = DriverInstall, USB\VID_1D50&PID_60ED
+%DUET3% = DriverInstall, USB\VID_1D50&PID_60EE
 
 [DeviceList.NTAMD64]
 %BOSSAPORT% = DriverInstall, USB\VID_03EB&PID_6124
@@ -45,6 +47,7 @@ FakeModemCopyFileSection = 12
 %ALLIGATOR% = DriverInstall.NTamd64, USB\VID_1209&PID_AB3D
 %DUETNG% = DriverInstall.NTamd64, USB\VID_1D50&PID_60EC
 %DUETMAESTRO% = DriverInstall.NTamd64, USB\VID_1D50&PID_60ED
+%DUET3% = DriverInstall, USB\VID_1D50&PID_60EE
 
 [DeviceList.NT]
 %BOSSAPORT% = DriverInstall, USB\VID_03EB&PID_6124
@@ -53,6 +56,7 @@ FakeModemCopyFileSection = 12
 %ALLIGATOR% = DriverInstall.NT, USB\VID_1209&PID_AB3D
 %DUETNG% = DriverInstall.NT, USB\VID_1D50&PID_60EC
 %DUETMAESTRO% = DriverInstall.NT, USB\VID_1D50&PID_60ED
+%DUET3% = DriverInstall, USB\VID_1D50&PID_60EE
 
 ;------------------------------------------------------------
 ; Windows XP, Vista, Windows 7, Windows 8, Windows 10 - 32bit

Driver/duetinf.cat

@@ -1,6 +1,6 @@
-rem CD to the RepRapFirmware root directory before running this
+cd ..rem CD to the RepRapFirmware root directory before running this
 "C:\Program Files (x86)\Windows Kits\10\bin\x86\Inf2Cat.exe" /driver:Driver /os:XP_X86,Vista_X86,Vista_X64,7_X86,7_X64,8_X86,8_X64,6_3_X86,6_3_X64,10_X86,10_X64
 set PASSWORD=
 set /P PASSWORD=Private key password: %=%
-"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool.exe" sign /f g:\EscherTechnologies.p12 /p %PASSWORD% /tr http://timestamp.comodoca.com /v Driver/duetinf.cat
+"C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool.exe" sign /f g:\EscherTechnologies.pfx /p %PASSWORD% /tr http://timestamp.comodoca.com /v Driver/duetinf.cat
 "C:\Program Files (x86)\Windows Kits\10\bin\x86\signtool.exe" verify /pa /tw Driver/duetinf.cat

Scripts/signdriver.bat

@@ -3316,129 +3316,6 @@ void GCodes::HandleReply(GCodeBuffer& gb, OutputBuffer *reply)
 	}
 }
 
-// Configure heater protection (M143). Returns true if an error occurred
-GCodeResult GCodes::SetHeaterProtection(GCodeBuffer& gb, const StringRef& reply)
-{
-	const int index = (gb.Seen('P'))
-						? gb.GetIValue()
-						: (gb.Seen('H')) ? gb.GetIValue() : 1;		// default to extruder 1 if no heater number provided
-	if ((index < 0 || index >= (int)MaxHeaters) && (index < (int)FirstExtraHeaterProtection || index >= (int)(FirstExtraHeaterProtection + NumExtraHeaterProtections)))
-	{
-		reply.printf("Invalid heater protection item '%d'", index);
-		return GCodeResult::error;
-	}
-
-	HeaterProtection &item = reprap.GetHeat().AccessHeaterProtection(index);
-
-	// Set heater to control
-	bool seen = false;
-	if (gb.Seen('P') && gb.Seen('H'))
-	{
-		const int heater = gb.GetIValue();
-		if (heater > (int)MaxHeaters)									// allow negative values to disable heater protection
-		{
-			reply.printf("Invalid heater number '%d'", heater);
-			return GCodeResult::error;
-		}
-
-		seen = true;
-		item.SetHeater(heater);
-	}
-
-	// Set sensor that supervises the heater
-	if (gb.Seen('X'))
-	{
-		item.SetSensorNumber(gb.GetIValue());
-		seen = true;
-	}
-
-	// Set trigger action
-	if (gb.Seen('A'))
-	{
-		const int action = gb.GetIValue();
-		if (action < 0 || action > (int)MaxHeaterProtectionAction)
-		{
-			reply.printf("Invalid heater protection action '%d'", action);
-		}
-
-		seen = true;
-		item.SetAction(static_cast<HeaterProtectionAction>(action));
-	}
-
-	// Set trigger condition
-	if (gb.Seen('C'))
-	{
-		const int trigger = gb.GetIValue();
-		if (trigger < 0 || trigger > (int)MaxHeaterProtectionTrigger)
-		{
-			reply.printf("Invalid heater protection trigger '%d'", trigger);
-		}
-
-		seen = true;
-		item.SetTrigger(static_cast<HeaterProtectionTrigger>(trigger));
-	}
-
-	// Set temperature limit
-	if (gb.Seen('S'))
-	{
-		const float limit = gb.GetFValue();
-		if (limit <= BadLowTemperature || limit >= BadErrorTemperature)
-		{
-			reply.copy("Invalid temperature limit");
-			return GCodeResult::error;
-		}
-
-		seen = true;
-		item.SetTemperatureLimit(limit);
-	}
-
-	// Report current parameters
-	if (!seen)
-	{
-		if (item.GetHeater() < 0)
-		{
-			reply.printf("Temperature protection item %d is not configured", index);
-		}
-		else
-		{
-			const char *actionString, *triggerString;
-			switch (item.GetAction())
-			{
-			case HeaterProtectionAction::GenerateFault:
-				actionString = "generate a heater fault";
-				break;
-			case HeaterProtectionAction::PermanentSwitchOff:
-				actionString = "permanently switch off";
-				break;
-			case HeaterProtectionAction::TemporarySwitchOff:
-				actionString = "temporarily switch off";
-				break;
-			default:
-				actionString = "(undefined)";
-				break;
-			}
-
-			switch (item.GetTrigger())
-			{
-			case HeaterProtectionTrigger::TemperatureExceeded:
-				triggerString = "exceeds";
-				break;
-			case HeaterProtectionTrigger::TemperatureTooLow:
-				triggerString = "falls below";
-				break;
-			default:
-				triggerString = "(undefined)";
-				break;
-			}
-
-			reply.printf("Temperature protection item %d is configured for heater %d and uses sensor %d to %s if the temperature %s %.1f" DEGREE_SYMBOL "C",
-					index, item.GetHeater(), item.GetSensorNumber(), actionString, triggerString, (double)item.GetTemperatureLimit());
-		}
-	}
-
-	return GCodeResult::ok;
-}
-
 void GCodes::SetToolHeaters(Tool *tool, float temperature, bool both)
 {
 	if (tool == nullptr)

src/GCodes/GCodes.cpp

@@ -284,8 +284,6 @@ class GCodes INHERIT_OBJECT_MODEL
 # endif
 #endif
 
-	GCodeResult SetHeaterProtection(GCodeBuffer &gb, const StringRef &reply);	// Configure heater protection (M143)
-
 	GCodeResult ManageTool(GCodeBuffer& gb, const StringRef& reply);			// Create a new tool definition
 	void SetToolHeaters(Tool *tool, float temperature, bool both);				// Set all a tool's heaters to the temperature, for M104/M109
 	bool ToolHeatersAtSetTemperatures(const Tool *tool, bool waitWhenCooling, float tolerance) const;

src/GCodes/GCodes.h

@@ -1827,7 +1827,7 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply)
 		break;
 
 	case 143: // Configure heater protection
-		result = SetHeaterProtection(gb, reply);
+		result = reprap.GetHeat().SetHeaterProtection(gb, reply);
 		break;
 
 	case 144: // Set bed to standby, or to active if S1 parameter given