--- a/PLCControler.py Thu Sep 15 22:29:32 2011 +0200
+++ b/PLCControler.py Tue Sep 20 23:58:31 2011 +0200
@@ -2562,7 +2562,7 @@
for task in tasks:
new_task = plcopen.resource_task()
new_task.setname(task["Name"])
- if task["Single"] != "":
+ if task["Triggering"] == "Interrupt":
new_task.setsingle(task["Single"])
## result = duration_model.match(task["Interval"]).groups()
## if reduce(lambda x, y: x or y != None, result):
@@ -2575,7 +2575,7 @@
## if result[-1] is not None:
## values.append(int(float(result[-1]) * 1000))
## new_task.setinterval(datetime.time(*values))
- if task["Interval"] != "":
+ if task["Triggering"] == "Cyclic":
new_task.setinterval(task["Interval"])
new_task.setpriority(int(task["Priority"]))
if task["Name"] != "":
@@ -2598,12 +2598,12 @@
new_task = {}
new_task["Name"] = task.getname()
single = task.getsingle()
- if single:
+ if single is not None:
new_task["Single"] = single
else:
new_task["Single"] = ""
interval = task.getinterval()
- if interval:
+ if interval is not None:
## text = ""
## if interval.hour != 0:
## text += "%dh"%interval.hour
@@ -2620,6 +2620,12 @@
new_task["Interval"] = interval
else:
new_task["Interval"] = ""
+ if single is not None and interval is None:
+ new_task["Triggering"] = "Interrupt"
+ elif interval is not None and single is None:
+ new_task["Triggering"] = "Cyclic"
+ else:
+ new_task["Triggering"] = ""
new_task["Priority"] = str(task.getpriority())
tasks_data.append(new_task)
for instance in task.getpouInstance():