michi/BDE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Rework process

Browse Source
This commit is contained in:
Michael Rest
2016-12-09 12:34:49 +01:00
parent 9fca897970
commit 2773af9f7c
3 changed files with 231 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
DB.py
View File

@@ -459,6 +459,46 @@ class DB:
'cclip': l[11],
'masseblech' : l[12]
}
#'Blindniet'
if _states ['blindniet'] == 'n.Durchlaufen':
self.log (5, 'PD09 Blindniet %s nDurchlaufen do nothing' % ['dmc'])
else:
io = 1
for i in range (1, 5):
if data['DGBM8status%02d' % i] == 'i.O. NA':
self.log (5, 'PD09 DGBM8_%02d reworked updating part data M:%d D:%d W:%d' % (i, data['DGBM8M%02d' % i], data['DGBM8D%02d' % i], data['DGBM8W%02d' % i] ))
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8status%02d' % i, data['DGBM8status%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8M%02d' % i, data['DGBM8M%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8D%02d' % i, data['DGBM8D%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8W%02d' % i, data['DGBM8W%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'DGBM8T%02d' % i, data['DGBM8T%02d' % i])
elif data['DGBM8status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 DGBM8_%02d still n.i.O ' % (i))
io = 0
for i in range (1, 3):
if data['NietM8status%02d' % i] == 'i.O. NA':
self.log (5, 'PD09 NietM8_%02d reworked updating part data F:%d S:%d' % (i, data['NietM8F%02d' % i], data['NietM8S%02d' % i]))
self.updateinformation (data['dmc'], 'blindniet', 'NietM8status%02d' % i, data['NietM8status%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'NietM8F%02d' % i, data['NietM8F%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'NietM8S%02d' % i, data['NietM8S%02d' % i])
elif data['NietM8status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 NietM8_%02d still n.i.O ' % (i))
io = 0
for i in range (1, 6):
if data['NietM6status%02d' % i] == 'i.O. NA':
self.log (5, 'PD09 NietM6_%02d reworked updating part data F:%d S:%d' % (i, data['NietM6F%02d' % i], data['NietM6S%02d' % i]))
self.updateinformation (data['dmc'], 'blindniet', 'NietM6status%02d' % i, data['NietM6status%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'NietM6F%02d' % i, data['NietM6F%02d' % i])
self.updateinformation (data['dmc'], 'blindniet', 'NietM6S%02d' % i, data['NietM6S%02d' % i])
elif data['NietM6status%02d' % i] == 'n.i.O.':
self.log (5, 'PD09 NietM6_%02d still n.i.O ' % (i))
io = 0
if io:
self.updatebde (data['dmc'], 'blindniet', 'i.O. NA')
#'Bajonettclip'
if _states ['bajonettclip'] == 'n.Durchlaufen':
self.log (5, 'PD09 Bajonett %s nDurchlaufen do nothing' % ['dmc'])
@@ -480,7 +520,7 @@ class DB:
self.log (5, 'PD09 CClip %s nDurchlaufen do nothing' % ['dmc'])
else:
io = 1
for i in range (1, 5):
for i in range (1, 18):
if data['clipstatus%02d' % i] == 'i.O. NA':
self.log (5, 'PD09 CClip%02d reworked updating part data' % (i))
self.updateinformation (data['dmc'], 'cclip', 'clipstatus%02d' % i, data['clipstatus%02d' % i])
@@ -490,6 +530,58 @@ class DB:
if io:
self.updatebde (data['dmc'], 'cclip', 'i.O. NA')
#'Maseblech'
if _states ['masseblech'] == 'n.Durchlaufen':
self.log (5, 'PD09 Masseblech %s nDurchlaufen do nothing' % ['dmc'])
else:
io = 1
if data['kombimutter'] == 'i.O. NA':
self.log (5, 'PD09 Kombimutter reworked updating part data M:%d D:%d W:%d' % (data['mmutter'], data['dmutter'], data['wmutter'] ))
self.updateinformation (data['dmc'], 'masseblech', 'kombimutter', data['kombimutter'])
self.updateinformation (data['dmc'], 'masseblech', 'mmutter', data['mmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'dmutter', data['dmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'wmutter', data['wmutter'])
self.updateinformation (data['dmc'], 'masseblech', 'tmutter', data['tmutter'])
elif data['kombimutter'] == 'n.i.O.':
self.log (5, 'PD09 Kombimutter still n.i.O ')
io = 0
if data['blindniet'] == 'i.O. NA':
self.log (5, 'PD09 Niet reworked updating part data F:%d S:%d' % (data['fniet' % i], data['sniet']))
self.updateinformation (data['dmc'], 'masseblech', 'blindniet', data['blindniet'])
self.updateinformation (data['dmc'], 'masseblech', 'fniet', data['fniet'])
self.updateinformation (data['dmc'], 'masseblech', 'sniet', data['sniet'])
elif data['blindniet'] == 'n.i.O.':
self.log (5, 'PD09 Blindniet still n.i.O ')
io = 0
if data['masseblech'] == 'i.O. NA':
self.log (5, 'PD09 Masseblech reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'masseblech', data['masseblech'])
elif data['masseblech'] == 'n.i.O.':
self.log (5, 'PD09 Masseblech still n.i.O ')
io = 0
if data['ausgleichselement'] == 'i.O. NA':
self.log (5, 'PD09 Ausgleichselement reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'ausgleichselement', data['ausgleichselement'])
elif data['ausgleichselement'] == 'n.i.O.':
self.log (5, 'PD09 Ausgleichselement still n.i.O ')
io = 0
if data['schallisolierung'] == 'i.O. NA':
self.log (5, 'PD09 Schallisolierung reworked updating part data')
self.updateinformation (data['dmc'], 'masseblech', 'schallisolierung', data['schallisolierung'])
elif data['schallisolierung'] == 'n.i.O.':
self.log (5, 'PD09 Schallisolierung still n.i.O ')
io = 0
if io:
self.updatebde (data['dmc'], 'masseblech', 'i.O. NA')
#nav = NAV (path = "/srv/navision/", db = self)

133
PD09_tel.py
View File

@@ -30,7 +30,138 @@ def fromstring (data):
tel.attrib['startts'] = tsdecode (data [38:52].decode ())
tel.attrib['endts'] = tsdecode (data [52:66].decode ())
#66-70 Varianten daten
tel.attrib['NietM8status01'] = bearbeitungsstatus.get (chr (data [71]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM8status02'] = bearbeitungsstatus.get (chr (data [72]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['DGBM8status01'] = bearbeitungsstatus.get (chr (data [73]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['DGBM8status02'] = bearbeitungsstatus.get (chr (data [74]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['DGBM8status03'] = bearbeitungsstatus.get (chr (data [75]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['DGBM8status04'] = bearbeitungsstatus.get (chr (data [76]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM6status01'] = bearbeitungsstatus.get (chr (data [77]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM6status02'] = bearbeitungsstatus.get (chr (data [78]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM6status03'] = bearbeitungsstatus.get (chr (data [79]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM6status04'] = bearbeitungsstatus.get (chr (data [80]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['NietM6status05'] = bearbeitungsstatus.get (chr (data [81]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
try:
tel.attrib['DGBM8M01'] = (data [90] << 8) + data [91]
except:
print ("Debug-DGBM8M01", data[90], data[91])
try:
tel.attrib['DGBM8D01'] = (data [92] << 8) + data [93]
except:
print ("Debug-DGBM8D01", data[92], data[93])
try:
tel.attrib['DGBM8W01'] = (data [94] << 8) + data [95]
except:
print ("Debug-DGBM8W01", data[94], data[95])
try:
tel.attrib['DGBM8T01'] = (data [96] << 8) + data [97]
except:
print ("Debug-DGBM8T01", data[96], data[97])
try:
tel.attrib['DGBM8M02'] = (data [98] << 8) + data [99]
except:
print ("Debug-DGBM8M02", data[98], data[99])
try:
tel.attrib['DGBM8D02'] = (data [100] << 8) + data [101]
except:
print ("Debug-DGBM8D02", data[100], data[101])
try:
tel.attrib['DGBM8W02'] = (data [102] << 8) + data [103]
except:
print ("Debug-DGBM8W02", data[102], data[103])
try:
tel.attrib['DGBM8T02'] = (data [104] << 8) + data [105]
except:
print ("Debug-DGBM8T02", data[104], data[105])
try:
tel.attrib['DGBM8M03'] = (data [106] << 8) + data [107]
except:
print ("Debug-DGBM8M03", data[106], data[107])
try:
tel.attrib['DGBM8D03'] = (data [108] << 8) + data [109]
except:
print ("Debug-DGBM8D03", data[108], data[109])
try:
tel.attrib['DGBM8W03'] = (data [110] << 8) + data [111]
except:
print ("Debug-DGBM8W03", data[110], data[111])
try:
tel.attrib['DGBM8T03'] = (data [112] << 8) + data [113]
except:
print ("Debug-DGBM8T03", data[112], data[113])
try:
tel.attrib['DGBM8M04'] = (data [114] << 8) + data [115]
except:
print ("Debug-DGBM8M04", data[114], data[115])
try:
tel.attrib['DGBM8D04'] = (data [116] << 8) + data [117]
except:
print ("Debug-DGBM8D04", data[116], data[117])
try:
tel.attrib['DGBM8W04'] = (data [118] << 8) + data [119]
except:
print ("Debug-DGBM8W04", data[118], data[119])
try:
tel.attrib['DGBM8T04'] = (data [120] << 8) + data [121]
except:
print ("Debug-DGBM8T04", data[120], data[121])
try:
tel.attrib['NietM6F01'] = (data [122] << 8) + data [123]
except:
print ("Debug-NietM6F01", data[122], data[123])
try:
tel.attrib['NietM6S01'] = (data [124] << 8) + data [125]
except:
print ("Debug-NietM6S01", data[124], data[125])
try:
tel.attrib['NietM6F02'] = (data [126] << 8) + data [127]
except:
print ("Debug-NietM6F02", data[126], data[127])
try:
tel.attrib['NietM6S02'] = (data [128] << 8) + data [129]
except:
print ("Debug-NietM6S02", data[128], data[129])
try:
tel.attrib['NietM6F03'] = (data [130] << 8) + data [131]
except:
print ("Debug-NietM6F03", data[130], data[131])
try:
tel.attrib['NietM6S03'] = (data [132] << 8) + data [133]
except:
print ("Debug-NietM6S03", data[132], data[133])
try:
tel.attrib['NietM6F04'] = (data [134] << 8) + data [135]
except:
print ("Debug-NietM6F04", data[134], data[135])
try:
tel.attrib['NietM6S04'] = (data [136] << 8) + data [137]
except:
print ("Debug-NietM6S04", data[136], data[137])
try:
tel.attrib['NietM6F05'] = (data [138] << 8) + data [139]
except:
print ("Debug-NietM6F05", data[138], data[139])
try:
tel.attrib['NietM6S05'] = (data [140] << 8) + data [141]
except:
print ("Debug-NietM6S05", data[140], data[141])
try:
tel.attrib['NietM8F01'] = (data [142] << 8) + data [143]
except:
print ("Debug-NietM8F01", data[142], data[143])
try:
tel.attrib['NietM8S01'] = (data [144] << 8) + data [145]
except:
print ("Debug-NietM8S01", data[144], data[145])
try:
tel.attrib['NietM8F02'] = (data [146] << 8) + data [147]
except:
print ("Debug-NietM8F02", data[146], data[147])
try:
tel.attrib['NietM8S02'] = (data [148] << 8) + data [149]
except:
print ("Debug-NietM8S02", data[148], data[149])
#Bajonettclip Status
#tel.attrib['bauteilstatusbajo'] = bauteilstatus.get (chr (data [160]), '') #0 - unbearbeitet; 1 - iO; 2 - niO
tel.attrib['bajostatus01'] = bearbeitungsstatus.get (chr (data [161]), '') #0 - unbearbeitet; 1 - iO; 2 - niO

11
bde.py
View File

@@ -460,13 +460,14 @@ class BDEServer ():
_bl = bearbeitungstatusRev.get (blindniet)
_km = bearbeitungstatusRev.get (kombimutter)
_fniet = bytes ([((fniet >> 8) & 0xFF)]) + bytes ([(fniet & 0xFF)])
_sniet = bytes ([((fniet >> 8) & 0xFF)]) + bytes ([(fniet & 0xFF)])
_sniet = bytes ([((sniet >> 8) & 0xFF)]) + bytes ([(sniet & 0xFF)])
_mmutter = bytes ([((mmutter >> 8) & 0xFF)]) + bytes ([(mmutter & 0xFF)])
_dmutter = bytes ([((dmutter >> 8) & 0xFF)]) + bytes ([(dmutter & 0xFF)])
_wmutter = bytes ([((wmutter >> 8) & 0xFF)]) + bytes ([(wmutter & 0xFF)])
_tmutter = bytes ([((tmutter >> 8) & 0xFF)]) + bytes ([(tmutter & 0xFF)])
_mbspace = ' ' * 18
_mbspace = ' ' * 14
_mbspace2 = ' ' * 4
_data += _data2.encode ()
_data += _dmc.encode () + _start.encode () + _end.encode () + _typ + _var + _bnst.encode () + \
@@ -484,10 +485,10 @@ class BDEServer ():
_ccs8.encode () + _ccs9.encode () + _ccs10.encode () + _ccs11.encode () + _ccs12.encode () + _ccs13.encode () + _ccs14.encode () + _ccs15.encode () +\
_ccs16.encode () + _ccs17.encode () + _ccs18.encode () + _ccspace.encode () + \
_mbst.encode () + _ae.encode () + _se.encode () + _mb.encode () + _bl.encode () + _km.encode () +\
_mbspace.encode () +\
_fniet + _sniet + _mmutter + _dmutter + _wmutter + _tmutter +\
_mbspace.encode ()
print (_data[1:30])
_mbspace2.encode ()
#print (_data[1:30])
self.queue_add (channel, client_id, msgtype, _data)
return