equal
deleted
inserted
replaced
460 if var_address != None: |
460 if var_address != None: |
461 program += "AT %s "%var_address |
461 program += "AT %s "%var_address |
462 program += ": %s"%var_type |
462 program += ": %s"%var_type |
463 if var_initial != None: |
463 if var_initial != None: |
464 value = {"TRUE":"0","FALSE":"1"}.get(str(var_initial).upper(), str(var_initial)) |
464 value = {"TRUE":"0","FALSE":"1"}.get(str(var_initial).upper(), str(var_initial)) |
465 if var_type in ["STRING", "WSTRING"]: |
465 if var_type == "STRING": |
|
466 program += " := '%s'"%value |
|
467 elif var_type == "WSTRING": |
466 program += " := \"%s\""%value |
468 program += " := \"%s\""%value |
467 else: |
469 else: |
468 program += " := %s"%value |
470 program += " := %s"%value |
469 program += ";\n" |
471 program += ";\n" |
470 program += " END_VAR\n" |
472 program += " END_VAR\n" |
491 config += ": %s"%var_type |
493 config += ": %s"%var_type |
492 initial = var.getInitialValue() |
494 initial = var.getInitialValue() |
493 if initial: |
495 if initial: |
494 value = str(initial.getValue()) |
496 value = str(initial.getValue()) |
495 value = {"TRUE":"0","FALSE":"1"}.get(value.upper(), value) |
497 value = {"TRUE":"0","FALSE":"1"}.get(value.upper(), value) |
496 if var_type in ["STRING", "WSTRING"]: |
498 if var_type == "STRING": |
|
499 config += " := '%s'"%value |
|
500 elif var_type == "WSTRING": |
497 config += " := \"%s\""%value |
501 config += " := \"%s\""%value |
498 else: |
502 else: |
499 config += " := %s"%value |
503 config += " := %s"%value |
500 config += ";\n" |
504 config += ";\n" |
501 config += " END_VAR\n" |
505 config += " END_VAR\n" |
522 resrce += ": %s"%var.getType().getValue() |
526 resrce += ": %s"%var.getType().getValue() |
523 initial = var.getInitialValue() |
527 initial = var.getInitialValue() |
524 if initial: |
528 if initial: |
525 value = str(initial.getValue()) |
529 value = str(initial.getValue()) |
526 value = {"TRUE":"0","FALSE":"1"}.get(value.upper(), value) |
530 value = {"TRUE":"0","FALSE":"1"}.get(value.upper(), value) |
527 if var_type in ["STRING", "WSTRING"]: |
531 if var_type == "STRING": |
|
532 resrce += " := '%s'"%value |
|
533 elif var_type == "WSTRING": |
528 resrce += " := \"%s\""%value |
534 resrce += " := \"%s\""%value |
529 else: |
535 else: |
530 resrce += " := %s"%value |
536 resrce += " := %s"%value |
531 resrce += ";\n" |
537 resrce += ";\n" |
532 resrce += " END_VAR\n" |
538 resrce += " END_VAR\n" |