Merge pull request #7525 from mavlink/revert-7522-DriverInstall

Revert "Windows: Always install PX4 Drivers"

ChangeLog.md

@@ -8,9 +8,7 @@ Note: This file only contains high level features or important fixes.
 
 * Major rewrite and bug fix pass through Structure Scan. Previous version had such bad problems that it can no longer be supported. Plans with Structure Scan will need to be recreated. New QGC will not load old Structure Scan plans.
 
-### 3.5.3 - Stable
-* Change Crash Dump to mini-dumps
-* Always install PX4 drivers, even if already there
+### 3.5.3 - Not yet released
 * Fix crash when clicking on GeoFence polygon vertex
 * PX4: Fix missing ```MC_YAW_FF``` parameter in PID Tuning
 * ArduPilot: Fix parameter file save generating bad characters from git hash

deploy/qgroundcontrol_installer.nsi

@@ -78,9 +78,29 @@ doinstall:
   WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\${EXENAME}-Uninstall.exe$\""
   SetRegView 64
   WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpCount" 5 
-  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 2
+  WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpType" 1
   WriteRegExpandStr HKLM "SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\${EXENAME}.exe" "DumpFolder" "%LOCALAPPDATA%\QGCCrashDumps"
+
+  ; Only attempt to install the PX4 driver if the version isn't present
+  !define ROOTKEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\434608CF2B6E31F0DDBA5C511053F957B55F098E"
+
+  SetRegView 64
+  ReadRegStr $0 HKLM "${ROOTKEY}" "Publisher"
+  StrCmp     $0 "3D Robotics" found_provider notfound
+
+found_provider:
+  ReadRegStr $0 HKLM "${ROOTKEY}" "DisplayVersion"
+  DetailPrint "Checking USB driver version... $0"
+  StrCmp     $0 "04/11/2013 2.0.0.4" skip_driver notfound
+
+notfound:
+  DetailPrint "USB Driver not found... installing"
   ExecWait '"msiexec" /i "px4driver.msi"'
+  goto done
+
+skip_driver:
+  DetailPrint "USB Driver found... skipping install"
+done:
   SetRegView lastused
 SectionEnd