Skip to content

Commit 2c1a983

Browse files
bit-liftbit-lift
authored
Merge branch 'develop' into ijavierTek/insert-parentheses-Send2Arb
2 parents c78b4be + 2ad9944 commit 2c1a983

File tree

106 files changed

+5804
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+5804
-288
lines changed

‎.travis.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1+
---
12
language: go
23
go:
3-
- "1.12.x"
4+
- "1.13.x"
45

56
git:
6-
depth: 1
7+
depth: 1
78

89
branches:
9-
only:
10-
- master
10+
only:
11+
- master
1112

1213
notifications:
13-
slack: tek-oso:tBStikUyvah8EOPb8QY7VWvS
14+
slack: tek-oso:tBStikUyvah8EOPb8QY7VWvS
1415

1516
before_install:
16-
- go get -u github.com/raviqqe/liche
17+
- GO111MODULE=on GOPROXY=direct go get github.com/nlynchjo/liche
1718

1819
script:
1920
- liche -v -t 60 -r .
20-

‎Oscilloscopes/PerformanceScopes/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MSO/DPO5000/B, DPO7000/C, DSA70000/B/C/D, and MSO700000/C/DX
99

1010
* **[Extract Trigger Timestamp Example](./src/ExtractTriggerExample)** [![C Sharp](https://img.shields.io/badge/-C%20Sharp-&?labelColor=3E434A&colorB=73BF44&logo=Microsoft)](https://github.com/dotnet/roslyn)
1111

12-
* **[NI-VISA Curve Streaming Example](./src/CurvestreamExample)** [![C#](https://img.shields.io/badge/-C%20Sharp-&?labelColor=3E434A&colorB=73BF44&logo=Microsoft)](https://github.com/dotnet/roslyn)
12+
* **[Curve Streaming Example](./src/CurvestreamExample)** [![C#](https://img.shields.io/badge/-C%20Sharp-&?labelColor=3E434A&colorB=73BF44&logo=Microsoft)](https://github.com/dotnet/roslyn)
1313

1414
#### MSO5000B Examples
1515
* **[FastFrame Save Individual Frame Example](./src/FastFrameSaveIndivFrameExample)** [![Python 2.7](https://img.shields.io/badge/python-2.7-&?labelColor=3E434A&colorB=006281&logo=python)](https://www.python.org/downloads/release/python-2715/)

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/.gitignore

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Compiled Dynamic libraries
15+
*.so
16+
*.dylib
17+
*.dll
18+
19+
# Fortran module files
20+
*.mod
21+
*.smod
22+
23+
# Compiled Static libraries
24+
*.lai
25+
*.la
26+
*.a
27+
*.lib
28+
29+
# Executables
30+
*.exe
31+
*.out
32+
*.app
33+
34+
# Visual Studio User Files
35+
*.suo
36+
37+
# Visual Studio Build Folder
38+
.vs/
39+
bin/
40+
obj/

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET.sln

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CurvestreamExample-IVI-VISA.NET", "CurvestreamExample-IVI-VISA.NET\CurvestreamExample-IVI-VISA.NET.csproj", "{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|x86 = Debug|x86
9+
Release|x86 = Release|x86
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}.Debug|x86.ActiveCfg = Debug|x86
13+
{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}.Debug|x86.Build.0 = Debug|x86
14+
{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}.Release|x86.ActiveCfg = Release|x86
15+
{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}.Release|x86.Build.0 = Release|x86
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) = preSolution
18+
HideSolutionNode = FALSE
19+
EndGlobalSection
20+
EndGlobal

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET.csproj

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{09335BF5-9F20-4FD5-9948-4F88ABBE45BB}</ProjectGuid>
9+
<OutputType>WinExe</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>CurvestreamExample</RootNamespace>
12+
<AssemblyName>Curvestream Example</AssemblyName>
13+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
16+
<FileAlignment>512</FileAlignment>
17+
</PropertyGroup>
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
19+
<PlatformTarget>x86</PlatformTarget>
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>DEBUG;TRACE</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
<Prefer32Bit>false</Prefer32Bit>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
30+
<PlatformTarget>x86</PlatformTarget>
31+
<DebugType>pdbonly</DebugType>
32+
<Optimize>true</Optimize>
33+
<OutputPath>bin\Release\</OutputPath>
34+
<DefineConstants>TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
<Prefer32Bit>false</Prefer32Bit>
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="Ivi.Visa, Version=5.8.0.0, Culture=neutral, PublicKeyToken=a128c98f1d7717c1, processorArchitecture=MSIL" />
41+
<Reference Include="System" />
42+
<Reference Include="System.Core" />
43+
<Reference Include="System.Xml.Linq" />
44+
<Reference Include="System.Data.DataSetExtensions" />
45+
<Reference Include="Microsoft.CSharp" />
46+
<Reference Include="System.Data" />
47+
<Reference Include="System.Deployment" />
48+
<Reference Include="System.Drawing" />
49+
<Reference Include="System.Windows.Forms" />
50+
<Reference Include="System.Xml" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="frmMain.cs">
54+
<SubType>Form</SubType>
55+
</Compile>
56+
<Compile Include="frmMain.Designer.cs">
57+
<DependentUpon>frmMain.cs</DependentUpon>
58+
</Compile>
59+
<Compile Include="Program.cs" />
60+
<Compile Include="Properties\AssemblyInfo.cs" />
61+
<EmbeddedResource Include="frmMain.resx">
62+
<DependentUpon>frmMain.cs</DependentUpon>
63+
</EmbeddedResource>
64+
<EmbeddedResource Include="Properties\Resources.resx">
65+
<Generator>ResXFileCodeGenerator</Generator>
66+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
67+
<SubType>Designer</SubType>
68+
</EmbeddedResource>
69+
<Compile Include="Properties\Resources.Designer.cs">
70+
<AutoGen>True</AutoGen>
71+
<DependentUpon>Resources.resx</DependentUpon>
72+
<DesignTime>True</DesignTime>
73+
</Compile>
74+
<None Include="app.config" />
75+
<None Include="Properties\Settings.settings">
76+
<Generator>SettingsSingleFileGenerator</Generator>
77+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
78+
</None>
79+
<Compile Include="Properties\Settings.Designer.cs">
80+
<AutoGen>True</AutoGen>
81+
<DependentUpon>Settings.settings</DependentUpon>
82+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
83+
</Compile>
84+
</ItemGroup>
85+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
86+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
87+
Other similar extension points exist, see Microsoft.Common.targets.
88+
<Target Name="BeforeBuild">
89+
</Target>
90+
<Target Name="AfterBuild">
91+
</Target>
92+
-->
93+
</Project>

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET/Program.cs

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/* TEKTRONIX SAMPLE SOURCE CODE LICENSE AGREEMENT
2+
*
3+
* Source code written by Tektronix, Inc. or its affiliates (“Tektronix”) that
4+
* is designated as a “sample,” “example,” “sample code,” or any similar
5+
* designation will be considered “Sample Source Code.” Tektronix grants you a
6+
* license to download, reproduce, display, distribute, modify, and create
7+
* derivative works of Tektronix Sample Source Code, only for use in or with
8+
* Tektronix products. You may not remove or alter any copyright notices or
9+
* trademarks.
10+
*
11+
* SAMPLE SOURCE CODE IS PROVIDED “AS-IS,” WITHOUT ANY EXPRESS OR IMPLIED
12+
* WARRANTIES OF ANY KIND, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES
13+
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT
14+
* OF INTELLECTUAL PROPERTY. IN NO EVENT SHALL TEKTRONIX, ITS AFFILIATES,
15+
* OFFICERS, EMPLOYEES, DIRECTORS, AGENTS, SUPPLIERS, OR OTHER THIRD PARTIES BE
16+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, PUNITIVE, SPECIAL, EXEMPLARY,
17+
* OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THIS SAMPLE
18+
* SOURCE CODE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19+
*/
20+
21+
using System;
22+
using System.Collections.Generic;
23+
using System.Linq;
24+
using System.Windows.Forms;
25+
26+
namespace CurvestreamExample
27+
{
28+
static class Program
29+
{
30+
/// <summary>
31+
/// The main entry point for the application.
32+
/// </summary>
33+
[STAThread]
34+
static void Main()
35+
{
36+
Application.EnableVisualStyles();
37+
Application.SetCompatibleTextRenderingDefault(false);
38+
Application.Run(new frmMain());
39+
}
40+
}
41+
}

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET/Properties/AssemblyInfo.cs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Curvestream Example")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("Curvestream Example")]
13+
[assembly: AssemblyCopyright("Copyright © Tektronix, Inc 2019")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("7b21420f-b32a-43de-ad05-efd4e8584b84")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Oscilloscopes/PerformanceScopes/src/CurvestreamExample/CurvestreamExample-IVI-VISA.NET/CurvestreamExample-IVI-VISA.NET/Properties/Resources.Designer.cs

+63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)