Updated the Windows device driver to recignoise Duet 3 main board

gtjoseph · Mar 18, 2020 · fb47576 · fb47576
1 parent c30009b
commit fb47576
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
diff --git 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