Added receiveMessage support
This commit is contained in:
parent
b244c7542f
commit
298c6799e7
99
bindings.py
99
bindings.py
|
|
@ -55,7 +55,7 @@ class pyNope(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def messageReceived(self,*args):
|
def receiveMessage(self,*args):
|
||||||
iprint("An order has been received :",args)
|
iprint("An order has been received :",args)
|
||||||
|
|
||||||
def __call__(self,*args,**kwargs):
|
def __call__(self,*args,**kwargs):
|
||||||
|
|
@ -178,7 +178,7 @@ _ALL_MESSAGE_TYPES=[
|
||||||
]
|
]
|
||||||
|
|
||||||
_UPDATE_MSG=[
|
_UPDATE_MSG=[
|
||||||
"LAYERINP","QUICKFA","QUICKF","TAKE","QUICKFA","QUICKF","FREEZE","FREEZEALL","DISPLAYLAYER",
|
"LAYERINP","QUICKFA","QUICKF","TAKE","FREEZE","FREEZEALL","DISPLAYLAYER",
|
||||||
]
|
]
|
||||||
# RELOAD_PROGRAM
|
# RELOAD_PROGRAM
|
||||||
# FREEZE_SCREEN
|
# FREEZE_SCREEN
|
||||||
|
|
@ -211,7 +211,17 @@ class analogController(object):
|
||||||
# for k in range(8):
|
# for k in range(8):
|
||||||
# self._LOCKS["LAYERINP{}_{}_{}".format(i,j,k)]=threading.Lock()
|
# self._LOCKS["LAYERINP{}_{}_{}".format(i,j,k)]=threading.Lock()
|
||||||
self.POSTMATCHACTIONS={i:self.getAttr("POSTMATCH_{}".format(i),self.POSTMATCH_GENERIC) for i in _ALL_MESSAGE_TYPES}
|
self.POSTMATCHACTIONS={i:self.getAttr("POSTMATCH_{}".format(i),self.POSTMATCH_GENERIC) for i in _ALL_MESSAGE_TYPES}
|
||||||
|
self._all_commands={
|
||||||
|
"CONNECT":self.connectionSequence,
|
||||||
|
"LAYERINP":self.changeLayer,
|
||||||
|
"QUICKFA":self.quickFrameAll,
|
||||||
|
"QUICKF":self.quickFrame,
|
||||||
|
"TAKE":self.take,
|
||||||
|
"TAKEALL":self.takeAll,
|
||||||
|
"FREEZELAYER":self.freezeLayer,
|
||||||
|
"FREEZEALL":self.freezeScreenAll,
|
||||||
|
"SCRNUPD":self.updateFinishedAll,
|
||||||
|
}
|
||||||
try:
|
try:
|
||||||
dprint('Creating socket')
|
dprint('Creating socket')
|
||||||
self.sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
self.sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
|
|
@ -224,6 +234,14 @@ class analogController(object):
|
||||||
eprint('Hostname could not be resolved. Exiting')
|
eprint('Hostname could not be resolved. Exiting')
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
|
def receiveCommand(self,command,*args,**kwargs):
|
||||||
|
"Receive a command froman external source and handle it internally"
|
||||||
|
try:
|
||||||
|
self._all_commands[command](*args,**kwargs)
|
||||||
|
except KeyError as e:
|
||||||
|
eprint("The command received {} isn't in the list of supported commands ({})".format(command,self._commandlist))
|
||||||
|
eprint(e)
|
||||||
|
|
||||||
def getAttr(self,attribute,default):
|
def getAttr(self,attribute,default):
|
||||||
"A custom attribute fetcher"
|
"A custom attribute fetcher"
|
||||||
try:
|
try:
|
||||||
|
|
@ -334,6 +352,7 @@ class analogController(object):
|
||||||
# if match.group("postargs")[-1]=="1":
|
# if match.group("postargs")[-1]=="1":
|
||||||
# return True
|
# return True
|
||||||
# return False
|
# return False
|
||||||
|
|
||||||
################################
|
################################
|
||||||
# MESSAGE RECEIVE
|
# MESSAGE RECEIVE
|
||||||
def genericRECEIVE(self,match):
|
def genericRECEIVE(self,match):
|
||||||
|
|
@ -344,10 +363,10 @@ class analogController(object):
|
||||||
status=self.POSTMATCHACTIONS[typ](match)
|
status=self.POSTMATCHACTIONS[typ](match)
|
||||||
if status:
|
if status:
|
||||||
self._LOCKS[typ].release()
|
self._LOCKS[typ].release()
|
||||||
return self.feedback.messageReceived(typ,match) #Do an actual action
|
return self.feedback.receiveMessage(typ,match) #Do an actual action
|
||||||
else:
|
else:
|
||||||
if typ in _UPDATE_MSG:
|
if typ in _UPDATE_MSG:
|
||||||
return self.feedback.messageReceived(typ,match)
|
return self.feedback.receiveMessage(typ,match)
|
||||||
else:
|
else:
|
||||||
dprint("Ignoring message",match)
|
dprint("Ignoring message",match)
|
||||||
return status
|
return status
|
||||||
|
|
@ -450,9 +469,9 @@ class analogController(object):
|
||||||
(GCtav<scrn>,1) : Take is available"""
|
(GCtav<scrn>,1) : Take is available"""
|
||||||
self.st_takeavailable=[False,False]
|
self.st_takeavailable=[False,False]
|
||||||
for screen in screens:
|
for screen in screens:
|
||||||
# print(screen)
|
|
||||||
self.genericSEND("TAKEAVL","{screen},GCtav".format(screen=screen),timeout=_TIMEOUT_HUGE)
|
self.genericSEND("TAKEAVL","{screen},GCtav".format(screen=screen),timeout=_TIMEOUT_HUGE)
|
||||||
# self.genericSEND("TAKEAVL","{screen},GCtav".format(screen=screen),timeout=_TIMEOUT_HUGE)
|
# self.genericSEND("TAKEAVL","{screen},GCtav".format(screen=screen),timeout=_TIMEOUT_HUGE)
|
||||||
|
|
||||||
def takeAvailableAll(self):
|
def takeAvailableAll(self):
|
||||||
self.takeAvailable(*range(self.screens))
|
self.takeAvailable(*range(self.screens))
|
||||||
|
|
||||||
|
|
@ -489,7 +508,7 @@ class analogController(object):
|
||||||
if self.st_takeavailable[0]&self.st_takeavailable[1]:
|
if self.st_takeavailable[0]&self.st_takeavailable[1]:
|
||||||
self.genericSEND("TAKEALL","1GCtal",timeout=_TIMEOUT_BIG)
|
self.genericSEND("TAKEALL","1GCtal",timeout=_TIMEOUT_BIG)
|
||||||
else:
|
else:
|
||||||
self.takeAvailableAll(screen)
|
self.takeAvailableAll()
|
||||||
self.takeAll()
|
self.takeAll()
|
||||||
|
|
||||||
def loadMM(screenF,memory,screenT,ProgPrev,filter):
|
def loadMM(screenF,memory,screenT,ProgPrev,filter):
|
||||||
|
|
@ -678,10 +697,11 @@ class analogController(object):
|
||||||
#####################
|
#####################
|
||||||
# TESTING
|
# TESTING
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
# _HOSTS=[["127.0.0.1",3000]] # Test server
|
#_HOSTS=[["127.0.0.1",3000]] # Test server
|
||||||
# _TIMEOUT_HUGE=5
|
# _TIMEOUT_HUGE=5
|
||||||
ctrl1=analogController(*_HOSTS[0])
|
ctrl1=analogController(*_HOSTS[0])
|
||||||
ctrl1.connectionSequence()
|
ctrl1.receiveCommand("CONNECT")
|
||||||
|
# ctrl1.connectionSequence()
|
||||||
# while True:
|
# while True:
|
||||||
# for i in range(8):
|
# for i in range(8):
|
||||||
# ctrl1.changeLayer(0,1,1,i+1)
|
# ctrl1.changeLayer(0,1,1,i+1)
|
||||||
|
|
@ -695,42 +715,45 @@ if __name__ == '__main__':
|
||||||
# except KeyboardInterrupt:
|
# except KeyboardInterrupt:
|
||||||
# ctrl1.close()
|
# ctrl1.close()
|
||||||
|
|
||||||
ctrl1.changeLayer(0,0,1,1)
|
# ctrl1.changeLayer(0,0,1,1)
|
||||||
|
ctrl1.receiveCommand("LAYERINP",0,1,1,3)
|
||||||
|
ctrl1.receiveCommand("SCRNUPD")
|
||||||
|
ctrl1.receiveCommand("TAKEALL")
|
||||||
# time.sleep(1)
|
# time.sleep(1)
|
||||||
# # ctrl1.freezeScreenAll(1)
|
# # ctrl1.freezeScreenAll(1)
|
||||||
# ctrl1.freezeLayer(0,0,1)
|
# ctrl1.freezeLayer(0,0,1)
|
||||||
# ctrl1.freezeLayer(1,0,1)
|
# ctrl1.freezeLayer(1,0,1)
|
||||||
# time.sleep(1)
|
# time.sleep(1)
|
||||||
ctrl1.displayed(0)
|
# ctrl1.displayed(1)
|
||||||
# ctrl1.freezeScreenAll(1)
|
# # ctrl1.freezeScreenAll(1)
|
||||||
|
|
||||||
# import random
|
# # import random
|
||||||
|
|
||||||
while True:
|
# while True:
|
||||||
# ctrl1.changeLayer(0,1,1,random.randint(0,7))
|
# # ctrl1.changeLayer(0,1,1,random.randint(0,7))
|
||||||
# ctrl1.updateFinishedAll()
|
# # ctrl1.updateFinishedAll()
|
||||||
# ctrl1.takeAvailableAll()
|
# # ctrl1.takeAvailableAll()
|
||||||
# ctrl1.takeAll()
|
# # ctrl1.takeAll()
|
||||||
input(">>>")
|
# input(">>>")
|
||||||
ctrl1.displayed(1)
|
# ctrl1.displayed(1)
|
||||||
ctrl1.updateFinishedAll()
|
# ctrl1.updateFinishedAll()
|
||||||
ctrl1.freezeLayer(0,1)
|
# ctrl1.freezeLayer(0,1)
|
||||||
# time.sleep(1)
|
# # time.sleep(1)
|
||||||
# # ctrl1.takeAvailable((1,))
|
# # # ctrl1.takeAvailable((1,))
|
||||||
# # take(self,screen)
|
# # # take(self,screen)
|
||||||
# # takeAll(self)
|
# # # takeAll(self)
|
||||||
# # loadMM(screenF,memory,screenT,ProgPrev,filter)
|
# # # loadMM(screenF,memory,screenT,ProgPrev,filter)
|
||||||
# # ctrl1.quickFrame(0)
|
# # # ctrl1.quickFrame(0)
|
||||||
# # time.sleep(1)
|
# # # time.sleep(1)
|
||||||
# # ctrl1.quickFrame(0)
|
# # # ctrl1.quickFrame(0)
|
||||||
# # time.sleep(1)
|
# # # time.sleep(1)
|
||||||
# # ctrl1.quickFrame(0)
|
# # # ctrl1.quickFrame(0)
|
||||||
# #
|
# # #
|
||||||
# # ctrl1.quickFrameAll(action=1)
|
# # # ctrl1.quickFrameAll(action=1)
|
||||||
# # time.sleep(1)
|
# # # time.sleep(1)
|
||||||
# # ctrl1.quickFrameAll()
|
# # # ctrl1.quickFrameAll()
|
||||||
|
|
||||||
# ctrl1.takeAvailable(1)
|
# # ctrl1.takeAvailable(1)
|
||||||
|
|
||||||
|
|
||||||
# ctrl1.keepPinging()
|
# # ctrl1.keepPinging()
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ def sequenceAnswers(s,addr,seq,delay=_DELAY):
|
||||||
elt=(elt+'\r\n').encode()
|
elt=(elt+'\r\n').encode()
|
||||||
resps=[(i+'\r\n').encode() for i in resps]
|
resps=[(i+'\r\n').encode() for i in resps]
|
||||||
print("[{}] Waiting for {}".format(name,elt))
|
print("[{}] Waiting for {}".format(name,elt))
|
||||||
while recv!=elt:
|
while recv!=elt and recv:
|
||||||
recv=s.recv(4095)
|
recv=s.recv(4095)
|
||||||
print("[{}] Received : {}".format(name,recv))
|
print("[{}] Received : {}".format(name,recv))
|
||||||
for r in resps:
|
for r in resps:
|
||||||
|
|
@ -21,7 +21,10 @@ def sequenceAnswers(s,addr,seq,delay=_DELAY):
|
||||||
time.sleep(delay)
|
time.sleep(delay)
|
||||||
s.sendall(r)
|
s.sendall(r)
|
||||||
while True:
|
while True:
|
||||||
print(s.recv(4096).decode())
|
recv=s.recv(4096)
|
||||||
|
if not recv:
|
||||||
|
break
|
||||||
|
print(recv.decode())
|
||||||
except ConnectionResetError as e:
|
except ConnectionResetError as e:
|
||||||
print("[{}] Has stopped the connection".format(name))
|
print("[{}] Has stopped the connection".format(name))
|
||||||
print(e)
|
print(e)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue