Added some bindings and some regex
This commit is contained in:
parent
495e068c8a
commit
7777a02d97
50
bindings.py
50
bindings.py
|
|
@ -22,7 +22,7 @@ if _VERBOSE:
|
||||||
else:
|
else:
|
||||||
dprint=lambda x:None
|
dprint=lambda x:None
|
||||||
################################
|
################################
|
||||||
#
|
# VARIABLES
|
||||||
|
|
||||||
|
|
||||||
_DEVICES_VALUES={
|
_DEVICES_VALUES={
|
||||||
|
|
@ -81,6 +81,11 @@ _FILTER={
|
||||||
################################
|
################################
|
||||||
# Regex for messages
|
# Regex for messages
|
||||||
|
|
||||||
|
_WAIT_CONNECT=re.compile('\*1')
|
||||||
|
_WAIT_DEVICE =re.compile('DEV(?P<device>\d*)')
|
||||||
|
_WAIT_VERSION=re.compile('VEvar(?P<version>\d*)')
|
||||||
|
_WAIT_STATUS=re.compile('#(?P<status>\d*)')
|
||||||
|
_WAIT_KPALIVE=re.compile('SYpig(?P<ping>\d*)')
|
||||||
|
|
||||||
################################
|
################################
|
||||||
# CLASS DEFINITIONS
|
# CLASS DEFINITIONS
|
||||||
|
|
@ -116,14 +121,16 @@ class analogController(object):
|
||||||
self.sck.connect((self.ip,self.port))
|
self.sck.connect((self.ip,self.port))
|
||||||
dprint('[pAW:INFO] Sending data to server')
|
dprint('[pAW:INFO] Sending data to server')
|
||||||
self.sendData("*\r\n")
|
self.sendData("*\r\n")
|
||||||
self.waitfor(b'*1\r\n')
|
ret=self.waitfor(_WAIT_CONNECT)
|
||||||
|
print(ret)
|
||||||
|
|
||||||
def getDevice(self):
|
def getDevice(self):
|
||||||
"""This read only command gives the device type
|
"""This read only command gives the device type
|
||||||
[?] (DEV <value>) <values>:_DEVICES_VALUES
|
[?] (DEV <value>) <values>:_DEVICES_VALUES
|
||||||
"""
|
"""
|
||||||
self.sendData("?")
|
self.sendData("?")
|
||||||
self.waitfor(b'DEV259\r')
|
ret=self.waitfor(_WAIT_DEVICE,"device")
|
||||||
|
print(ret)
|
||||||
|
|
||||||
def getVersion(self):
|
def getVersion(self):
|
||||||
"""his read only command gives the version number of the command set.
|
"""his read only command gives the version number of the command set.
|
||||||
|
|
@ -131,20 +138,25 @@ class analogController(object):
|
||||||
[VEvar] (VEvar<version>)
|
[VEvar] (VEvar<version>)
|
||||||
"""
|
"""
|
||||||
self.sendData("VEvar")
|
self.sendData("VEvar")
|
||||||
self.waitfor(b'DEV259\r')
|
ret=self.waitfor(_WAIT_VERSION,"version")
|
||||||
|
print(ret)
|
||||||
|
|
||||||
def getStatus(self,value=3):
|
def getStatus(self,value=3):
|
||||||
"""Reading a change of values
|
"""Reading a change of values
|
||||||
[<value>#] (# <rvalue>) The controller must wait for <rvalue> to equals 0 for the end of enumeration
|
[<value>#] (# <rvalue>) The controller must wait for <rvalue> to equals 0 for the end of enumeration
|
||||||
<value>:1 All register values 3: Only non default values
|
<value>:1 All register values 3: Only non default values
|
||||||
"""
|
"""
|
||||||
pass
|
self.sendData('#{}'.format(value))
|
||||||
|
ret=self.waitfor(_WAIT_STATUS)
|
||||||
|
print(ret)
|
||||||
|
|
||||||
def _keepAlive(self,val=1):
|
def _keepAlive(self,val=1):
|
||||||
"""Send a keepalive to check (and ensure) the connection is still up
|
"""Send a keepalive to check (and ensure) the connection is still up
|
||||||
[<val1>SYpig] Will return the invert of the value sent: 0x0000 0000 will return 0xFFFF FFFF
|
[<val1>SYpig] Will return the invert of the value sent: 0x0000 0000 will return 0xFFFF FFFF
|
||||||
"""
|
"""
|
||||||
pass
|
self.sendData("{}SYpig".format(val))
|
||||||
|
ret=self.waitfor(_WAIT_KPALIVE)
|
||||||
|
print(ret)
|
||||||
|
|
||||||
def changeLayer(self,screen,ProgPrev,layer,src):
|
def changeLayer(self,screen,ProgPrev,layer,src):
|
||||||
"""Change the layer of selected
|
"""Change the layer of selected
|
||||||
|
|
@ -224,16 +236,26 @@ class analogController(object):
|
||||||
self.getVersion()
|
self.getVersion()
|
||||||
self.getStatus()
|
self.getStatus()
|
||||||
|
|
||||||
def waitfor(self,value):
|
def waitfor(self,value,*matchgroups):
|
||||||
"""Wait for a specific return value, blocking"""
|
"""Wait for a specific return value, blocking"""
|
||||||
notfound=True
|
notfound=True
|
||||||
|
returndict={}
|
||||||
while notfound:
|
while notfound:
|
||||||
reply=self.sck.recv(_MSGSIZE)
|
try:
|
||||||
dprint ("[pAW:INFO] Received:",reply)
|
reply=self.sck.recv(_MSGSIZE)
|
||||||
|
dprint ("[pAW:INFO] Received:",reply)
|
||||||
|
RX_MTCH=value.match(reply.decode())
|
||||||
|
for grp in matchgroups:
|
||||||
|
returndict[grp]=RX_MTCH.group(grp)
|
||||||
|
except AttributeError as e:
|
||||||
|
dprint("[pAW:ERROR] Regex couldn't find a match")
|
||||||
|
dprint(e)
|
||||||
|
except Exception as e:
|
||||||
|
print(e)
|
||||||
|
|
||||||
if reply==value:
|
return returndict
|
||||||
dprint("Found")
|
# except:
|
||||||
return
|
# pass
|
||||||
|
|
||||||
def sendData(self,data):
|
def sendData(self,data):
|
||||||
"Send data through the socket"
|
"Send data through the socket"
|
||||||
|
|
@ -246,10 +268,12 @@ class analogController(object):
|
||||||
#####################
|
#####################
|
||||||
# TESTING
|
# TESTING
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
ctrl1=analogController(*_HOSTS[0])
|
ctrl1=analogController(*_HOSTS[0])
|
||||||
ctrl1.connectionSequence()
|
ctrl1.connectionSequence()
|
||||||
|
|
||||||
ctrl1.waitfor("")
|
ctrl1.waitfor("")
|
||||||
|
# except ConnectionRefusedError:
|
||||||
# # Receive data
|
# # Receive data
|
||||||
# print('# Receive data from server')
|
# print('# Receive data from server')
|
||||||
# while True:
|
# while True:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue