X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2Ftelegps-windows.nsi.in;h=e6798c46783cba7cd9fe6bbc311e28c33df5e169;hb=b397e4ff45f054acb1347ffa5468950febc431f7;hp=43699fafd5f5f7edaa8184fd8527ed9d55c92375;hpb=1a563026409ccff5dea6f89e567accb09bc4b5f6;p=fw%2Faltos

diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index 43699faf..e6798c46 100644
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -94,15 +94,18 @@ Section "Install Driver" InstDriver
 	InstDrv::DeleteOemInfFiles /NOUNLOAD
 	InstDrv::CreateDevice /NOUNLOAD
 
-	SetOutPath $TEMP
-	File "../altusmetrum.inf"
-	InstDrv::InstallDriver /NOUNLOAD "$TEMP\altusmetrum.inf"
-
 	SetOutPath $INSTDIR
 	File "../altusmetrum.inf"
+	File "../altusmetrum.cat"
 
-	SetOutPath $WINDIR\Inf
-	File "../altusmetrum.inf"
+	${DisableX64FSRedirection}
+	IfFileExists $WINDIR\System32\PnPutil.exe 0 nopnp
+		${DisableX64FSRedirection}
+		nsExec::ExecToLog '"$WINDIR\System32\PnPutil.exe" -i -a "$INSTDIR\altusmetrum.inf"'
+		Goto done
+nopnp:
+		InstDrv::InstallDriver /NOUNLOAD "$INSTDIR\altusmetrum.inf"
+done:
 
 SectionEnd
 
@@ -135,13 +138,14 @@ Section "TeleGPS Desktop Shortcut"
 	CreateShortCut "$DESKTOP\TeleGPS.lnk" "$INSTDIR\telegps-fat.jar"  "" "$INSTDIR\telegps.ico"
 SectionEnd
 
-Section "TeleGPS Firmware"
+Section "TeleGPS, TeleDongle and TeleBT Firmware"
 
 	SetOutPath $INSTDIR
 
 	File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx"
 	File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
 	File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
+
 SectionEnd
 
 Section "Documentation"
@@ -178,6 +182,11 @@ Section "Uninstall"
 	Delete "$INSTDIR\*.*"
 	RMDir "$INSTDIR"
 
+	; Remove devices
+	InstDrv::InitDriverSetup /NOUNLOAD {4D36E96D-E325-11CE-BFC1-08002BE10318} AltusMetrumSerial
+	InstDrv::DeleteOemInfFiles /NOUNLOAD
+	InstDrv::RemoveAllDevices
+
 	; Remove shortcuts, if any
 	Delete "$SMPROGRAMS\TeleGPS.lnk"
 	Delete "$DESKTOP\TeleGPS.lnk"