sync

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" />

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" />

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