Merge pull request #8 from scientisst/dev_kiko

API update: Conversion of ext adc to mV and bug fix

Author: anascacais

scientisst/scientisst.py

@@ -3,6 +3,7 @@
 
 # if sys.platform == "linux":
 import socket
+import select
 
 # else:
 import serial
@@ -64,6 +65,14 @@ def __init__(
         self.address = address
         self.serial_speed = serial_speed
         self.__log = log
+        
+        self.__serial = None
+        self.__socket = None
+        self.__num_chs = 0
+        self.__api_mode = 1
+        self.__sample_rate = None
+        self.__chs = [None] * 8
+        self.__log = False
 
         # Setup socket in function of com_mode argument
         self.__setupSocket()
@@ -284,6 +293,9 @@ def read(self, convert=True, matrix=False):
                             & 0xFFFFFF
                         )
                         byte_it += 3
+                        if convert:
+                            f.mv[index] = ((f.a[index]) * (3.3*2) / (pow(2, 24) - 1))*1000
+                            f.mv[index] = round(f.mv[index], 3)
 
                     # If it's an AI channel
                     else:
@@ -631,12 +643,22 @@ def __recv(self, nrOfBytes, waitall_flag=True):
         """
         Receive data
         """
-        result = None
+        result = b""
         if self.__socket:
-            if waitall_flag:
-                result = self.__socket.recv(nrOfBytes, socket.MSG_WAITALL)
-            else:
-                result = self.__socket.recv(nrOfBytes)
+            # We have to use a select here with a single socket because we can't apply a timeout in any other way
+            ready = select.select([self.__socket], [], [], 5)  # 10 seconds timeout
+            if ready[0]:
+                if waitall_flag:
+                    remaining = nrOfBytes
+                    while remaining > 0:
+                        ready = select.select([self.__socket], [], [], 10)
+                        if not ready[0]:
+                            raise ContactingDeviceError()
+                        temp = self.__socket.recv(remaining)
+                        result += temp
+                        remaining = nrOfBytes - len(result)
+                else:
+                    result = self.__socket.recv(nrOfBytes)
         elif self.__serial:
             result = self.__serial.read(nrOfBytes)
         else: