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

J2534_WIN: Change DLL name to a more standard name.

master
Jessy Diamond Exum 2017-10-15 17:53:14 -07:00
parent c41d8230d7
commit b035df4121
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

8
drivers/windows/panda_install.nsi
View File

@ -84,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\pandaJ2534.dll"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${Install_Name}" "DisplayIcon" '"$INSTDIR\pandaJ2534_0404_32.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"'
@ -114,11 +114,11 @@ Section "J2534 Driver"
SetOutPath $INSTDIR
File Release_x86\pandaJ2534.dll
File Release_x86\pandaJ2534_0404_32.dll
SetRegView 32
WriteRegDWORD HKLM "${J2534_Reg_Path}" "CAN" 00000001
WriteRegStr HKLM "${J2534_Reg_Path}" "FunctionLibrary" "$INSTDIR\pandaJ2534.dll"
WriteRegStr HKLM "${J2534_Reg_Path}" "FunctionLibrary" "$INSTDIR\pandaJ2534_0404_32.dll"
WriteRegDWORD HKLM "${J2534_Reg_Path}" "ISO15765" 00000001
WriteRegDWORD HKLM "${J2534_Reg_Path}" "J1850VPW" 00000000
WriteRegDWORD HKLM "${J2534_Reg_Path}" "SCI_A_ENGINE" 00000000
@ -173,7 +173,7 @@ Section "Uninstall"
; Remove files and uninstaller
Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\pandaJ2534.dll"
Delete "$INSTDIR\pandaJ2534_0404_32.dll"
; Remove directories used
RMDir "$INSTDIR"