From 70974982701f57ea48a85585bca9b33cd35fad8e Mon Sep 17 00:00:00 2001
From: Karl Walther <karl.walther@kuleuven.be>
Date: Sun, 15 Dec 2024 22:53:33 +0100
Subject: [PATCH] correct capitals

---
 cdl_plc.py                                                      | 2 +-
 .../structure/{program_instance.xml => ProgramInstance.xml}     | 0
 xml_templates/structure/global.xml                              | 2 +-
 xml_templates/structure/program.xml                             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename xml_templates/structure/{program_instance.xml => ProgramInstance.xml} (100%)

diff --git a/cdl_plc.py b/cdl_plc.py
index 148ab31..d605bbd 100644
--- a/cdl_plc.py
+++ b/cdl_plc.py
@@ -1108,7 +1108,7 @@ def create_iec_xml(self, debug=False):
 
         # fileTemplateVariable = "templateVariable.xml"
         file_template_global = [
-            "xml_templates/structure/global.xml",
+            "xml_templates/structure/Global.xml",
             "templateVariable.xml",
         ][0]
 
diff --git a/xml_templates/structure/program_instance.xml b/xml_templates/structure/ProgramInstance.xml
similarity index 100%
rename from xml_templates/structure/program_instance.xml
rename to xml_templates/structure/ProgramInstance.xml
diff --git a/xml_templates/structure/global.xml b/xml_templates/structure/global.xml
index dcab48f..370c5ae 100644
--- a/xml_templates/structure/global.xml
+++ b/xml_templates/structure/global.xml
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8'?><project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:ns1="http://www.plcopen.org/xml/tc6_0201"><fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2024-01-09T16:45:07"/><contentHeader name="Unnamed" modificationDateTime="2024-01-23T14:31:54"><coordinateInfo><fbd><scaling x="0" y="0"/></fbd><ld><scaling x="0" y="0"/></ld><sfc><scaling x="0" y="0"/></sfc></coordinateInfo></contentHeader><types><dataTypes/><pous>{% for program in programs %}{% include "xml_templates/structure/program.xml" %}{% endfor %}{% for cdlBlock in dictCdlBlocks.scalar_inputs %}{{ cdlBlock }}{% endfor %}{% for cdlBlock in dictCdlBlocks.array_inputs %}{{ cdlBlock }}{% endfor %}</pous></types><instances><configurations><configuration name="config"><resource name="resource1"><task name="task0" priority="0" interval="T#20ms"><pouInstance name="instance0" typeName="{{ programs[0] }}"/></task></resource></configuration></configurations></instances></project>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?><project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:ns1="http://www.plcopen.org/xml/tc6_0201"><fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2024-01-09T16:45:07"/><contentHeader name="Unnamed" modificationDateTime="2024-01-23T14:31:54"><coordinateInfo><fbd><scaling x="0" y="0"/></fbd><ld><scaling x="0" y="0"/></ld><sfc><scaling x="0" y="0"/></sfc></coordinateInfo></contentHeader><types><dataTypes/><pous>{% for program in programs %}{% include "xml_templates/structure/Program.xml" %}{% endfor %}{% for cdlBlock in dictCdlBlocks.scalar_inputs %}{{ cdlBlock }}{% endfor %}{% for cdlBlock in dictCdlBlocks.array_inputs %}{{ cdlBlock }}{% endfor %}</pous></types><instances><configurations><configuration name="config"><resource name="resource1"><task name="task0" priority="0" interval="T#20ms"><pouInstance name="instance0" typeName="{{ programs[0] }}"/></task></resource></configuration></configurations></instances></project>
\ No newline at end of file
diff --git a/xml_templates/structure/program.xml b/xml_templates/structure/program.xml
index f63ef64..14191f1 100644
--- a/xml_templates/structure/program.xml
+++ b/xml_templates/structure/program.xml
@@ -1 +1 @@
-<pou name="{{ program }}" pouType="program"><interface><inputVars>{% for key, values in dictInputVars.items() %}{% include "xml_templates/structure/variable.xml" %}{% endfor %}</inputVars><outputVars>{% for key, values in dictOutputVars.items() %}{% include "xml_templates/structure/variable.xml" %}{% endfor %}</outputVars><localVars>{% for key, values in dictFunctionBlockInstances.items() %}{% include "xml_templates/structure/variable.xml" %}{% endfor %}{% for key, values in dictParameters.items() %}{% include "xml_templates/structure/Parameter.xml" %}{% endfor %}</localVars></interface><body><FBD>{% for key, values in dictInputVars.items() %}{% include "xml_templates/structure/FbdInVar.xml" %}{% endfor %}{% for key, values in dictParameters.items() %}{% include "xml_templates/structure/FbdPar.xml" %}{% endfor %}{% for key, values in dictFunctionBlockInstances.items() %}{% include "xml_templates/structure/block.xml" %}{% endfor %}{% for key, values in dictFunctionBlockInstancesIEC.items() %}{% include "xml_templates/structure/blockIEC.xml" %}{% endfor %}{% for key, values in dictOutputVars.items() %}{% include "xml_templates/structure/FbdOutVar.xml" %}{% endfor %}</FBD></body></pou>
\ No newline at end of file
+<pou name="{{ program }}" pouType="program"><interface><inputVars>{% for key, values in dictInputVars.items() %}{% include "xml_templates/structure/Variable.xml" %}{% endfor %}</inputVars><outputVars>{% for key, values in dictOutputVars.items() %}{% include "xml_templates/structure/Variable.xml" %}{% endfor %}</outputVars><localVars>{% for key, values in dictFunctionBlockInstances.items() %}{% include "xml_templates/structure/Variable.xml" %}{% endfor %}{% for key, values in dictParameters.items() %}{% include "xml_templates/structure/Parameter.xml" %}{% endfor %}</localVars></interface><body><FBD>{% for key, values in dictInputVars.items() %}{% include "xml_templates/structure/FbdInVar.xml" %}{% endfor %}{% for key, values in dictParameters.items() %}{% include "xml_templates/structure/FbdPar.xml" %}{% endfor %}{% for key, values in dictFunctionBlockInstances.items() %}{% include "xml_templates/structure/Block.xml" %}{% endfor %}{% for key, values in dictFunctionBlockInstancesIEC.items() %}{% include "xml_templates/structure/BlockIEC.xml" %}{% endfor %}{% for key, values in dictOutputVars.items() %}{% include "xml_templates/structure/FbdOutVar.xml" %}{% endfor %}</FBD></body></pou>
\ No newline at end of file