rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merged in filnet/librepilot/LP-406_windows_driver_fail (pull request #329)

Browse Source 
LP-406 windows driver fail
This commit is contained in:
Lalanne Laurent 2016-09-25 15:51:52 +02:00
commit 9703dd1458
4 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/Project/Windows USB/OpenPilot-CDC.inf → flight/Project/WindowsUSB/OpenPilot-CDC.inf
View File

@ -3,7 +3,7 @@ Signature = "$Windows NT$"
Class = Ports
ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318}
Provider = %ProviderName%
DriverVer=05/25/2016,4.0.0.0
DriverVer=11/21/2014,3.0.0.0
CatalogFile.NTx86 = OpenPilot-CDC_x86.cat
CatalogFile.NTamd64 = OpenPilot-CDC_amd64.cat
@ -15,14 +15,12 @@ CatalogFile.NTamd64 = OpenPilot-CDC_amd64.cat
%Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00
%OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00
%Sparky2% = DriverInstall,USB\VID_20A0&PID_41d0&MI_00
[DeviceList.NTamd64]
%CopterControl% = DriverInstall,USB\VID_20A0&PID_415b&MI_00
%Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00
%OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00
%Sparky2% = DriverInstall,USB\VID_20A0&PID_41d0&MI_00
[DriverInstall]
include = mdmcpq.inf
@ -43,4 +41,3 @@ CopterControl = "CopterControl Virtual COM Port"
Revolution = "Revolution Virtual COM Port"
OPLinkMini = "OPLinkMini Virtual COM Port"
OPLink1W = "OPLink1W Virtual COM Port"
Sparky2 = "Sparky2 Virtual COM Port"

0
flight/Project/Windows USB/openpilot-cdc_amd64.cat → flight/Project/WindowsUSB/openpilot-cdc_amd64.cat
View File

0
flight/Project/Windows USB/openpilot-cdc_x86.cat → flight/Project/WindowsUSB/openpilot-cdc_x86.cat
View File

62
package/winx86/gcs.nsi
View File

@ -156,7 +156,7 @@
; Installer sections
; Copy GCS core files
Section "Core files" InSecCore
Section "${GCS_BIG_NAME}" InSecCore
SectionIn RO
SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\*"
@ -195,36 +195,6 @@ Section "-Utilities" InSecUtilities
File "/oname=OPLogConvert-${PACKAGE_LBL}.m" "${UAVO_SYNTH_TREE}\matlab\OPLogConvert.m"
SectionEnd
; Copy driver files
Section "-Drivers" InSecDrivers
SetOutPath "$INSTDIR\drivers"
File /r "${PROJECT_ROOT}\flight\Project\Windows USB\*"
SectionEnd
; Preinstall OpenPilot CDC driver
Section "CDC driver" InSecInstallDrivers
InitPluginsDir
SetOutPath "$PLUGINSDIR"
${If} ${RunningX64}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe"
${Else}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe"
${EndIf}
ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"'
SectionEnd
; Copy Opengl32.dll if needed (disabled by default)
Section /o "Mesa OpenGL driver" InSecInstallOpenGL
SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll"
SectionEnd
; AeroSimRC plugin files
Section "AeroSimRC plugin" InSecAeroSimRC
SetOutPath "$INSTDIR\misc\AeroSIM-RC"
File /r "${AEROSIMRC_TREE}\*"
SectionEnd
Section "Shortcuts" InSecShortcuts
; Create desktop and start menu shortcuts
SetOutPath "$INSTDIR"
@ -252,6 +222,36 @@ Section "Shortcuts" InSecShortcuts
CreateShortCut "$SMPROGRAMS\${ORG_BIG_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
SectionEnd
; AeroSimRC plugin files
Section "AeroSimRC plugin" InSecAeroSimRC
SetOutPath "$INSTDIR\misc\AeroSIM-RC"
File /r "${AEROSIMRC_TREE}\*"
SectionEnd
; Copy driver files (hidden, driver is always copied to install directory)
Section "-Drivers" InSecDrivers
SetOutPath "$INSTDIR\drivers"
File /r "${PROJECT_ROOT}\flight\Project\WindowsUSB\*"
SectionEnd
; Preinstall OpenPilot CDC driver (disabled by default)
Section /o "CDC driver" InSecInstallDrivers
InitPluginsDir
SetOutPath "$PLUGINSDIR"
${If} ${RunningX64}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x64.exe"
${Else}
File "/oname=dpinst.exe" "${NSIS_DATA_TREE}\redist\dpinst_x86.exe"
${EndIf}
ExecWait '"$PLUGINSDIR\dpinst.exe" /lm /path "$INSTDIR\drivers"'
SectionEnd
; Copy Opengl32.dll if needed (disabled by default)
Section /o "Mesa OpenGL driver" InSecInstallOpenGL
SetOutPath "$INSTDIR\bin"
File /r "${GCS_BUILD_TREE}\bin\opengl32\opengl32.dll"
SectionEnd
Section ; create uninstall info
; Write the installation path into the registry
WriteRegStr HKCU "Software\${ORG_BIG_NAME}" "Install Location" $INSTDIR