Merge branch 'dev' of https://github.com/dc42/RepRapFirmware.git into dev

7 files changed, 14 insertions, 10 deletions

diff --git a/BuildInstructions.md b/BuildInstructions.md
index ed64a9c7..b2e62e45 100644
--- a/BuildInstructions.md
+++ b/BuildInstructions.md
@@ -70,7 +70,7 @@ Using Homebrew-Cask makes it very easy to install new software on macOS: https:/
 
 4. Download or clone the RepRapFirmware, CoreNG, FreeRTOS, RRFLibraries and DuetWiFiSocketServer projects into your workspace (also CANlib if you are building firmware for Duet 3). Keep the folder names as is.
 
-5. Open Eclipse and import RepRapFirmware, FreeRTOS, RRFLibraries and CoreNG projects.
+5. Open Eclipse and import RepRapFirmware, FreeRTOS, RRFLibraries and CoreNG projects using File -> Open Projects from File System.
 
 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..."
 
diff --git a/Driver/DuetDriverFiles.zip b/Driver/DuetDriverFiles.zip
deleted file mode 100644
index d95837d9..00000000
--- a/Driver/DuetDriverFiles.zip
+++ /dev/null
diff --git a/Driver/WindowsDriverFiles.zip b/Driver/WindowsDriverFiles.zip
new file mode 100644
index 00000000..b7d3a945
--- /dev/null
+++ b/Driver/WindowsDriverFiles.zip
diff --git a/Driver/duet.inf b/Driver/duet.inf
index 46c7b3d9..bcefc9c7 100644
--- a/Driver/duet.inf
+++ b/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

diff --git a/Driver/duetinf.cat b/Driver/duetinf.cat
index d8db19c4..85df0717 100644
--- a/Driver/duetinf.cat
+++ b/Driver/duetinf.cat
diff --git a/Scripts/signdriver.bat b/Scripts/signdriver.bat
index 84702bc7..7c5d120c 100644
--- a/Scripts/signdriver.bat
+++ b/Scripts/signdriver.bat
@@ -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
\ No newline at end of file
diff --git a/WHATS_NEW.md b/WHATS_NEW.md
index 568b4ec2..f60e0b71 100644
--- a/WHATS_NEW.md
+++ b/WHATS_NEW.md
@@ -1,22 +1,22 @@
 Summary of important changes in recent versions
 ===============================================
 
-Version 2.06 (in preparation)
-============
+Version 2.05.1
+==============
 Compatible files:
 - DuetWiFiServer 1.23
-- DuetWebControl 2.0.6 (recommended) or 1.22.6
+- DuetWebControl 2.0.7 or 1.22.6
 
 Bug fixes:
 - On delta printers, M564 S0 did not allow you to exceed the M665 print radius parameter
-- Fixed a possible 1-character buffer overflow in class OutputBuffer
+- Fixed a 1-character buffer overflow in class OutputBuffer. The effects of this overflow were unknown but potentially severe.
 - On tool changers, if the different tools did not have equal XY offsets then G1 X moves in the tpre and tpost tool change files might perform uncommanded Y movement, and vice versa
 
 Version 2.05
 ============
 Compatible files:
 - DuetWiFiServer 1.23
-- DuetWebControl 2.0.4 (recommended) or 1.22.6
+- DuetWebControl 2.0.4 or 1.22.6
 
 Upgrade notes from version 2.04:
 - If using this release to control a laser cutter or laser engraver, see "Changed behaviour" below.
@@ -46,7 +46,7 @@ Version 2.04
 ============
 Compatible files:
 - DuetWiFiServer 1.23
-- DuetWebControl 2.0.4 (recommended) or 1.22.6
+- DuetWebControl 2.0.4 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