retropilot
/
panda
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

J2534_WIN: Renamed J2534 output dll, fixed small installer issue.

master
Jessy Diamond Exum 2017-09-14 19:51:00 -07:00
parent 71b7f9427a
commit 195ede4d78
10 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
drivers/windows/panda/panda.ico 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
drivers/windows/panda/panda.rc 100644
View File

Binary file not shown.

7
drivers/windows/panda/panda.vcxproj
View File

@ -153,6 +153,7 @@
<ItemGroup>
<ClInclude Include="device.h" />
<ClInclude Include="panda.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
@ -180,6 +181,12 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="panda.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="panda.ico" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

13
drivers/windows/panda/panda.vcxproj.filters
View File

@ -27,6 +27,9 @@
<ClInclude Include="device.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@ -42,4 +45,14 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="panda.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="panda.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
</Project>

BIN
drivers/windows/panda/resource.h 100644
View File

Binary file not shown.

6
drivers/windows/pandaJ2534DLL Test/j2534_tests.cpp
View File

@ -123,7 +123,7 @@ namespace pandaJ2534DLLTest
TEST_METHOD(J2534DriverInit)
{
long err = LoadJ2534Dll("PandaJ2534DLL.dll");
long err = LoadJ2534Dll("PandaJ2534.dll");
Assert::IsTrue(err == 0, _T("Library failed to load properly. Check the export names and library location."));
}
@ -134,7 +134,7 @@ namespace pandaJ2534DLLTest
public:
TEST_METHOD_INITIALIZE(init) {
LoadJ2534Dll("PandaJ2534DLL.dll");
LoadJ2534Dll("PandaJ2534.dll");
}
TEST_METHOD_CLEANUP(deinit) {
@ -215,7 +215,7 @@ namespace pandaJ2534DLLTest
public:
TEST_METHOD_INITIALIZE(init) {
LoadJ2534Dll("PandaJ2534DLL.dll");
LoadJ2534Dll("PandaJ2534.dll");
}
TEST_METHOD_CLEANUP(deinit) {

BIN
drivers/windows/pandaJ2534DLL/J2534register_x64.reg
View File

Binary file not shown.

2
drivers/windows/pandaJ2534DLL/pandaJ2534DLL.vcxproj
View File

@ -45,10 +45,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)_$(PlatformShortName)\</OutDir>
<TargetName>pandaJ2534</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)_$(PlatformShortName)\</OutDir>
<TargetName>pandaJ2534</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

13
drivers/windows/panda_install.nsi
View File

@ -7,7 +7,8 @@
!include "x64.nsh"
!define MUI_ICON "panda.ico"
!define MUI_UNICON "panda.ico"
;NSIS is ignoring the unicon unless it is the same as the normal icon
;!define MUI_UNICON "panda_remove.ico"
;Properly display all languages (Installer will not work on Windows 95, 98 or ME!)
Unicode true
@ -83,7 +84,7 @@ Section "panda driver (required)"
; Write the uninstall keys for Windows
;WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "DisplayVersion" ""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "DisplayIcon" '"$INSTDIR\uninstall.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "DisplayIcon" '"$INSTDIR\pandaJ2534.dll"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "DisplayName" "panda J2534 Drivers"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "Publisher" "comma.ai"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "UninstallString" '"$INSTDIR\uninstall.exe"'
@ -113,11 +114,11 @@ Section "J2534 Driver"
SetOutPath $INSTDIR
File Release_x86\pandaJ2534DLL.dll
File Release_x86\pandaJ2534.dll
SetRegView 32
WriteRegDWORD HKLM "${J2534_Reg_Path}" "CAN" 00000001
WriteRegStr HKLM "${J2534_Reg_Path}" "FunctionLibrary" "$INSTDIR\pandaJ2534DLL.dll"
WriteRegStr HKLM "${J2534_Reg_Path}" "FunctionLibrary" "$INSTDIR\pandaJ2534.dll"
WriteRegDWORD HKLM "${J2534_Reg_Path}" "ISO15765" 00000001
WriteRegDWORD HKLM "${J2534_Reg_Path}" "J1850VPW" 00000000
WriteRegDWORD HKLM "${J2534_Reg_Path}" "SCI_A_ENGINE" 00000000
@ -147,7 +148,7 @@ Section "Uninstall"
; These lines just remove the inf backups.
Delete "$INSTDIR\driver\panda.inf"
Delete "$INSTDIR\driver\panda.cat"
RMDir "$INSTDIR\drivers"
RMDir "$INSTDIR\driver"
; Remove WinUSB driver library
Delete $SYSDIR\panda.dll
@ -172,7 +173,7 @@ Section "Uninstall"
; Remove files and uninstaller
Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\pandaJ2534DLL.dll"
Delete "$INSTDIR\pandaJ2534.dll"
; Remove directories used
RMDir "$INSTDIR"

BIN
drivers/windows/panda_remove.ico 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB