From 10d2e8222fd6d42a4f7086bd018c7f61d57356ab Mon Sep 17 00:00:00 2001
From: bma <baptiste.marechal@femto-st.fr>
Date: Mon, 20 Aug 2018 15:41:53 +0200
Subject: [PATCH] new device: R&S FPC1000 max power

---
 instruments/FPC1000.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 instruments/FPC1000.py

diff --git a/instruments/FPC1000.py b/instruments/FPC1000.py
new file mode 100644
index 0000000..387f176
--- /dev/null
+++ b/instruments/FPC1000.py
@@ -0,0 +1,73 @@
+from abstract_instrument import abstract_instrument
+import socket
+
+#==============================================================================
+
+ALL_VAL_TYPE = ['PWR_MKR1']
+ALL_CHANNELS = ['1']
+
+ADDRESS = "192.168.0.17"
+CONF_VAL_TYPE = ['CALC:MARK1:MAX:PEAK']
+
+#==============================================================================
+
+class FPC1000(abstract_instrument):
+	def __init__(self, channels, vtypes, address):
+		self.address = address
+		self.port = 5555
+		self.channels = channels
+		self.vtypes = vtypes
+
+	def model(self):
+		#self.send("*IDN?")
+		#return self.read()
+		return "FPC1000"
+
+	def connect(self):
+		print('Connecting to device @%s:%s...' %(self.address, self.port))
+		self.sock = socket.socket(socket.AF_INET,
+							 socket.SOCK_STREAM,
+							 socket.IPPROTO_TCP)
+		self.sock.settimeout(10.0)	# Don't hang around forever
+		self.sock.connect((self.address, self.port))
+		#self.send("SYST:BEEP")
+		print('  --> Ok')
+		print(self.model())
+		self.configure()
+
+	def configure(self):
+		for ch in self.channels:
+			self.send(CONF_VAL_TYPE[ALL_VAL_TYPE.index(self.vtypes[self.channels.index(ch)])])
+
+	def getValue(self):
+		mes = ''
+		for ch in self.channels:
+			self.send('CALC:MARK1:MAX:PEAK')
+			self.send("CALC:MARK1:Y?")
+			mesTemp = self.read()
+			mes = mes + '\t' + mesTemp
+		return mes
+
+	def read(self):
+		ans = ''
+		nb_data_list = []
+		nb_data = ''
+		try:
+			while ans != '\n':
+				ans = self.sock.recv(1)
+				nb_data_list.append(ans) # Return the number of data
+			list_size = len(nb_data_list)
+			for j in range (0, list_size):
+				nb_data = nb_data+nb_data_list[j]
+			return nb_data
+		except socket.timeout:
+			print "Socket timeout error when reading."
+			raise
+
+	def disconnect(self):
+		#self.send('*RST')
+		#self.send("SYST:BEEP")
+		self.sock.close()
+
+	def send(self, command):
+		self.sock.send("%s\n"%command)
-- 
2.16.4