fixes fossasia#72 . removed capture_multiple function since there is no equivalent responder in the firmware

csparkresearch · csparkresearch · commit a5b955da1621 · 2017-07-09T15:41:05.000+05:30
diff --git a/PSL/sciencelab.py b/PSL/sciencelab.py
@@ -509,93 +509,6 @@ def capture4(self, ns, tg, TraceOneRemap='CH1'):
 
         return x, y, y2, y3, y4
 
-    def capture_multiple(self, samples, tg, *args):
-        """
-		Blocking call that fetches oscilloscope traces from a set of specified channels
-
-		.. tabularcolumns:: |p{3cm}|p{11cm}|
-
-		==============  ============================================================================================
-		**Arguments**
-		==============  ============================================================================================
-		samples         Number of samples to fetch. Maximum 10000/(total specified channels)
-		tg              Timegap between samples in microseconds.
-		\*args          channel names
-		==============  ============================================================================================
-
-		Example
-
-		>>> from pylab import *
-		>>> I=sciencelab.ScienceLab()
-		>>> x,y1,y2,y3,y4 = I.capture_multiple(800,1.75,'CH1','CH2','MIC','SEN')
-		>>> plot(x,y1)
-		>>> plot(x,y2)
-		>>> plot(x,y3)
-		>>> plot(x,y4)
-		>>> show()
-
-		:return: Arrays X(timestamps),Y1,Y2 ...
-
-		"""
-        if len(args) == 0:
-            self.__print__('please specify channels to record')
-            return
-        tg = int(tg * 8) / 8.  # Round off the timescale to 1/8uS units
-        if (tg < 1.5): tg = int(1.5 * 8) / 8.
-        total_chans = len(args)
-
-        total_samples = samples * total_chans
-        if (total_samples > self.MAX_SAMPLES):
-            self.__print__('Sample limit exceeded. 10,000 total')
-            total_samples = self.MAX_SAMPLES
-            samples = self.MAX_SAMPLES / total_chans
-
-        CHANNEL_SELECTION = 0
-        for chan in args:
-            C = self.analogInputSources[chan].CHOSA
-            self.__print__(chan, C)
-            CHANNEL_SELECTION |= (1 << C)
-        self.__print__('selection', CHANNEL_SELECTION, len(args), hex(CHANNEL_SELECTION | ((total_chans - 1) << 12)))
-
-        try:
-            self.H.__sendByte__(CP.ADC)
-            self.H.__sendByte__(CP.CAPTURE_MULTIPLE)
-            self.H.__sendInt__(CHANNEL_SELECTION | ((total_chans - 1) << 12))
-
-            self.H.__sendInt__(total_samples)  # total number of samples to record
-            self.H.__sendInt__(int(self.timebase * 8))  # Timegap between samples.  8MHz timer clock
-            self.H.__get_ack__()
-            self.__print__('wait')
-            time.sleep(1e-6 * total_samples * tg + .01)
-            self.__print__('done')
-            data = b''
-            for i in range(int(total_samples / self.data_splitting)):
-                self.H.__sendByte__(CP.ADC)
-                self.H.__sendByte__(CP.GET_CAPTURE_CHANNEL)
-                self.H.__sendByte__(0)  # channel number . starts with A0 on PIC
-                self.H.__sendInt__(self.data_splitting)
-                self.H.__sendInt__(i * self.data_splitting)
-                data += self.H.fd.read(int(
-                    self.data_splitting * 2))  # reading int by int sometimes causes a communication error. this works better.
-                self.H.__get_ack__()
-
-            if total_samples % self.data_splitting:
-                self.H.__sendByte__(CP.ADC)
-                self.H.__sendByte__(CP.GET_CAPTURE_CHANNEL)
-                self.H.__sendByte__(0)  # channel number starts with A0 on PIC
-                self.H.__sendInt__(total_samples % self.data_splitting)
-                self.H.__sendInt__(total_samples - total_samples % self.data_splitting)
-                data += self.H.fd.read(int(2 * (
-                    total_samples % self.data_splitting)))  # reading int by int may cause packets to be dropped. this works better.
-                self.H.__get_ack__()
-
-            for a in range(int(total_samples)): self.buff[a] = CP.ShortInt.unpack(data[a * 2:a * 2 + 2])[0]
-            # self.achans[channel_number-1].yaxis = self.achans[channel_number-1].fix_value(self.buff[:samples])
-            yield np.linspace(0, tg * (samples - 1), samples)
-            for a in range(int(total_chans)):
-                yield self.buff[a:total_samples][::total_chans]
-        except Exception as ex:
-            self.raiseException(ex, "Communication Error , Function : " + inspect.currentframe().f_code.co_name)
 
     def __capture_fullspeed__(self, chan, samples, tg, *args, **kwargs):
         tg = int(tg * 8) / 8.  # Round off the timescale to 1/8uS units
