updated version

Sources/Application/BUSMASTER.rc

@@ -741,13 +741,13 @@ BEGIN
             VALUE "Comments", "Public Copy"
             VALUE "CompanyName", "RBEI, Bangalore"
             VALUE "FileDescription", "BUSMASTER MFC Application"
-            VALUE "FileVersion", "Ver 2.2.0Beta2"
+            VALUE "FileVersion", "Ver 2.2.0"
             VALUE "InternalName", "BUSMASTER"
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "LegalTrademarks", "BOSCH"
             VALUE "OriginalFilename", "BUSMASTER.EXE"
             VALUE "ProductName", "BUSMASTER Application"
-            VALUE "ProductVersion", "Ver 2.2.0Beta2"
+            VALUE "ProductVersion", "Ver 2.2.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1800,7 +1800,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "Invalid database filename"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "Message Name"
-    IDS_VERSION             "Ver 2.2.0Beta2"
+    IDS_VERSION             "Ver 2.2.0"
     IDS_HEADER              "***NOTE: PLEASE DO NOT EDIT THIS DOCUMENT***\n\n\n***[START LOGGING SESSION]***\n"
     IDS_FOOTER              "***[END LOGGING SESSION]***"
     IDS_CONNECT             "&Connect\tF2"

Sources/BUSMASTER.sln

@@ -154,6 +154,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAN_ETAS_BOA_2_0", "CAN_ETA
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LIN_ETAS_BOA", "LIN_ETAS_BOA\LIN_ETAS_BOA.vcxproj", "{3765F36A-696A-4302-BED9-56F156280EA2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CAN_PEAK_USB", "CAN_PEAK_USB\CAN_PEAK_USB.vcxproj", "{D6199E74-D58C-4981-9B7B-E2E551163192}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		busmaster_debug|Win32 = busmaster_debug|Win32
@@ -753,6 +755,20 @@ Global
 		{3765F36A-696A-4302-BED9-56F156280EA2}.Unicode Release MinSize|Win32.Build.0 = Release|Win32
 		{3765F36A-696A-4302-BED9-56F156280EA2}.Unicode Release|Win32.ActiveCfg = Release|Win32
 		{3765F36A-696A-4302-BED9-56F156280EA2}.Unicode Release|Win32.Build.0 = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.busmaster_debug|Win32.ActiveCfg = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.busmaster_debug|Win32.Build.0 = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Debug|Win32.Build.0 = Debug|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Release|Win32.ActiveCfg = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Release|Win32.Build.0 = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Template|Win32.ActiveCfg = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Template|Win32.Build.0 = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Debug|Win32.Build.0 = Debug|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Release MinSize|Win32.ActiveCfg = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Release MinSize|Win32.Build.0 = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Release|Win32.ActiveCfg = Release|Win32
+		{D6199E74-D58C-4981-9B7B-E2E551163192}.Unicode Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Sources/CAN_PEAK_USB/CAN_PEAK_USB_Extern.h

@@ -3,22 +3,22 @@
   FileName      :  CAN_PEAK_USB_Extern.h
   Description   :  Exports API functions for PEAK CAN Hardware interface
   $Log:   X:/Archive/Sources/DIL/DIL_CAN/CAN_PEAK_USB_Extern.h_v  $
- *
+ * 
  *    Rev 1.3   27 Apr 2011 19:08:44   CANMNTTM
  * GetTimeModeMapping is updated for QueryPerformance counter
- *
+ * 
  *    Rev 1.2   15 Apr 2011 18:47:56   CANMNTTM
  * Added RBEI Copyright information.
- *
+ * 
  *    Rev 1.1   23 Mar 2011 14:54:48   CANMNTTM
  * Support upto 32 channels
- *
+ * 
  *    Rev 1.0   16 Aug 2010 21:56:32   rac2kor
- *
-
+ *  
+ 
   Author(s)     :  Pradeep Kadoor
   Date Created  :  15/04/2010
-  Modified By   :
+  Modified By   :                             
   Copyright (c) 2011, Robert Bosch Engineering and Business Solutions.  All rights reserved.
 *****************************************************************************/
 #if !defined CAN_PEAK_USB_EXTERN_H__INCLUDED_
@@ -40,8 +40,8 @@
 extern "C" {  // only need to export C interface if used by C++ source code
 #endif
 
-    /*  Exported function list */
-    USAGEMODE HRESULT GetIDIL_CAN_Controller(void** ppvInterface);
+/*  Exported function list */
+USAGEMODE HRESULT GetIDIL_CAN_Controller(void** ppvInterface);
 
 
 #ifdef __cplusplus

Sources/Format Converter/AscLogConverter/Asc_Log_Parser.y

@@ -77,7 +77,7 @@ int nConvertFile(FILE* fpInputFile, FILE* fpOutputFile)
 }
 int nAddFunctionHeader(char* pchDay, int nMonth, char* pchYear, int nHour, int nMins, int nSec)
 {
-	fprintf(yyout, "***BUSMASTER Ver 2.0.0***\n");
+	fprintf(yyout, "***BUSMASTER Ver 2.2.0***\n");
 	fprintf(yyout, "***PROTOCOL CAN***\n");
     fprintf(yyout, "***NOTE: PLEASE DO NOT EDIT THIS DOCUMENT***\n");
     fprintf(yyout, "***[START LOGGING SESSION]***\n");

Sources/FrameProcessor/LogObjectCAN.cpp

@@ -27,7 +27,7 @@
 #include "LogObjectCAN.h"            // For CLogObjectCAN class declaration
 
 
-#define CAN_VERSION           "***BUSMASTER Ver 2.2.0Beta1***"
+#define CAN_VERSION           "***BUSMASTER Ver 2.2.0***"
 #define CAN_LOG_HEADER        "***NOTE: PLEASE DO NOT EDIT THIS DOCUMENT***"
 #define CAN_LOG_START         "***[START LOGGING SESSION]***"
 #define CAN_LOG_STOP          "***[STOP LOGGING SESSION]***"