Merge pull request #5 from agomez08/master

Adding frame counters and bus load measurement for CAN
NIVeriStandAdd-Ons · Mar 4, 2020 · d20ca37 · d20ca37
2 parents 0915af2 + d7bb5e5
commit d20ca37
Show file tree

Hide file tree

Showing 84 changed files with 1,823 additions and 1,568 deletions.
diff --git a/AutoBuild (LabVIEW CLI).bat b/AutoBuild (LabVIEW CLI).bat
@@ -4,7 +4,7 @@ set "BuildProject=Source\NI-XNET Monitor Custom Device.lvproj"
 set "BuildProjectTargetsList="My Computer" "RT PXI Target" "RT CompactRIO Target" "RT CompactRIO Target - Linux ARM" "RT CompactRIO Target - Linux x64""
 
 set LabVIEWCLI=C:\Program Files (x86)\National Instruments\Shared\LabVIEW CLI\LabVIEWCLI.exe
-set LabVIEWPath="C:\Program Files (x86)\National Instruments\LabVIEW 2017\LabVIEW.exe"
+set LabVIEWPath="C:\Program Files (x86)\National Instruments\LabVIEW 2018\LabVIEW.exe"
 
 @echo off
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,6 +2,6 @@
 //Leave the above line alone.  It identifies this as a groovy script.
 @Library('vs-common-build') _
 
-def lvVersions = ['2019','2018','2017']
+def lvVersions = ['2019','2018']
 
 ni.vsbuild.PipelineExecutor.execute(this, lvVersions)
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # NI-XNET-Monitor-Custom-Device
 
-The NI-XNET Monitor Custom Device allows a user to run subordinate XNET session for each port in the system to be able to monitor port status, error counters and other interface health indicators. It's implemented as HW Inline Asynchronous Custom Device.
+The NI-XNET Monitor Custom Device allows a user to run subordinate XNET session for each port in the system to be able to monitor port status, error counters, frame counter and other interface health indicators. This custom device also allows estimating the bus load present for the CAN buses added to the system. It's implemented as HW Inline Asynchronous Custom Device.
 
 ### LabVIEW Version ###
 
-This code was developed with LabVIEW and VeriStand 2017.
+This code was developed with LabVIEW and VeriStand 2018.
 
 ### Built Availability ###
 

diff --git a/Source/Custom Device NI-XNET Monitor.xml b/Source/Custom Device NI-XNET Monitor.xml
@@ -5,7 +5,7 @@
     <eng>NI-XNET Monitor</eng>
     <loc>NI-XNET Monitor</loc>
   </AddMenu>
-  <Version>1.0.0</Version>
+  <Version>2.0.0</Version>
   <Type>Inline HW Interface</Type>
   <MaxOccurrence>1</MaxOccurrence>
   <MainPageGUID>2fba45b0-1589-4179-a966-5fc49498794e</MainPageGUID>

diff --git a/Source/Engine/Bus Load/CANBus/Add Rx Frames.vi b/Source/Engine/Bus Load/CANBus/Add Rx Frames.vi
diff --git a/Source/Engine/Bus Load/CANBus/CANBus_Load_Calculator.lvclass b/Source/Engine/Bus Load/CANBus/CANBus_Load_Calculator.lvclass
diff --git a/Source/Engine/Bus Load/CANBus/Create.vi b/Source/Engine/Bus Load/CANBus/Create.vi
diff --git a/Source/Engine/Bus Load/CANBus/Destroy.vi b/Source/Engine/Bus Load/CANBus/Destroy.vi
diff --git a/Source/Engine/Bus Load/CANBus/Read Last Bus Load.vi b/Source/Engine/Bus Load/CANBus/Read Last Bus Load.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/Async Bus Load Calculator.vi b/Source/Engine/Bus Load/CANBus/support/Async Bus Load Calculator.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/CANFD_SizetoIndex.vi b/Source/Engine/Bus Load/CANBus/support/CANFD_SizetoIndex.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/CANFrame Duration.vi b/Source/Engine/Bus Load/CANBus/support/CANFrame Duration.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/CANFrame2.0_Avg_Length.vi b/Source/Engine/Bus Load/CANBus/support/CANFrame2.0_Avg_Length.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/CANFrameFD_Avg_Length.vi b/Source/Engine/Bus Load/CANBus/support/CANFrameFD_Avg_Length.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/Calc FD_Frame Duration.vi b/Source/Engine/Bus Load/CANBus/support/Calc FD_Frame Duration.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/Create Queues.vi b/Source/Engine/Bus Load/CANBus/support/Create Queues.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/Launch Async Calculator.vi b/Source/Engine/Bus Load/CANBus/support/Launch Async Calculator.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/PreCalc 2.0Frame Durations.vi b/Source/Engine/Bus Load/CANBus/support/PreCalc 2.0Frame Durations.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/PreCalc FDFrame Durations.vi b/Source/Engine/Bus Load/CANBus/support/PreCalc FDFrame Durations.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/PreCalc Frame Durations.vi b/Source/Engine/Bus Load/CANBus/support/PreCalc Frame Durations.vi
diff --git a/Source/Engine/Bus Load/CANBus/support/Update Busy Time.vi b/Source/Engine/Bus Load/CANBus/support/Update Busy Time.vi
diff --git a/Source/Engine/Bus Load/CANBus/typedefs/CAN2.0_AvgFramesDuration.ctl b/Source/Engine/Bus Load/CANBus/typedefs/CAN2.0_AvgFramesDuration.ctl
diff --git a/Source/Engine/Bus Load/CANBus/typedefs/CANFD_Frame_Timing.ctl b/Source/Engine/Bus Load/CANBus/typedefs/CANFD_Frame_Timing.ctl
diff --git a/Source/Engine/Bus Load/CANBus/typedefs/Calc_Comm_Refs.ctl b/Source/Engine/Bus Load/CANBus/typedefs/Calc_Comm_Refs.ctl
diff --git a/Source/Engine/Bus Load/CANBus/typedefs/FromCalculator_Data.ctl b/Source/Engine/Bus Load/CANBus/typedefs/FromCalculator_Data.ctl
diff --git a/Source/Engine/Bus Load/CANBus/typedefs/ToCalculator_Data.ctl b/Source/Engine/Bus Load/CANBus/typedefs/ToCalculator_Data.ctl
diff --git a/Source/Engine/Bus Load/Wrapper API/Add CANBus Received Frames.vi b/Source/Engine/Bus Load/Wrapper API/Add CANBus Received Frames.vi
diff --git a/Source/Engine/Bus Load/Wrapper API/Create CANBus Load Calculator.vi b/Source/Engine/Bus Load/Wrapper API/Create CANBus Load Calculator.vi
diff --git a/Source/Engine/Bus Load/Wrapper API/Destroy Bus Load Calculator.vi b/Source/Engine/Bus Load/Wrapper API/Destroy Bus Load Calculator.vi
diff --git a/Source/Engine/Bus Load/Wrapper API/Get Last Bus Load.vi b/Source/Engine/Bus Load/Wrapper API/Get Last Bus Load.vi
diff --git a/Source/Engine/Bus Load/XNET-Bus-Load-Calculator.lvlib b/Source/Engine/Bus Load/XNET-Bus-Load-Calculator.lvlib
diff --git a/Source/Engine/Create NI-XNET Session.vi b/Source/Engine/Create NI-XNET Session.vi
diff --git a/Source/Engine/NI-XNET Monitor Async.vi b/Source/Engine/NI-XNET Monitor Async.vi
diff --git a/Source/Engine/NI-XNET Monitor Engine.lvlib b/Source/Engine/NI-XNET Monitor Engine.lvlib
diff --git a/Source/Engine/NI-XNET Monitor Exit.vi b/Source/Engine/NI-XNET Monitor Exit.vi
diff --git a/Source/Engine/NI-XNET Monitor Get Comm State.vi b/Source/Engine/NI-XNET Monitor Get Comm State.vi
diff --git a/Source/Engine/NI-XNET Monitor Init.vi b/Source/Engine/NI-XNET Monitor Init.vi
diff --git a/Source/Engine/NI-XNET Monitor Start.vi b/Source/Engine/NI-XNET Monitor Start.vi
diff --git a/Source/Engine/RT Driver VI.vi b/Source/Engine/RT Driver VI.vi
diff --git a/Source/Engine/RTMonitorRefnums.ctl b/Source/Engine/RTMonitorRefnums.ctl
diff --git a/Source/Engine/RTStateVariables.ctl b/Source/Engine/RTStateVariables.ctl
diff --git a/Source/Engine/support/CAN Get Comm State.vi b/Source/Engine/support/CAN Get Comm State.vi
diff --git a/Source/Engine/support/CAN Monitor Init.vi b/Source/Engine/support/CAN Monitor Init.vi
diff --git a/Source/Engine/support/Create NI-XNET Session.vi b/Source/Engine/support/Create NI-XNET Session.vi
diff --git a/Source/Engine/support/Frame Counter.vi b/Source/Engine/support/Frame Counter.vi
diff --git a/Source/Engine/typedefs/CANBus.Settings.ctl b/Source/Engine/typedefs/CANBus.Settings.ctl
diff --git a/Source/Engine/typedefs/RTMonitorRefnums.ctl b/Source/Engine/typedefs/RTMonitorRefnums.ctl
diff --git a/Source/Engine/typedefs/RTStateVariables.ctl b/Source/Engine/typedefs/RTStateVariables.ctl
diff --git a/Source/Help/Build CHM.vi b/Source/Help/Build CHM.vi
diff --git a/Source/Help/Load Help File.vi b/Source/Help/Load Help File.vi
diff --git a/Source/Help/NI-XNET Monitor.hhp b/Source/Help/NI-XNET Monitor.hhp
@@ -1,33 +1,33 @@
-[OPTIONS]
-Compatibility=1.1 or later
-Compiled File=NI-XNET Monitor.chm
-Default Topic=HTML Help Source\Main.htm
-Display compile progress=No
-Language=0x409 English (United States)
-Title=NI-XNET Monitor
-
-[FILES]
-HTML Help Source\css\expandable_tree.css
-HTML Help Source\css\VSsystemexplorer.css
-HTML Help Source\js\arraytools.js
-HTML Help Source\js\checkinstalled.js
-HTML Help Source\js\common.js
-HTML Help Source\js\cssframes.js
-HTML Help Source\js\domtools.js
-HTML Help Source\js\dynamiccontent.js
-HTML Help Source\js\dynamicjumps.js
-HTML Help Source\js\dynamiclinks.js
-HTML Help Source\js\expandable_tree.js
-HTML Help Source\js\feedbacklink.js
-HTML Help Source\js\Globals.js
-HTML Help Source\js\initpagedyn.js
-HTML Help Source\js\launchhelp.js
-HTML Help Source\js\linking.js
-HTML Help Source\js\objectnames.js
-HTML Help Source\js\osbrowser.js
-HTML Help Source\js\pdf.js
-HTML Help Source\js\polyviselect.js
-HTML Help Source\js\stylesheets.js
-HTML Help Source\js\variables.js
-HTML Help Source\js\web.js
-HTML Help Source\Main.htm
+[OPTIONS]
+Compatibility=1.1 or later
+Compiled File=NI-XNET Monitor.chm
+Default Topic=HTML Help Source\Main.htm
+Display compile progress=No
+Language=0x409 English (United States)
+Title=NI-XNET Monitor
+
+[FILES]
+HTML Help Source\css\expandable_tree.css
+HTML Help Source\css\VSsystemexplorer.css
+HTML Help Source\js\arraytools.js
+HTML Help Source\js\checkinstalled.js
+HTML Help Source\js\common.js
+HTML Help Source\js\cssframes.js
+HTML Help Source\js\domtools.js
+HTML Help Source\js\dynamiccontent.js
+HTML Help Source\js\dynamicjumps.js
+HTML Help Source\js\dynamiclinks.js
+HTML Help Source\js\expandable_tree.js
+HTML Help Source\js\feedbacklink.js
+HTML Help Source\js\Globals.js
+HTML Help Source\js\initpagedyn.js
+HTML Help Source\js\launchhelp.js
+HTML Help Source\js\linking.js
+HTML Help Source\js\objectnames.js
+HTML Help Source\js\osbrowser.js
+HTML Help Source\js\pdf.js
+HTML Help Source\js\polyviselect.js
+HTML Help Source\js\stylesheets.js
+HTML Help Source\js\variables.js
+HTML Help Source\js\web.js
+HTML Help Source\Main.htm
diff --git a/Source/NI-XNET Monitor Custom Device.lvproj b/Source/NI-XNET Monitor Custom Device.lvproj
diff --git a/Source/Shared/BusLoad.Settings.ctl b/Source/Shared/BusLoad.Settings.ctl
diff --git a/Source/Shared/Compiled.Data.ctl b/Source/Shared/Compiled.Data.ctl
diff --git a/Source/Shared/Constants.vi b/Source/Shared/Constants.vi
diff --git a/Source/Shared/NI-XNET Monitor Shared.lvlib b/Source/Shared/NI-XNET Monitor Shared.lvlib
diff --git a/Source/System Explorer/ActionVIOnCompile.vi b/Source/System Explorer/ActionVIOnCompile.vi
diff --git a/Source/System Explorer/ActionVIOnDelete.vi b/Source/System Explorer/ActionVIOnDelete.vi
diff --git a/Source/System Explorer/ActionVIOnLoad.vi b/Source/System Explorer/ActionVIOnLoad.vi
diff --git a/Source/System Explorer/ActionVIOnSave.vi b/Source/System Explorer/ActionVIOnSave.vi
diff --git a/Source/System Explorer/Add Monitoring Channels.vi b/Source/System Explorer/Add Monitoring Channels.vi
diff --git a/Source/System Explorer/Add Monitoring port tree.vi b/Source/System Explorer/Add Monitoring port tree.vi
diff --git a/Source/System Explorer/Compare ni-xnet port with monitoring port.vi b/Source/System Explorer/Compare ni-xnet port with monitoring port.vi
diff --git a/Source/System Explorer/Create Multiple Channels.vi b/Source/System Explorer/Create Multiple Channels.vi
diff --git a/Source/System Explorer/Get Monitoring CD ports.vi b/Source/System Explorer/Get Monitoring CD ports.vi
diff --git a/Source/System Explorer/Get Referenced NI-XNET Port Item IDs.vi b/Source/System Explorer/Get Referenced NI-XNET Port Item IDs.vi
diff --git a/Source/System Explorer/Get ni-xnet port Info.vi b/Source/System Explorer/Get ni-xnet port Info.vi
diff --git a/Source/System Explorer/Get ni-xnet ports.vi b/Source/System Explorer/Get ni-xnet ports.vi
diff --git a/Source/System Explorer/Initialization VI.vi b/Source/System Explorer/Initialization VI.vi
diff --git a/Source/System Explorer/Interface.vi b/Source/System Explorer/Interface.vi
diff --git a/Source/System Explorer/Main Page.vi b/Source/System Explorer/Main Page.vi
diff --git a/Source/System Explorer/NI-XNET Monitor System Explorer.lvlib b/Source/System Explorer/NI-XNET Monitor System Explorer.lvlib
diff --git a/Source/System Explorer/OnLoad - Add Missing CD Ports for unreferenced NI-XNET Ports.vi b/Source/System Explorer/OnLoad - Add Missing CD Ports for unreferenced NI-XNET Ports.vi
diff --git a/Source/System Explorer/OnLoad - Remove CD Ports Wihout Referenced NI-XNET Port.vi b/Source/System Explorer/OnLoad - Remove CD Ports Wihout Referenced NI-XNET Port.vi
diff --git a/Source/System Explorer/Port.vi b/Source/System Explorer/Port.vi
diff --git a/Source/System Explorer/PortChannel.vi b/Source/System Explorer/PortChannel.vi
diff --git a/Source/System Explorer/Read Bus Load Settings.vi b/Source/System Explorer/Read Bus Load Settings.vi
diff --git a/Source/System Explorer/Resync with ni-xnet channels.vi b/Source/System Explorer/Resync with ni-xnet channels.vi
diff --git a/Source/System Explorer/Version Manager/Upgrade Version.vi b/Source/System Explorer/Version Manager/Upgrade Version.vi
diff --git a/Source/System Explorer/Version Manager/Version Manager.vi b/Source/System Explorer/Version Manager/Version Manager.vi
diff --git a/Source/Utility/Copy .LLB to NI VeriStand dir.vi b/Source/Utility/Copy .LLB to NI VeriStand dir.vi
diff --git a/Source/Utility/GUID Generator.vi b/Source/Utility/GUID Generator.vi
diff --git a/Source/Utility/LLB Pre-Build CHM Build.vi b/Source/Utility/LLB Pre-Build CHM Build.vi
diff --git a/build.toml b/build.toml
@@ -27,6 +27,5 @@ install_destination = 'documents\National Instruments\NI VeriStand {veristand_ve
 [[release.steps]]
 name = 'Master Release'
 type = 'githubRelease'
-2017_release_branches = ["master",]
 2018_release_branches = ["master",]
 2019_release_branches = ["master",]