Updated files for v3.0.0

rbei-etas · Jul 1, 2016 · 285a451 · 285a451
1 parent 69530be
commit 285a451
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 50 deletions.
diff --git a/Documents/1 Development Environment/topics/nsis.dita b/Documents/1 Development Environment/topics/nsis.dita
@@ -31,7 +31,7 @@
       <p>The BUSMASTER install script is located under <filepath>Installation Setup\BUSMASTER Install Script.nsi</filepath>.</p>
       <p>The setup is depicted in the diagram below which shows how the installer build generation process is initiated by User and how the script accesses the artifacts from various locations under the <filepath>Sources</filepath> and <filepath>Documents\4 Help</filepath> folder. Prior to building the script, the artifacts needs to be generated by building the BUSMASTER application in Visual studio environment (VC++) and DITA-OT.<image href="../images/installation.png" placement="break"/></p>
       <title>Dependency</title>
-      <p>Install script expects Visual Studio 2012 Redistributable package to be available under the folder Tools\VC++ 2012 Redistributable\vcredist_x86.exe</p>
+      <p>Install script expects Visual Studio 2013 Redistributable package to be available under the folder Tools\VC++ 2013 Redistributable\vcredist_x86.exe</p>
     </section>
   </body>
 </topic>
diff --git a/Sources/BUSMASTER/Application/BUSMASTER.rc b/Sources/BUSMASTER/Application/BUSMASTER.rc
@@ -950,7 +950,6 @@ IDB_BMP_GRAPH_ELEMENTS  BITMAP                  "res\\GraphElements.bmp"
 IDR_BMP_CHECKBOX        BITMAP                  "res\\bmp_chec.bmp"
 IDB_BMP_FILTER          BITMAP                  "res\\Filter.bmp"
 IDB_BMPLOGO             BITMAP                  "res\\logo.bmp"
-IDB_LICENSEDLG          BITMAP                  "LockKey.bmp"
 IDB_MAINFRAME           BITMAP                  "Res\\Toolbar.bmp"
 IDB_MAINFRAME_HOT       BITMAP                  "Res\\Toolbar_hot.bmp"
 IDB_MAINFRAME_DISABLED  BITMAP                  "Res\\Toolbar_disabled.bmp"
@@ -1781,7 +1780,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "Invalid database filename"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "Message Name"
-    IDS_VERSION             "Ver 3.0.0"
+    IDS_VERSION             "Ver 3.0.0Nightly158"
     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"

diff --git a/Sources/BUSMASTER/Application/BUSMASTERJPN.rc b/Sources/BUSMASTER/Application/BUSMASTERJPN.rc
@@ -878,7 +878,6 @@ IDB_BMP_GRAPH_ELEMENTS  BITMAP                  "res\\GraphElements.bmp"
 IDR_BMP_CHECKBOX        BITMAP                  "res\\bmp_chec.bmp"
 IDB_BMP_FILTER          BITMAP                  "res\\Filter.bmp"
 IDB_BMPLOGO             BITMAP                  "res\\logo.bmp"
-IDB_LICENSEDLG          BITMAP                  "LockKey.bmp"
 IDR_NODE_SIMULATION     BITMAP                  "Res\\toolbar_user_prog.bmp"
 IDB_NODE_SIMULATION     BITMAP                  "Res\\toolbar_user_prog.bmp"
 IDB_NODE_SIMULATION_HOT BITMAP                  "Res\\toolbar_user_prog_Hot.bmp"

diff --git a/Sources/BUSMASTER/Application/Resource.h b/Sources/BUSMASTER/Application/Resource.h
@@ -30,7 +30,6 @@
 #define IDD_DLG_FIBEX_IMPORT            108
 #define IDI_ICON_J1939_LOG_DISABLED     109
 #define IDI_ICON_J1939_ONLINE_DISABLED  110
-#define IDB_LICENSEDLG                  110
 #define IDI_ICON_J1939_TRANSMIT_DISABLED 111
 #define IDR_CAN_MONITOR                 111
 #define IDI_ICON_CAN_CONNECT            112

diff --git a/Sources/BUSMASTER/BIN/Debug/DBManager.dll b/Sources/BUSMASTER/BIN/Debug/DBManager.dll
diff --git a/Sources/BUSMASTER/BIN/Release/DBManager.dll b/Sources/BUSMASTER/BIN/Release/DBManager.dll
diff --git a/Sources/Kernel/BusmasterDriverInterface/Include/BaseDIL_FLEXRAY.h b/Sources/Kernel/BusmasterDriverInterface/Include/BaseDIL_FLEXRAY.h
@@ -1,25 +1,8 @@
 /*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @brief Base class for CDIL_FLEXRAY class.
- * @author Arunkumar Karri
- * @copyright Copyright (c) 2011, Robert Bosch Engineering and Business Solutions. All rights reserved.
- *
- * Base class for CDIL_FLEXRAY class.
- */
+* Copyright Robert Bosch Engineering and Business Solutions Private Limited. All Rights Reserved.
+*/
+
+
 
 #pragma once
 

diff --git a/Sources/Kernel/BusmasterDriverInterface/Include/BaseDIL_FLEXRAY_Controller.h b/Sources/Kernel/BusmasterDriverInterface/Include/BaseDIL_FLEXRAY_Controller.h
@@ -1,25 +1,6 @@
 /*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @brief Interface file containing Base class which should be implemented for Flexray devices from different vendors
- * @author Arunkumar Karri
- * @copyright Copyright (c) 2011, Robert Bosch Engineering and Business Solutions. All rights reserved.
- *
- * Interface file containing Base class which should be implemented for Flexray devices from different vendors
- */
+* Copyright Robert Bosch Engineering and Business Solutions Private Limited. All Rights Reserved.
+*/
 
 #pragma once
 #include <windows.h>

diff --git a/Sources/Kernel/BusmasterDriverInterface/Include/FlexRayDriverDefines.h b/Sources/Kernel/BusmasterDriverInterface/Include/FlexRayDriverDefines.h
@@ -1,3 +1,7 @@
+/*
+* Copyright Robert Bosch Engineering and Business Solutions Private Limited. All Rights Reserved.
+*/
+
 #pragma once
 #include <string>
 #include "DeviceListInfo.h"

diff --git a/Sources/Kernel/ProtocolDefinitions/FlexRayDefines.h b/Sources/Kernel/ProtocolDefinitions/FlexRayDefines.h
@@ -1,3 +1,6 @@
+/*
+* Copyright Robert Bosch Engineering and Business Solutions Private Limited. All Rights Reserved.
+*/
 #pragma once
 
 #include "FlexRayEnums.h"

diff --git a/Sources/Kernel/ProtocolDefinitions/FlexRayEnums.h b/Sources/Kernel/ProtocolDefinitions/FlexRayEnums.h
@@ -1,7 +1,8 @@
-#pragma once
-
-
+/*
+* Copyright Robert Bosch Engineering and Business Solutions Private Limited. All Rights Reserved.
+*/
 
+#pragma once
 
 enum eFlexRayChannel
 {