Merge branch 'master' of https://gitlab.engr.illinois.edu/whuie2/awg-control

.gitignore

@@ -141,3 +141,5 @@ _Pvt_Extensions
 /Cpp/.vscode
 /Cpp/test.cpp
 /Cpp/test.exe
+/Cpp/lib/driver_header/spcm_win64_msvcpp_symbols.txt
+/Cpp/lib/spcm_win64_msvcpp_symbols.txt

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/lib/AWG.cpp

@@ -28,9 +28,10 @@ void AWG::checkError() {
 		spcm_dwGetErrorInfo_i32(this->pCardHandle, NULL, NULL, errorMsg)
 		!= ERR_OK
 	) {
-		std::cout << "AWG error" << std::string(errorMsg) 
-			<< "\ncard closed\n";
+		//std::cout << "AWG error" << std::string(errorMsg) 
+		//	<< "\ncard closed\n";
 		this->close();
+		throw CardException(errorMsg);
 	}
 }
 
@@ -860,7 +861,7 @@ void AWG::initReplayModeSeq(int nSeg) {
 }
 
 void AWG::setSeqModeStep(
-	uint64 step,
+	uint32 step,
 	uint64 segment,
 	uint64 nextStep,
 	uint64 nLoop,

Cpp/lib/AWG.h

@@ -25,6 +25,7 @@ class AWG {
 		{M2STAT_DATA_ERROR,		 "data transfer error"},
 	};
 
+
 private:
 	// card information
 	drv_handle	pCardHandle;
@@ -39,7 +40,14 @@ private:
 	void		  checkError();
 
 public:
-	// collection of special constants to help with setting options
+	class CardException : std::exception {
+		private:
+		char* exceptionMsg;
+		public:
+		CardException(char* msg) : exceptionMsg(msg) {}
+		const char* what() const throw() { return exceptionMsg; }
+	};
+// collection of special constants to help with setting options
 	enum class CHANNEL_STOPLVL : int32 {
 		ZERO	 = SPCM_STOPLVL_ZERO,
 		LOW		 = SPCM_STOPLVL_LOW,
@@ -160,7 +168,7 @@ public:
 	//int64 getLoop();
 	void initReplayModeSeq(int nSeg);
 	void setSeqModeStep(
-		uint64 step,
+		uint32 step,
 		uint64 segment,
 		uint64 nextStep,
 		uint64 nLoop,

Cpp/lib/Waveform.cpp

+#include "Waveform.h"

Cpp/lib/Waveform.h

+#pragma once
+class Waveform {
+	public:
+	int freqRes;	 // frequency resolution
+	int samplingRate; // sampling rate
+};
+

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