BusMaster v3.2.2 changes

rbei-etas · Oct 30, 2017 · de29ec1 · de29ec1
1 parent ea27b6e
commit de29ec1
Show file tree

Hide file tree

Showing 52 changed files with 27,055 additions and 1,045 deletions.
diff --git a/Documents/1 Development Environment/images/Thumbs.db b/Documents/1 Development Environment/images/Thumbs.db
diff --git a/Documents/Logo/Thumbs.db b/Documents/Logo/Thumbs.db
diff --git a/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi b/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi
@@ -35,8 +35,8 @@
 !define MUI_UNICON "..\Sources\BUSMASTER\Application\Res\Uninstaller.ico"
 
 !define Flexray_Key "1"
-!define Instruments_Key "1"
-!define CANFD_Key "1"
+!define Instruments_Key "2"
+!define CANFD_Key "2"
 
 !macro StrStr ResultVar String SubString
   Push `${String}`
@@ -335,6 +335,12 @@ Section "BUSMASTER"
 
   ; If the file exists delete it before installing
   
+  ;DBCache
+  ReadEnvStr $R7 "ALLUSERSPROFILE"
+  StrCpy $1 "\BUSMASTER\General\DBCache"
+  StrCpy $R7 $R7$1
+  RMDir /r  "$R7"
+  
   ; Kernel
   Delete "$INSTDIR\BusmasterKernel.dll"
   
@@ -552,7 +558,7 @@ Section "BUSMASTER"
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\BlfLibrary.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\BlfLogConverter.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\CAPL2CConverter.dll
-  File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\CAPL2CConverterJPN.dll
+  ;File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\CAPL2CConverterJPN.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\DBC2DBFConverter.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\DBC2DBFConverterLibrary.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\DBF2DBCConverter.dll
@@ -561,15 +567,15 @@ Section "BUSMASTER"
   File ..\Sources\BUSMASTER\BIN\Release\libxml2.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\LogAscConverter.dll
   File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\LogToExcelConverter.dll
-  File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\LogToExcelConverterJPN.dll
+  ;File ..\Sources\BUSMASTER\BIN\Release\ConverterPlugins\LogToExcelConverterJPN.dll
   File ..\Sources\BUSMASTER\BIN\Release\zlib1.dll
 
   SetOutPath $INSTDIR
   ; Japanese lib files
-  File /r ..\Sources\BUSMASTER\BIN\Release\JPN
+  ;File /r ..\Sources\BUSMASTER\BIN\Release\JPN
 
   ; Japanese Localization folder
-  File /r ..\Sources\BUSMASTER\Localization
+  ;File /r ..\Sources\BUSMASTER\Localization
 
   ; Help
   ;File /oname=BUSMASTER.chm "..\Documents\4 Help\out\help.chm"

diff --git a/Installation Setup/NSISHeaders.nsh b/Installation Setup/NSISHeaders.nsh
@@ -31,4 +31,4 @@
 !define StrStr "!insertmacro StrStr"
 
 /* BUSMASTER Version to be updated for every release */
-!define VERSION "3.2.1"
+!define VERSION "3.2.2"
diff --git a/Sources/BUSMASTER/Application/BUSMASTER.rc b/Sources/BUSMASTER/Application/BUSMASTER.rc
@@ -718,13 +718,13 @@ BEGIN
             VALUE "Comments", "Public Copy"
             VALUE "CompanyName", "RBEI, Bangalore"
             VALUE "FileDescription", "BUSMASTER MFC Application"
-            VALUE "FileVersion", "Ver 3.2.1"
+            VALUE "FileVersion", "Ver 3.2.2"
             VALUE "InternalName", "BUSMASTER"
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "LegalTrademarks", "BOSCH"
             VALUE "OriginalFilename", "BUSMASTER.EXE"
             VALUE "ProductName", "BUSMASTER Application"
-            VALUE "ProductVersion", "Ver 3.2.1"
+            VALUE "ProductVersion", "Ver 3.2.2"
         END
     END
     BLOCK "VarFileInfo"
@@ -952,6 +952,7 @@ IDB_TEMP_BITMAP         BITMAP                  "Res\\Temp.bmpx"
 IDB_TOOLS_CATEGORY      BITMAP                  "Res\\TOOLS_ICON.bmpx"
 IDB_VIEW_CATEGORY       BITMAP                  "Res\\VIEW_ICON.bmpx"
 IDB_PLUGIN_IMAGE_MISS   BITMAP                  "Res\\PluginImageMissing.bmpx"
+IDB_HELP                BITMAP                  "Res\\HELP_ICON.bmpx"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1601,7 +1602,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "Invalid database filename"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "Message Name"
-    IDS_VERSION             "Ver 3.2.1"
+    IDS_VERSION             "Ver 3.2.2"
     IDS_HEADER              "***NOTE: PLEASE DO NOT EDIT THIS DOCUMENT***\n\n\n***[START LOGGING SESSION]***\n"
     IDS_FOOTER              "***[END LOGGING SESSION]***"
     IDS_CONNECT             "Connect"

diff --git a/Sources/BUSMASTER/Application/BUSMASTER.tlb b/Sources/BUSMASTER/Application/BUSMASTER.tlb
diff --git a/Sources/BUSMASTER/Application/BUSMASTER.vcxproj b/Sources/BUSMASTER/Application/BUSMASTER.vcxproj
@@ -397,6 +397,7 @@ copy ".\Res\Splsh16.bmp" "$(SolutionDir)\bin\$(OutDir)Splsh16.bmp"
       </BrowseInformation>
     </ClCompile>
     <ClCompile Include="CANSignalExtractor.cpp" />
+    <ClCompile Include="ClientManager.cpp" />
     <ClCompile Include="CNVTCImageList.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -542,6 +543,8 @@ copy ".\Res\Splsh16.bmp" "$(SolutionDir)\bin\$(OutDir)Splsh16.bmp"
     </ClCompile>
     <ClCompile Include="J1939TimeOutCfg.cpp" />
     <ClCompile Include="LINBusStatisticsDlg.cpp" />
+    <ClCompile Include="LINSignalExtractor.cpp" />
+
     <ClCompile Include="MainFrm.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -967,6 +970,7 @@ copy ".\Res\Splsh16.bmp" "$(SolutionDir)\bin\$(OutDir)Splsh16.bmp"
     <ClInclude Include="BusStatisticsDlg.h" />
     <ClInclude Include="CANSignalExtractor.h" />
     <ClInclude Include="CFilesDefs_CAN.h" />
+    <ClInclude Include="ClientManager.h" />
     <ClInclude Include="CNVTCImageList.h" />
     <ClInclude Include="CNVTCToolBar.h" />
     <ClInclude Include="common.h" />
@@ -997,6 +1001,8 @@ copy ".\Res\Splsh16.bmp" "$(SolutionDir)\bin\$(OutDir)Splsh16.bmp"
     <ClInclude Include="J1939TimeOutCfg.h" />
     <ClInclude Include="LINBusStatisticsDlg.h" />
     <ClInclude Include="LinChannelParam.h" />
+    <ClInclude Include="LINSignalExtractor.h" />
+
     <ClInclude Include="MainFrm.h" />
     <ClInclude Include="MDIChildBase.h" />
     <ClInclude Include="MessageAttrib.h" />
@@ -1079,6 +1085,7 @@ copy ".\Res\Splsh16.bmp" "$(SolutionDir)\bin\$(OutDir)Splsh16.bmp"
     <None Include="Res\hdrdown.bmp" />
     <None Include="Res\hdrup.bmp" />
     <None Include="Res\Help.ico" />
+    <None Include="Res\HELP_ICON.bmpx" />
     <None Include="Res\ico_send.ico" />
     <None Include="Res\J1939TxWnd.bmp" />
     <None Include="Res\j1939_Icon1.bmpx" />

diff --git a/Sources/BUSMASTER/Application/BUSMASTER.vcxproj.filters b/Sources/BUSMASTER/Application/BUSMASTER.vcxproj.filters
@@ -258,6 +258,13 @@
     <ClCompile Include="ImportLogToolbar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ClientManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+
+    <ClCompile Include="LINSignalExtractor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="BUSMASTER.idl">
@@ -576,6 +583,13 @@
     <ClInclude Include="IMenuInterface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ClientManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+
+    <ClInclude Include="LINSignalExtractor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="resource.hm">
@@ -668,6 +682,7 @@
     <None Include="Res\TOOLS_ICON.bmpx" />
     <None Include="Res\VIEW_ICON.bmpx" />
     <None Include="Res\PluginImageMissing.bmpx" />
+    <None Include="Res\HELP_ICON.bmpx" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\MsgWndImportLog.bmp">

diff --git a/Sources/BUSMASTER/Application/BUSMASTERJPN.rc b/Sources/BUSMASTER/Application/BUSMASTERJPN.rc
@@ -659,13 +659,13 @@ BEGIN
             VALUE "Comments", "Public Copy"
             VALUE "CompanyName", "RBEI, Bangalore"
             VALUE "FileDescription", "BUSMASTER MFC Application"
-            VALUE "FileVersion", "Ver 3.2.1"
+            VALUE "FileVersion", "Ver 3.2.2"
             VALUE "InternalName", "BUSMASTER"
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "LegalTrademarks", "BOSCH"
             VALUE "OriginalFilename", "BUSMASTER.EXE"
             VALUE "ProductName", "BUSMASTER Application"
-            VALUE "ProductVersion", "Ver 3.2.1"
+            VALUE "ProductVersion", "Ver 3.2.2"
         END
     END
     BLOCK "VarFileInfo"
@@ -1607,7 +1607,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "�����ȃf�[�^�x�[�X�t�@�C����"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "���b�Z�[�W��"
-    IDS_VERSION             "Ver 3.2.1"
+    IDS_VERSION             "Ver 3.2.2"
     IDS_HEADER              "***����: ���̃h�L�������g���C�����Ȃ��ł�������***\n\n\n***[���M���O�Z�b�V�����̊J�n]***\n"
     IDS_FOOTER              "***[���M���O�Z�b�V�����̏I��]***"
     IDS_CONNECT             "&�ڑ�\tF2"