From 14de4d8b497e3352bf1d28ca05cf9f599b2d4206 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Thu, 13 Mar 2014 16:20:12 -0700 Subject: [PATCH] Deleted the mattercontrolarduino.inf (not useful to getting drivers installed) Removed dead code adding in arduino.inf for install. --- .../PrinterConnections/AddConnectionWidget.cs | 36 ----- StaticData/Drivers/MatterControlArduino.inf | 106 ------------- StaticData/Drivers/arduino.inf | 147 ++++++++++++++++++ 3 files changed, 147 insertions(+), 142 deletions(-) delete mode 100644 StaticData/Drivers/MatterControlArduino.inf create mode 100644 StaticData/Drivers/arduino.inf diff --git a/PrinterControls/PrinterConnections/AddConnectionWidget.cs b/PrinterControls/PrinterConnections/AddConnectionWidget.cs index ea4401def..2e5afc1d9 100644 --- a/PrinterControls/PrinterConnections/AddConnectionWidget.cs +++ b/PrinterControls/PrinterConnections/AddConnectionWidget.cs @@ -488,42 +488,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections throw new Exception(LocalizedString.Get("Could not find a selected button.")); } - void InstallDriver() - { - string infPathAndFileToInstall = ""; - switch (MatterHackers.Agg.UI.WindowsFormsAbstract.GetOSType()) - { - case Agg.UI.WindowsFormsAbstract.OSType.Windows: - if (!File.Exists(infPathAndFileToInstall)) - { - var driverInstallerProcess = new Process(); - // Prepare the process to run - // Enter in the command line arguments, everything you would enter after the executable name itself - driverInstallerProcess.StartInfo.Arguments = "--installInf \"" + infPathAndFileToInstall; - // Enter the executable to run, including the complete path - string printerDriverInstallerExePathAndFileName = Path.Combine(".", "PrinterDriverInstaller.exe"); - - driverInstallerProcess.StartInfo.CreateNoWindow = true; - driverInstallerProcess.StartInfo.WindowStyle = ProcessWindowStyle.Hidden; - - driverInstallerProcess.StartInfo.FileName = System.IO.Path.GetFullPath(printerDriverInstallerExePathAndFileName); - driverInstallerProcess.StartInfo.Verb = "runas"; - driverInstallerProcess.StartInfo.UseShellExecute = true; - - driverInstallerProcess.Start(); - - driverInstallerProcess.WaitForExit(); - - // Retrieve the app's exit code - var exitCode = driverInstallerProcess.ExitCode; - } - break; - - case Agg.UI.WindowsFormsAbstract.OSType.Mac: - break; - } - } - private string GetSelectedSerialPort() { foreach (SerialPortIndexRadioButton button in SerialPortButtonsList) diff --git a/StaticData/Drivers/MatterControlArduino.inf b/StaticData/Drivers/MatterControlArduino.inf deleted file mode 100644 index 548a6051f..000000000 --- a/StaticData/Drivers/MatterControlArduino.inf +++ /dev/null @@ -1,106 +0,0 @@ -;************************************************************ -; Windows USB CDC ACM Setup File -; Copyright (c) 2000 Microsoft Corporation - - -[Version] -Signature="$Windows NT$" -Class=Ports -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} -Provider=%MFGNAME% -LayoutFile=layout.inf -CatalogFile=%MFGFILENAME%.cat -DriverVer=11/15/2007,5.1.2600.0 - -[Manufacturer] -%MFGNAME%=DeviceList, NTamd64 - -[DestinationDirs] -DefaultDestDir=12 - - -;------------------------------------------------------------------------------ -; Windows 2000/XP/Vista-32bit Sections -;------------------------------------------------------------------------------ - -[DriverInstall.nt] -include=mdmcpq.inf -CopyFiles=DriverCopyFiles.nt -AddReg=DriverInstall.nt.AddReg - -[DriverCopyFiles.nt] -usbser.sys,,,0x20 - -[DriverInstall.nt.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,%DRIVERFILENAME%.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.nt.Services] -AddService=usbser, 0x00000002, DriverService.nt - -[DriverService.nt] -DisplayName=%SERVICE% -ServiceType=1 -StartType=3 -ErrorControl=1 -ServiceBinary=%12%\%DRIVERFILENAME%.sys - -;------------------------------------------------------------------------------ -; Vista-64bit Sections -;------------------------------------------------------------------------------ - -[DriverInstall.NTamd64] -include=mdmcpq.inf -CopyFiles=DriverCopyFiles.NTamd64 -AddReg=DriverInstall.NTamd64.AddReg - -[DriverCopyFiles.NTamd64] -%DRIVERFILENAME%.sys,,,0x20 - -[DriverInstall.NTamd64.AddReg] -HKR,,DevLoader,,*ntkern -HKR,,NTMPDriver,,%DRIVERFILENAME%.sys -HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" - -[DriverInstall.NTamd64.Services] -AddService=usbser, 0x00000002, DriverService.NTamd64 - -[DriverService.NTamd64] -DisplayName=%SERVICE% -ServiceType=1 -StartType=3 -ErrorControl=1 -ServiceBinary=%12%\%DRIVERFILENAME%.sys - - -;------------------------------------------------------------------------------ -; Vendor and Product ID Definitions -;------------------------------------------------------------------------------ -; When developing your USB device, the VID and PID used in the PC side -; application program and the firmware on the microcontroller must match. -; Modify the below line to use your VID and PID. Use the format as shown below. -; Note: One INF file can be used for multiple devices with different VID and PIDs. -; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line. -;------------------------------------------------------------------------------ -[SourceDisksFiles] -[SourceDisksNames] -[DeviceList] -%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003B - -[DeviceList.NTamd64] -%DESCRIPTION%=DriverInstall, USB\VID_2341&PID_003B - - -;------------------------------------------------------------------------------ -; String Definitions -;------------------------------------------------------------------------------ -;Modify these strings to customize your device -;------------------------------------------------------------------------------ -[Strings] -MFGFILENAME="CDC_vista" -DRIVERFILENAME ="usbser" -MFGNAME="MatterHackers (matterhackers.com)" -INSTDISK="MatterControl Arduino USBSerial Driver Installer" -DESCRIPTION="MatterControl Arduino USB" -SERVICE="USB RS-232 Emulation Driver" \ No newline at end of file diff --git a/StaticData/Drivers/arduino.inf b/StaticData/Drivers/arduino.inf new file mode 100644 index 000000000..c1afb910a --- /dev/null +++ b/StaticData/Drivers/arduino.inf @@ -0,0 +1,147 @@ +; Copyright 2012 Blacklabel Development, Inc. + +[Strings] +DriverPackageDisplayName="Arduino USB Driver" +ManufacturerName="Arduino LLC (www.arduino.cc)" +ServiceName="USB RS-232 Emulation Driver" +due.bossa.name="Bossa Program Port" +due.programming_port.name="Arduino Due Programming Port" +due.sketch.name="Arduino Due" +esplora.bootloader.name="Arduino Esplora bootloader" +esplora.sketch.name="Arduino Esplora" +leonardo.bootloader.name="Arduino Leonardo bootloader" +leonardo.sketch.name="Arduino Leonardo" +lilypadUSB.bootloader.name="Arduino LilyPad USB bootloader" +lilypadUSB.sketch.name="Arduino LilyPad USB" +mega2560.name="Arduino Mega 2560" +mega2560rev3.name="Arduino Mega 2560" +megaADK.name="Arduino Mega ADK" +megaADKrev3.name="Arduino Mega ADK" +micro.bootloader.name="Arduino Micro bootloader" +micro.sketch.name="Arduino Micro" +uno.name="Arduino Uno" +unoR3.name="Arduino Uno" +usbserial.name="Arduino USB Serial Light Adapter" +robotControl.bootloader.name="Arduino Robot Control bootloader" +robotControl.sketch.name="Arduino Robot" +robotMotor.bootloader.name="Arduino Robot Motor bootloader" +robotMotor.sketch.name="Arduino Robot" +yun.bootloader.name="Arduino Yun bootloader" +yun.sketch.name="Arduino Yun" + +[DefaultInstall] +CopyINF=arduino.inf + +[Version] +Class=Ports +ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} +Signature="$Windows NT$" +Provider=%ManufacturerName% +DriverPackageDisplayName=%DriverPackageDisplayName% +CatalogFile=arduino.cat +DriverVer=01/04/2013,1.0.0.0 + +[Manufacturer] +%ManufacturerName%=DeviceList, NTamd64, NTia64 + +[DestinationDirs] +FakeModemCopyFileSection=12 +DefaultDestDir=12 + +[DeviceList] +%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124 +%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D +%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00 +%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C +%esplora.sketch.name%=DriverInstall, USB\VID_2341&PID_803C&MI_00 +%leonardo.bootloader.name%=DriverInstall, USB\VID_2341&PID_0036 +%leonardo.sketch.name%=DriverInstall, USB\VID_2341&PID_8036&MI_00 +%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207 +%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00 +%mega2560rev3.name%=DriverInstall, USB\VID_2341&PID_0042 +%mega2560.name%=DriverInstall, USB\VID_2341&PID_0010 +%megaADK.name%=DriverInstall, USB\VID_2341&PID_003F +%megaADKrev3.name%=DriverInstall, USB\VID_2341&PID_0044 +%micro.bootloader.name%=DriverInstall, USB\VID_2341&PID_0037 +%micro.sketch.name%=DriverInstall, USB\VID_2341&PID_8037&MI_00 +%uno.name%=DriverInstall, USB\VID_2341&PID_0001 +%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043 +%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B +%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038 +%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00 +%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039 +%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00 +%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041 +%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00 + +[DeviceList.NTamd64] +%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124 +%due.programming_port.name%=DriverInstall, USB\VID_2341&PID_003D +%due.sketch.name%=DriverInstall, USB\VID_2341&PID_003E&MI_00 +%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C +%esplora.sketch.name%=DriverInstall, USB\VID_2341&PID_803C&MI_00 +%leonardo.bootloader.name%=DriverInstall, USB\VID_2341&PID_0036 +%leonardo.sketch.name%=DriverInstall, USB\VID_2341&PID_8036&MI_00 +%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207 +%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00 +%mega2560rev3.name%=DriverInstall, USB\VID_2341&PID_0042 +%mega2560.name%=DriverInstall, USB\VID_2341&PID_0010 +%megaADK.name%=DriverInstall, USB\VID_2341&PID_003F +%megaADKrev3.name%=DriverInstall, USB\VID_2341&PID_0044 +%micro.bootloader.name%=DriverInstall, USB\VID_2341&PID_0037 +%micro.sketch.name%=DriverInstall, USB\VID_2341&PID_8037&MI_00 +%uno.name%=DriverInstall, USB\VID_2341&PID_0001 +%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043 +%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B +%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038 +%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00 +%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039 +%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00 +%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041 +%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00 + +[DeviceList.NTia64] +%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C +%esplora.sketch.name%=DriverInstall, USB\VID_2341&PID_803C&MI_00 +%leonardo.bootloader.name%=DriverInstall, USB\VID_2341&PID_0036 +%leonardo.sketch.name%=DriverInstall, USB\VID_2341&PID_8036&MI_00 +%lilypadUSB.bootloader.name%=DriverInstall, USB\VID_1B4F&PID_9207 +%lilypadUSB.sketch.name%=DriverInstall, USB\VID_1B4F&PID_9208&MI_00 +%mega2560rev3.name%=DriverInstall, USB\VID_2341&PID_0042 +%mega2560.name%=DriverInstall, USB\VID_2341&PID_0010 +%megaADK.name%=DriverInstall, USB\VID_2341&PID_003F +%megaADKrev3.name%=DriverInstall, USB\VID_2341&PID_0044 +%micro.bootloader.name%=DriverInstall, USB\VID_2341&PID_0037 +%micro.sketch.name%=DriverInstall, USB\VID_2341&PID_8037&MI_00 +%uno.name%=DriverInstall, USB\VID_2341&PID_0001 +%unoR3.name%=DriverInstall, USB\VID_2341&PID_0043 +%usbserial.name%=DriverInstall, USB\VID_2341&PID_003B +%robotControl.bootloader.name%=DriverInstall, USB\VID_2341&PID_0038 +%robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00 +%robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039 +%robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00 +%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041 +%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00 + +[DriverInstall] +include=mdmcpq.inf,usb.inf +CopyFiles = FakeModemCopyFileSection +AddReg=DriverAddReg + +[DriverAddReg] +HKR,,DevLoader,,*ntkern +HKR,,NTMPDriver,,usbser.sys +HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" + +[DriverInstall.Services] +include=mdmcpq.inf +AddService=usbser, 0x00000002, DriverService + +[DriverService] +DisplayName=%ServiceName% +ServiceType=1 +StartType=3 +ErrorControl=1 +ServiceBinary=%12%\usbser.sys +LoadOrderGroup=Base +