diff --git a/Cpp/Cpp.vcxproj b/Cpp/Cpp.vcxproj index 83cb67cda0787aa8971f2e0bce3dd009054f2eed..9b8df2873bd6fc0ffcf29622ed9685e8b60f62d4 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 41493f74438abd4e921d69707dcee7131abf41d9..ca076df3714897cf0e0125792715c9f3d58f81de 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 1c912f7d4be16b094986425b5d59b1ecaeaf536b..52e18dd8187d9988f735cff8931710bb24bb8c93 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