Startup
This commit is contained in:
@@ -1,11 +1,6 @@
|
||||
import org.zeromq.ZMQ as ZMQ
|
||||
import org.zeromq.ZMQ.Socket as Socket
|
||||
import java.nio.ByteBuffer as ByteBuffer
|
||||
import ch.psi.bsread.converter.MatlabByteConverter as Converter
|
||||
import ch.psi.bsread.message.ChannelConfig as ChannelConfig
|
||||
import ch.psi.bsread.message.Type as Type
|
||||
import json
|
||||
|
||||
import json
|
||||
|
||||
|
||||
class Array10Array(ReadonlyAsyncRegisterBase, ReadonlyRegisterArray):
|
||||
@@ -48,7 +43,6 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
self.array_dev=None
|
||||
self.matrix_dev=None
|
||||
self.message_count=0
|
||||
self.converter=Converter()
|
||||
|
||||
if modulo_array is not None:
|
||||
self.array_dev = Array10Array(self.name + "_array" )
|
||||
@@ -105,15 +99,7 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
self.dtype = self.header.get("type", "int8")
|
||||
data = self.socket.recv()
|
||||
if data is not None:
|
||||
if self.dtype != "int8":
|
||||
bb = ByteBuffer.wrap(data)
|
||||
self.bb=bb
|
||||
self.dtype = self.dtype.capitalize()
|
||||
if self.dtype[0]=="U":
|
||||
self.dtype =self.dtype[:1] + self.dtype[1:].capitalize()
|
||||
cfg=ChannelConfig("",Type.valueOf(self.dtype),[len(data)],1,0)
|
||||
data=self.converter.getValue(None,None,cfg,bb,None)
|
||||
self.data=data
|
||||
self.data=BufferConverter.fromArray(data, Type.fromKey(self.dtype))
|
||||
self.setCache({"header":self.header, "data":self.data}, None)
|
||||
self.message_count=self.message_count+1
|
||||
if self.array_dev is not None:
|
||||
|
||||
Reference in New Issue
Block a user