Changes for v2.6.2

iotmember · May 20, 2015 · 724cd46 · 724cd46
1 parent 1ff3b54
commit 724cd46
Show file tree

Hide file tree

Showing 51 changed files with 451 additions and 199 deletions.
diff --git a/Documents/1 Development Environment/topics/nsis.dita b/Documents/1 Development Environment/topics/nsis.dita
@@ -24,7 +24,7 @@
     </section>
     <section>
       <title>Configuration</title>
-      <p>There is no specific configuration necessary.</p>
+      <p>Download nsProcess.zip from <xref href="http://nsis.sourceforge.net/NsProcess_plugin" scope="external">http://nsis.sourceforge.net/NsProcess_plugin</xref>. Extract and Copy nsProcess.nsh to <filepath>%ProgramFiles%\NSIS\Include.</filepath></p>
     </section>
     <section>
       <title>Usage</title>

diff --git a/Documents/4 Help_New/help.ditamap b/Documents/4 Help_New/help.ditamap
@@ -37,7 +37,8 @@
     <topicref href="topics/filter.dita" type="topic"/>
     <topicref href="topics/node_simulation.dita" type="topic"/>
     <topicref href="topics/node_simulation_examples.dita" type="type"/>
-    <topicref href="topics/MinGW Installation.dita" type="topic"/>
+    <topicref href="topics/MinGW_Installation.dita" type="topic"/>
+	<topicref href="topics/MinGW_Installation_TDM.dita" type="topic"/>
     <topicref href="topics/execute_handlers.dita" type="topic"/>
     <topicref href="topics/database_editor.dita" type="topic"/>
     <topicref href="topics/message_window.dita" type="topic"/>

diff --git a/Documents/4 Help_New/images/GCC_Compiler_Selection.bmp b/Documents/4 Help_New/images/GCC_Compiler_Selection.bmp
diff --git a/Documents/4 Help_New/images/TDM-GCC1.PNG b/Documents/4 Help_New/images/TDM-GCC1.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC2.PNG b/Documents/4 Help_New/images/TDM-GCC2.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC3.PNG b/Documents/4 Help_New/images/TDM-GCC3.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC4.PNG b/Documents/4 Help_New/images/TDM-GCC4.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC5.PNG b/Documents/4 Help_New/images/TDM-GCC5.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC6.PNG b/Documents/4 Help_New/images/TDM-GCC6.PNG
diff --git a/Documents/4 Help_New/images/TDM-GCC7.PNG b/Documents/4 Help_New/images/TDM-GCC7.PNG
diff --git a/Documents/4 Help_New/topics/MinGW Installation.dita b/Documents/4 Help_New/topics/MinGW Installation.dita
diff --git a/Documents/4 Help_New/topics/MinGW_Installation.dita b/Documents/4 Help_New/topics/MinGW_Installation.dita
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
 <topic id="what_is_new" xml:lang="en-us">
-  <title>MinGW Installation</title>
+  <title>MinGW Installation using GCC Installer</title>
   <prolog>
     <author>Saravanan</author>
     <copyright>
@@ -17,10 +17,10 @@
   <body>
     <section>
       <title>MinGW Installation</title>
-      <p>The following steps should be followed to install MinGW folder and use it to successfully compile  CPP files in   Node Simulation  using BUSMASTER.</p>
+      <p>The following steps should be followed to install MinGW  and use it to successfully compile  CPP files in   Node Simulation  using BUSMASTER.</p>
       <ul>
         <li>Download latest mingw executable from the following link <xref href="http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/" scope="external"/> and then use it to download the actual MinGW and copy the MinGW folder to C: drive</li>
-        <li>During MinGW installation, please choose the C++ compiler in component list as shown in the screen below as it is not selected by default:</li>
+        <li>During MinGW installation, please choose the packages as shown in the screen below as it is not selected by default:</li>
       </ul>
       <image href="../images/GCC_Compiler_Selection.bmp" alt="GCC C++ Compiler Selection" placement="break"/>
       <ul>

diff --git a/Documents/4 Help_New/topics/MinGW_Installation_TDM.dita b/Documents/4 Help_New/topics/MinGW_Installation_TDM.dita
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "http://docs.oasis-open.org/dita/v1.1/OS/dtd/topic.dtd" []>
+<topic id="what_is_new" xml:lang="en-us">
+  <title>MinGW Installation using TDM-GCC Installer</title>
+  <prolog>
+    <author>Shailesh H</author>
+    <copyright>
+      <copyryear year="2012"/>
+      <copyrholder>ROBERT BOSCH ENGINEERING AND BUSINESS SOLUTIONS LIMITED</copyrholder>
+    </copyright>
+    <metadata>
+      <keywords>
+        <indexterm>MinGW</indexterm>
+      </keywords>
+    </metadata>
+  </prolog>
+  <body>
+    <section>
+      <title>MinGW Installation</title>
+      <p>The following steps should be followed to Download and install MinGW using TDM-GCC Installer.</p>
+      <ul>
+        <li>Download the TDM-GCC from the following link <xref href="http://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm-gccwebdl. exe/download" scope="external"/></li>
+        <li>Run the installer. Following image will show the first screen of the installer. </li>
+        <li>
+          <image href="../images/TDM-GCC1.PNG"/>
+        </li>
+      </ul>
+      <ul>
+        <li>Click on the create button, if you are installing the first time this will go to the following screen.</li>
+        <li>
+          <image href="../images/TDM-GCC2.PNG"/>
+        </li>
+      </ul>
+      <ul>
+        <li>Select MingW/TDM(32-bit) option and click Next, to get to the following screen.</li>
+        <li>
+          <image href="../images/TDM-GCC3.PNG"/>
+        </li>
+        <li>Click Next and provide path to install the GCC . GCC has some problems if it is installed in a folder name having space. So it is recommended to install in path like C:\MinGw. Make sure the folder was empty.</li>
+        <li>
+          <image href="../images/TDM-GCC4.PNG"/>
+        </li>
+        <li>Click Next</li>
+        <li>
+          <image href="../images/TDM-GCC5.PNG"/>
+        </li>
+        <li>Click Next and select MingW Stable, C\C++ option as shown in the below image.</li>
+        <li>
+          <image href="../images/TDM-GCC6.PNG"/>
+        </li>
+        <li>Make sure &apos;Add to path&apos; option is selected. Click to install.</li>
+        <li>
+          <image href="../images/TDM-GCC7.PNG"/>
+        </li>
+      </ul>
+    </section>
+  </body>
+</topic>
diff --git a/Documents/4 Help_New/topics/what_is_new.dita b/Documents/4 Help_New/topics/what_is_new.dita
@@ -15,6 +15,11 @@
     </metadata>
   </prolog>
   <body>
+    <p><b>2.6.2</b></p>
+    <p>Following features are added:</p>
+    <p><ul>
+        <li>Bug Fixes</li>
+      </ul></p>
     <p><b>2.6.1</b></p>
     <p>Following features are added:</p>
     <p><ul>

diff --git a/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi b/Installation Setup/BUSMASTER INSTALL SCRIPT.nsi
@@ -719,6 +719,15 @@ SectionGroupEnd
 
 ; Uninstall section here...
 Section "Uninstall"
+  ${Do}
+  ${nsProcess::FindProcess} "BUSMASTER.exe" $R0
+  ${If} $R0 == 0
+  MessageBox MB_OK|MB_ICONSTOP "Please close all instances of BUSMASTER and Click 'OK'"
+  ${EndIf}
+  ${LoopUntil} $R0 != 0
+  ${Do}
+  ${nsProcess::FindProcess} "BusEmulation.exe" $R0
+  ${LoopUntil} $R0 != 0
   ; Unregister server
   SetOutPath $INSTDIR
   ExecWait 'BusEmulation.exe /unregserver'

diff --git a/Installation Setup/NSISHeaders.nsh b/Installation Setup/NSISHeaders.nsh
@@ -25,8 +25,10 @@
 !include nsDialogs.nsh
 !include LogicLib.nsh
 !include "DotNetVer.nsh"
+!include "nsProcess.nsh"
+!include "LogicLib.nsh"
 
 !define StrStr "!insertmacro StrStr"
 
 /* BUSMASTER Version to be updated for every release */
-!define VERSION "2.6.1"
+!define VERSION "2.6.2"
diff --git a/Sources/Application/BUSMASTER.rc b/Sources/Application/BUSMASTER.rc
@@ -1853,7 +1853,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "Invalid database filename"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "Message Name"
-    IDS_VERSION             "Ver 2.6.1"
+    IDS_VERSION             "Ver 2.6.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\tF2"

diff --git a/Sources/Application/BUSMASTERJPN.rc b/Sources/Application/BUSMASTERJPN.rc
@@ -678,13 +678,13 @@ BEGIN
             VALUE "Comments", "Public Copy"
             VALUE "CompanyName", "RBEI, Bangalore"
             VALUE "FileDescription", "BUSMASTER MFC Application"
-            VALUE "FileVersion", "Ver 2.6.1"
+            VALUE "FileVersion", "Ver 2.6.2"
             VALUE "InternalName", "BUSMASTER"
             VALUE "LegalCopyright", "Copyright (C) 2011"
             VALUE "LegalTrademarks", "BOSCH"
             VALUE "OriginalFilename", "BUSMASTER.EXE"
             VALUE "ProductName", "BUSMASTER Application"
-            VALUE "ProductVersion", "Ver 2.6.1"
+            VALUE "ProductVersion", "Ver 2.6.2"
         END
     END
     BLOCK "VarFileInfo"
@@ -1815,7 +1815,7 @@ BEGIN
     IDS_INVALID_DB_PROMPT   "�����ȃf�[�^�x�[�X�t�@�C����"
     ID_ACTIVE_DATABASE_NAME " "
     IDS_MESSAGE_NAME        "���b�Z�[�W��"
-    IDS_VERSION             "Ver 2.6.1"
+    IDS_VERSION             "Ver 2.6.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"

diff --git a/Sources/Application/BusStatisticCAN.cpp b/Sources/Application/BusStatisticCAN.cpp
@@ -24,7 +24,8 @@
 #include "Include/Can_Error_Defs.h"
 #include "DIL_Interface/DIL_Interface_Extern.h"
 #include "TimeManager.h"
-
+#include "BUSMASTER.h"   // App class header
+extern CCANMonitorApp theApp;
 //Can interface to Bus Statistics
 void* CBusStatisticCAN:: sm_pouBSCan;
 
@@ -1137,6 +1138,13 @@ void CBusStatisticCAN::vCalculateBusParametres(void)
 {
     EnterCriticalSection(&m_omCritSecBS);
     vCalculateDiffTime();
+    CFlags* pouFlags = nullptr;
+    pouFlags = theApp.pouGetFlagsPtr();
+    BOOL bIsConnected = FALSE;
+    if (nullptr != pouFlags)
+    {
+        bIsConnected = pouFlags->nGetFlagStatus(CONNECTED);
+    }
 
     for(int nChannelIndex =0; nChannelIndex <defNO_OF_CHANNELS; nChannelIndex++)
     {
@@ -1146,76 +1154,71 @@ void CBusStatisticCAN::vCalculateBusParametres(void)
             m_sBusStatistics[ nChannelIndex ].m_unTotalTxMsgCount +
             m_sBusStatistics[ nChannelIndex ].m_unTotalRxMsgCount;
         //***** Total Message Rate *****//
-
-        m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =
-            m_sBusStatistics[ nChannelIndex ].m_unTotalMsgCount -
-            m_sPrevStatData[ nChannelIndex ].m_unTotalMsgCount;
-
-        FLOAT msgPerSec= (m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond /(FLOAT) m_dDiffTime );
-        if( msgPerSec > 0.50 && msgPerSec < 1)
-        {
-            m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =1;
-
-        }
-        else
+        if(bIsConnected)
         {
             m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =
-                static_cast<UINT>
-                (m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond / m_dDiffTime );
+                m_sBusStatistics[ nChannelIndex ].m_unTotalMsgCount -
+                m_sPrevStatData[ nChannelIndex ].m_unTotalMsgCount;
 
+            FLOAT msgPerSec= (m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond /(FLOAT) m_dDiffTime );
+            if( msgPerSec > 0.50 && msgPerSec < 1)
+            {
+                m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =1;
+            }
+            else
+            {
+                m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =
+                    static_cast<UINT>
+                    (m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond / m_dDiffTime );
+            }
         }
 
-
-        /* m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =
-             m_sBusStatistics[ nChannelIndex ].m_unTotalMsgCount -
-             m_sPrevStatData[ nChannelIndex ].m_unTotalMsgCount;
-         m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond =
-             static_cast<UINT>
-             (m_sBusStatistics[ nChannelIndex ].m_unMsgPerSecond / m_dDiffTime );*/
-
-
-
         // Calculate Error Count & Rate
         m_sBusStatistics[ nChannelIndex ].m_unErrorTotalCount =
             m_sBusStatistics[ nChannelIndex ].m_unErrorRxCount +
             m_sBusStatistics[ nChannelIndex ].m_unErrorTxCount;
-        m_sBusStatistics[ nChannelIndex ].m_dErrorRate =
-            m_sBusStatistics[ nChannelIndex ].m_unErrorTotalCount -
-            m_sPrevStatData[ nChannelIndex ].m_unErrorTotalCount;
-        // Transmitted messages
-        // Calculate Total Tx Message Rate
-        m_sBusStatistics[nChannelIndex].m_dTotalTxMsgRate =
-            (m_sBusStatistics[nChannelIndex].m_unTotalTxMsgCount -
-             m_sPrevStatData[nChannelIndex].m_unTotalTxMsgCount);
-        // Calculate STD Tx Message Rate
-        m_sBusStatistics[ nChannelIndex ].m_dTxSTDMsgRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unTxSTDMsgCount -
-             m_sPrevStatData[ nChannelIndex ].m_unTxSTDMsgCount);
-        // Calculate Extended Tx Message Rate
-        m_sBusStatistics[ nChannelIndex ].m_dTxEXTMsgRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unTxEXTDMsgCount -
-             m_sPrevStatData[ nChannelIndex ].m_unTxEXTDMsgCount);
-        // Calculate Tx Error Rate
-        m_sBusStatistics[ nChannelIndex ].m_dErrorTxRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unErrorTxCount -
-             m_sPrevStatData[ nChannelIndex ].m_unErrorTxCount);
-        // Received messages
-        // Calculate Total Rx Message Rate
-        m_sBusStatistics[nChannelIndex].m_dTotalRxMsgRate =
-            (m_sBusStatistics[nChannelIndex].m_unTotalRxMsgCount -
-             m_sPrevStatData[nChannelIndex].m_unTotalRxMsgCount);
-        // Calculate STD Rx Message Rate
-        m_sBusStatistics[ nChannelIndex ].m_dRxSTDMsgRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unRxSTDMsgCount -
-             m_sPrevStatData[ nChannelIndex ].m_unRxSTDMsgCount);
-        // Calculate Extended Rx Message Rate
-        m_sBusStatistics[ nChannelIndex ].m_dRxEXTMsgRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unRxEXTDMsgCount -
-             m_sPrevStatData[ nChannelIndex ].m_unRxEXTDMsgCount);
-        // Calculate Rx Error Rate
-        m_sBusStatistics[ nChannelIndex ].m_dErrorRxRate =
-            (m_sBusStatistics[ nChannelIndex ].m_unErrorRxCount -
-             m_sPrevStatData[ nChannelIndex ].m_unErrorRxCount);
+
+        if(bIsConnected)
+        {
+            m_sBusStatistics[ nChannelIndex ].m_dErrorRate =
+                m_sBusStatistics[ nChannelIndex ].m_unErrorTotalCount -
+                m_sPrevStatData[ nChannelIndex ].m_unErrorTotalCount;
+            // Transmitted messages
+            // Calculate Total Tx Message Rate
+            m_sBusStatistics[nChannelIndex].m_dTotalTxMsgRate =
+                (m_sBusStatistics[nChannelIndex].m_unTotalTxMsgCount -
+                 m_sPrevStatData[nChannelIndex].m_unTotalTxMsgCount);
+            // Calculate STD Tx Message Rate
+            m_sBusStatistics[ nChannelIndex ].m_dTxSTDMsgRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unTxSTDMsgCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unTxSTDMsgCount);
+            // Calculate Extended Tx Message Rate
+            m_sBusStatistics[ nChannelIndex ].m_dTxEXTMsgRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unTxEXTDMsgCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unTxEXTDMsgCount);
+            // Calculate Tx Error Rate
+            m_sBusStatistics[ nChannelIndex ].m_dErrorTxRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unErrorTxCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unErrorTxCount);
+            // Received messages
+            // Calculate Total Rx Message Rate
+            m_sBusStatistics[nChannelIndex].m_dTotalRxMsgRate =
+                (m_sBusStatistics[nChannelIndex].m_unTotalRxMsgCount -
+                 m_sPrevStatData[nChannelIndex].m_unTotalRxMsgCount);
+            // Calculate STD Rx Message Rate
+            m_sBusStatistics[ nChannelIndex ].m_dRxSTDMsgRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unRxSTDMsgCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unRxSTDMsgCount);
+            // Calculate Extended Rx Message Rate
+            m_sBusStatistics[ nChannelIndex ].m_dRxEXTMsgRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unRxEXTDMsgCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unRxEXTDMsgCount);
+            // Calculate Rx Error Rate
+            m_sBusStatistics[ nChannelIndex ].m_dErrorRxRate =
+                (m_sBusStatistics[ nChannelIndex ].m_unErrorRxCount -
+                 m_sPrevStatData[ nChannelIndex ].m_unErrorRxCount);
+        }
+
         SERROR_CNT sErrorCounter;
         sErrorCounter.m_ucRxErrCount = 0;
         sErrorCounter.m_ucTxErrCount = 0;
@@ -1277,9 +1280,12 @@ void CBusStatisticCAN::vCalculateBusParametres(void)
         m_sBusStatistics[ nChannelIndex ].m_dTotalBusLoad += dBusLoad;
         // Increament samples
         // Calculate Avarage bus load
-        m_sBusStatistics[ nChannelIndex ].m_dAvarageBusLoad =
-            m_sBusStatistics[ nChannelIndex ].m_dTotalBusLoad /
-            m_sBusStatistics[ nChannelIndex ].m_nSamples;
+        if(bIsConnected)
+        {
+            m_sBusStatistics[ nChannelIndex ].m_dAvarageBusLoad =
+                m_sBusStatistics[ nChannelIndex ].m_dTotalBusLoad /
+                m_sBusStatistics[ nChannelIndex ].m_nSamples;
+        }
         // Initialise previous values with current values.
         m_unPrevStandardCount[ nChannelIndex ] =
             m_sBusStatistics[ nChannelIndex ].m_unRxSTDMsgCount +

diff --git a/Sources/Application/BusStatisticCAN.h b/Sources/Application/BusStatisticCAN.h
@@ -29,6 +29,8 @@
 #include "DIL_Interface/BaseDIL_CAN.h"
 #include "BaseBusStatisticCAN.h"
 
+#include "Flags.h"
+
 class CBusStatisticCAN : public CBaseBusStatisticCAN
 {
     //Attributes