Skip to content

Commit 55559cc

Browse files
nlynchjonlynchjo
authored
Merge branch 'develop' into feature/dwyban/curvestream-example-complete-code
2 parents cb322b7 + 3ba579f commit 55559cc

File tree

75 files changed

+3555
-16
lines changed

Some content is hidden

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

75 files changed

+3555
-16
lines changed

‎.travis.yml

Lines changed: 7 additions & 7 deletions
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-

‎Spectrum_Analyzers/src/DPXPlotExample/README.md renamed to ‎Spectrum_Analyzers/DPXPlotExample/README.md

File renamed without changes.

‎Spectrum_Analyzers/src/DPXPlotExample/dpx_plot_matlab.png renamed to ‎Spectrum_Analyzers/DPXPlotExample/dpx_plot_matlab.png

File renamed without changes.

‎Spectrum_Analyzers/DPXPlotExample/dpx_plot_svpc.png

599 KB
Loading

‎Spectrum_Analyzers/src/DPXPlotExample/hopping.mat renamed to ‎Spectrum_Analyzers/DPXPlotExample/hopping.mat

File renamed without changes.

‎Spectrum_Analyzers/src/GetSpectrumDataExample/README.md renamed to ‎Spectrum_Analyzers/GetSpectrumDataExample/README.md

File renamed without changes.

‎Spectrum_Analyzers/src/GetSpectrumDataExample/get_spectrum_data.py renamed to ‎Spectrum_Analyzers/GetSpectrumDataExample/get_spectrum_data.py

File renamed without changes.

‎Spectrum_Analyzers/README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
# Spectrum Analyzers
2-
RSA300/500/600 & RSA5000/6000 Series
2+
RSA300/500/600 & RSA5000/6000 Series
33

44
## Directory
55
### RSA300/500/600/5000/6000 examples
6-
* **[DPX Plot Example](./src/DPXPlotExample)** [![MATLAB](https://img.shields.io/badge/-MATLAB-&?labelColor=3E434A&colorB=F05A22&logo=Mathworks)](https://www.mathworks.com/products/matlab.html?s_tid=hp_products_matlab)
6+
* **[DPX Plot Example](./DPXPlotExample)** [![MATLAB](https://img.shields.io/badge/-MATLAB-&?labelColor=3E434A&colorB=F05A22&logo=Mathworks)](https://www.mathworks.com/products/matlab.html?s_tid=hp_products_matlab)
77

88
### RSA3000B examples
9-
* **[Basic get spectrum data example](./src/GetSpectrumDataExample)** [![Python 3.6](https://img.shields.io/badge/python-3.6-&?labelColor=006281&colorB=3E434A&logo=python)](https://www.python.org/downloads/release/python-360/)
9+
10+
* **[Basic get spectrum data example](./GetSpectrumDataExample)** [![Python 3.6](https://img.shields.io/badge/python-3.6-&?labelColor=006281&colorB=3E434A&logo=python)](https://www.python.org/downloads/release/python-360/)
1011

1112

1213
### RSA5100/6100 examples
13-
* **[SignalVu Example C++](./src/SignalVuExamples/C++)** [![CPlusPlus](https://img.shields.io/badge/C-C++-&?labelColor=3E434A&colorB=006281&logo=cplusplus)](https://isocpp.org/)
14+
* **[SignalVu Example C++](./SignalVuExamples/C++)** [![CPlusPlus](https://img.shields.io/badge/C-C++-&?labelColor=3E434A&colorB=006281&logo=cplusplus)](https://isocpp.org/)
1415

15-
* **[SignalVu Example MATLAB](./src/SignalVuExamples/MATLAB)** [![MATLAB](https://img.shields.io/badge/-MATLAB-&?labelColor=3E434A&colorB=F05A22&logo=Mathworks)](https://www.mathworks.com/products/matlab.html?s_tid=hp_products_matlab)
16+
* **[SignalVu Example MATLAB](./SignalVuExamples/MATLAB)** [![MATLAB](https://img.shields.io/badge/-MATLAB-&?labelColor=3E434A&colorB=F05A22&logo=Mathworks)](https://www.mathworks.com/products/matlab.html?s_tid=hp_products_matlab)
1617

17-
* **[SignalVu Example Python](./src/SignalVuExamples/python)** [![Python 3.6](https://img.shields.io/badge/python-3.6-&?labelColor=006281&colorB=3E434A&logo=python)](https://www.python.org/downloads/release/python-360/)
18+
* **[SignalVu Example Python](./SignalVuExamples/python)** [![Python 3.6](https://img.shields.io/badge/python-3.6-&?labelColor=006281&colorB=3E434A&logo=python)](https://www.python.org/downloads/release/python-360/)
1819

19-
* **[SignalVu Example .NET](./src/SignalVuExamples/dotNet)** [![dotNet](https://img.shields.io/badge/Microsoft-.Net-&?labelColor=73BF44&colorB=3E434A&logo=.net)](https://dotnet.microsoft.com/)
20+
* **[SignalVu Example .NET](./SignalVuExamples/dotNet)** [![dotNet](https://img.shields.io/badge/Microsoft-.Net-&?labelColor=73BF44&colorB=3E434A&logo=.net)](https://dotnet.microsoft.com/)
2021

2122
----
2223
* **[Back to Home Page](./../README.md)**

‎Spectrum_Analyzers/SignalVuExamples/C++/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../README.md

‎Spectrum_Analyzers/SignalVuExamples/C++/RSA SVPC-VISA Control.vcxproj

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{5E359A04-BC91-4B62-9A67-CAFA5123FAA5}</ProjectGuid>
15+
<RootNamespace>RSASVPCVISAControl</RootNamespace>
16+
</PropertyGroup>
17+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
19+
<ConfigurationType>Application</ConfigurationType>
20+
<UseDebugLibraries>true</UseDebugLibraries>
21+
<PlatformToolset>v120</PlatformToolset>
22+
<CharacterSet>MultiByte</CharacterSet>
23+
</PropertyGroup>
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25+
<ConfigurationType>Application</ConfigurationType>
26+
<UseDebugLibraries>false</UseDebugLibraries>
27+
<PlatformToolset>v120</PlatformToolset>
28+
<WholeProgramOptimization>true</WholeProgramOptimization>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
</PropertyGroup>
31+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32+
<ImportGroup Label="ExtensionSettings">
33+
</ImportGroup>
34+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
35+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
36+
</ImportGroup>
37+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39+
</ImportGroup>
40+
<PropertyGroup Label="UserMacros" />
41+
<PropertyGroup />
42+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
43+
<ClCompile>
44+
<WarningLevel>Level3</WarningLevel>
45+
<Optimization>Disabled</Optimization>
46+
<SDLCheck>true</SDLCheck>
47+
<AdditionalIncludeDirectories>C:\Program Files (x86)\IVI Foundation\VISA\WinNT\include</AdditionalIncludeDirectories>
48+
</ClCompile>
49+
<Link>
50+
<GenerateDebugInformation>true</GenerateDebugInformation>
51+
<AdditionalLibraryDirectories>"C:\Program Files (x86)\IVI Foundation\VISA\WInNT\lib\msc"</AdditionalLibraryDirectories>
52+
<AdditionalDependencies>visa32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
53+
</Link>
54+
</ItemDefinitionGroup>
55+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
56+
<ClCompile>
57+
<WarningLevel>Level3</WarningLevel>
58+
<Optimization>MaxSpeed</Optimization>
59+
<FunctionLevelLinking>true</FunctionLevelLinking>
60+
<IntrinsicFunctions>true</IntrinsicFunctions>
61+
<SDLCheck>true</SDLCheck>
62+
</ClCompile>
63+
<Link>
64+
<GenerateDebugInformation>true</GenerateDebugInformation>
65+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
66+
<OptimizeReferences>true</OptimizeReferences>
67+
</Link>
68+
</ItemDefinitionGroup>
69+
<ItemGroup>
70+
<ClCompile Include="main.cpp" />
71+
</ItemGroup>
72+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
73+
<ImportGroup Label="ExtensionTargets">
74+
</ImportGroup>
75+
</Project>

0 commit comments

Comments
 (0)