From ad4ea0a1656d91139fe6fa4a54bf44731a41494e Mon Sep 17 00:00:00 2001
From: xiyehu2 <35537592+xiyehu2@users.noreply.github.com>
Date: Fri, 22 Sep 2023 12:16:02 -0500
Subject: [PATCH] sync
---
Cpp/Cpp.vcxproj | 4 +++-
Cpp/Cpp.vcxproj.filters | 6 ++++++
Cpp/run.cpp | 5 +++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Cpp/Cpp.vcxproj b/Cpp/Cpp.vcxproj
index 83cb67c..9b8df28 100644
--- a/Cpp/Cpp.vcxproj
+++ b/Cpp/Cpp.vcxproj
@@ -114,7 +114,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>C:\Lab\awg-control\Cpp\lib\driver_header;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>.\lib\driver_header;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>spcm_win64_msvcpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -137,6 +137,7 @@
<ItemGroup>
<ClCompile Include="lib\AWG.cpp" />
<ClCompile Include="run.cpp" />
+ <ClCompile Include="lib\Waveform.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="lib\AWG.h" />
@@ -145,6 +146,7 @@
<ClInclude Include="lib\driver_header\regs.h" />
<ClInclude Include="lib\driver_header\spcerr.h" />
<ClInclude Include="lib\driver_header\spcm_drv.h" />
+ <ClInclude Include="lib\Waveform.h" />
</ItemGroup>
<ItemGroup>
<None Include="cpp.hint" />
diff --git a/Cpp/Cpp.vcxproj.filters b/Cpp/Cpp.vcxproj.filters
index 41493f7..ca076df 100644
--- a/Cpp/Cpp.vcxproj.filters
+++ b/Cpp/Cpp.vcxproj.filters
@@ -21,6 +21,9 @@
<ClCompile Include="lib\AWG.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="lib\Waveform.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="lib\AWG.h">
@@ -41,6 +44,9 @@
<ClInclude Include="lib\driver_header\spcm_drv.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="lib\Waveform.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="cpp.hint" />
diff --git a/Cpp/run.cpp b/Cpp/run.cpp
index 1c912f7..52e18dd 100644
--- a/Cpp/run.cpp
+++ b/Cpp/run.cpp
@@ -7,8 +7,9 @@
int main()
{
- auto b = 10;
- std::cout << b << std::endl;
+ auto awg = AWG();
+ awg.open(0);
+ //std::cout << b << std::endl;
}
// Run program: Ctrl + F5 or Debug > Start Without Debugging menu
--
GitLab