Compare commits

...

2 Commits

4 changed files with 5 additions and 8 deletions
-3
View File
@@ -176,6 +176,3 @@
790002066 = Bedientableau 2 F -kpl. "PDT-GE+KN-RAST 1-0-2" 790002066 = Bedientableau 2 F -kpl. "PDT-GE+KN-RAST 1-0-2"
929012603 = WEGEVENT.5/2 MONOSTABIL SY5120-5WAOU-C6F-Q 929012603 = WEGEVENT.5/2 MONOSTABIL SY5120-5WAOU-C6F-Q
[Missing]
929012603 =
+3 -2
View File
@@ -68,9 +68,10 @@
30.0=722001357 30.0=722001357
40.0=722001359 40.0=722001359
# Daten-Kabel für Scanner (Patchkabel gruen) # Daten-Kabel für Scanner (Patchkabel gruen)
# Data-cable for scanners (Patchcable green) # Data-cable for scanners (Patchcable green)
[WF_BX-829534306] [WF_BX]
0.25=726001062 0.25=726001062
0.5=726001040 0.5=726001040
1.0=726001041 1.0=726001041
@@ -96,7 +97,7 @@
# Daten-Kabel für ENCODER (Patchkabel gruen) # Daten-Kabel für ENCODER (Patchkabel gruen)
# Data-cable for encoder (Patchcable green) # Data-cable for encoder (Patchcable green)
# ist identisch mit Scanner Kabel # ist identisch mit Scanner Kabel
[WF_GF-829624040] [WF_GF]
0.25=726001062 0.25=726001062
0.5=726001040 0.5=726001040
1.0=726001041 1.0=726001041
+1 -2
View File
@@ -913,8 +913,7 @@ def map_sensor_to_cable_cfg(plines):
section_list = mapping[name_prefix] section_list = mapping[name_prefix]
else: else:
sens2cable[pl.id].append("Kein Kabeltyp zugewiesen (BMK.cfg)") sens2cable[pl.id].append("Kein Kabeltyp zugewiesen (BMK.cfg)")
section_list = list() continue # Kein Mapping gefunden, Rest überspringen
# TODO was soll hier passieren wenn die Config falsch ist?
# Liste aus evtl. mehreren Sektionen erzeugen # Liste aus evtl. mehreren Sektionen erzeugen
sections = [s.strip() for s in section_list.split(",")] sections = [s.strip() for s in section_list.split(",")]
+1 -1
View File
@@ -99,7 +99,7 @@ def prepare_data(rawdata:dict):
for sname, sdata in sensors.items(): for sname, sdata in sensors.items():
dsensors[sname] = { dsensors[sname] = {
"point": Point(sdata["pos"]), "point": Point(sdata["pos"]),
"artinr": sdata.get("ARTINR","") "artinr": sdata.get("ARTINR","").strip()
} }
subdists = rawdata["distributors"] subdists = rawdata["distributors"]