revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2025-11-08 23:23:52 +01:00
Code Issues Packages Releases Wiki Activity

meldungen mit adress und längenangabe

Browse Source
This commit is contained in:
Sven Sager
2017-03-28 09:50:50 +02:00
parent a96abb11a6
commit d98854dbca
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
revpipyload/revpipyload.py
View File

@@ -33,7 +33,6 @@ begrenzt werden!
import gzip
import proginit
import os
import pickle
import shlex
import signal
import socket
@@ -515,13 +514,24 @@ class RevPiSlave(Thread):
fh_proc = open(procimg, "r+b", 0)
# Erste Meldung erhalten
meldung = self.rpi.recv(4)
meldung = self.rpi.recv(12)
comtime = 0
while meldung in msgcli:
while meldung[:4] in msgcli:
ot = default_timer()
if meldung == b'PICT':
# Meldung zerlegen
command = meldung[:4]
try:
startval = int(meldung[4:-4])
except:
startval = 0
try:
lenval = int(meldung[-4:])
except:
lenval = 0
if command == b'PICT':
# piCtory Konfiguration senden
proginit.logger.debug("transfair pictory configuration")
fh_pic = open(configrsc, "rb")
@@ -536,27 +546,23 @@ class RevPiSlave(Thread):
# Abschlussmeldung
self.rpi.send(b'PICOK')
if meldung == b'DATA':
proginit.logger.debug("read process image")
if command == b'DATA':
# Processabbild übertragen
block = 0
fh_proc.seek(0)
while block < 4:
bcount = 0
blength = lenval
fh_proc.seek(startval)
while bcount < blength:
self.rpi.send(fh_proc.read(1024))
block += 1
if meldung == b'SEND':
proginit.logger.debug("write to process image")
bcount += 1024
if command == b'SEND':
# Ausgänge empfangen
block = self.rpi.recv(1024)
test = pickle.loads(block)
fh_proc.seek(test[0])
fh_proc.write(test[1])
block = self.rpi.recv(lenval)
fh_proc.seek(startval)
fh_proc.write(block)
# Nächste Meldung erhalten
meldung = self.rpi.recv(4)
meldung = self.rpi.recv(12)
# Verarbeitungszeit prüfen
comtime = default_timer() - ot