Skip to content

osie
osie
Commit 810bf151 authored by Balakrishna Balakrishna's avatar Balakrishna Balakrishna
Browse files
Options

Addressing merge review comments

parent 8b91d7cc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 502 deletions
.gitignore
View file @ 810bf151
...@@ -11,7 +11,3 @@ ...@@ -11,7 +11,3 @@
# ignore specific files # ignore specific files
coupler/opc-ua-server/open62541.c coupler/opc-ua-server/open62541.c
coupler/opc-ua-server/open62541.h coupler/opc-ua-server/open62541.h
# ignore by directory
coupler/opc-ua-server/bin
\ No newline at end of file
Beremiz/beremiz_tutorial_opc_ua/plc.xml
View file @ 810bf151
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201"> <project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2021-05-14T14:33:11"/> <fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2021-05-14T14:33:11"/>
<contentHeader name="Counter (OSIE)" modificationDateTime="2021-10-28T19:14:23"> <contentHeader name="Counter (OSIE)" modificationDateTime="2021-10-22T15:02:46">
<coordinateInfo> <coordinateInfo>
<fbd> <fbd>
<scaling x="0" y="0"/> <scaling x="0" y="0"/>
...@@ -185,120 +185,20 @@ ...@@ -185,120 +185,20 @@
ELSE ELSE
Cnt0 := Cnt0 + 1; Cnt0 := Cnt0 + 1;
Cnt1 := Cnt1 + 1; Cnt1 := Cnt1 + 1;
IF Cnt1 = 0 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 50 THEN IF Cnt1 = 50 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 100 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 150 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 1;
Relay3 := 1;
END_IF;
IF Cnt1 = 150 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 200 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 250 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 300 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 1;
Relay3 := 1;
END_IF;
IF Cnt1 = 350 THEN
Relay0 := 1; Relay0 := 1;
Relay1 := 0; Relay1 := 1;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 400 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 450 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 500 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 1; Relay2 := 1;
Relay3 := 1; Relay3 := 1;
END_IF; END_IF;
IF Cnt1 = 550 THEN IF Cnt1 = 100 THEN
Relay0 := 1; Relay0 := 0;
Relay1 := 1; Relay1 := 0;
Relay2 := 0; Relay2 := 0;
Relay3 := 0; Relay3 := 0;
END_IF;
IF Cnt1 = 600 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 650 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 700 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 1;
Relay3 := 1;
Cnt1 := 0; Cnt1 := 0;
END_IF; END_IF;
END_IF; END_IF;
......
Beremiz/beremiz_tutorial_opc_ua_hexadeceimal/beremiz.xml deleted 100644 → 0
View file @ 8b91d7cc
<?xml version='1.0' encoding='utf-8'?>
<BeremizRoot xmlns:xsd="http://www.w3.org/2001/XMLSchema" URI_location="LOCAL://">
<TargetType/>
</BeremizRoot>
Beremiz/beremiz_tutorial_opc_ua_hexadeceimal/opcua_0@opcua/baseconfnode.xml deleted 100644 → 0
View file @ 8b91d7cc
<?xml version='1.0' encoding='utf-8'?>
<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="1" Name="opcua_0"/>
Beremiz/beremiz_tutorial_opc_ua_hexadeceimal/opcua_0@opcua/confnode.xml deleted 100644 → 0
View file @ 8b91d7cc
<?xml version='1.0' encoding='utf-8'?>
<OPCUAClient xmlns:xsd="http://www.w3.org/2001/XMLSchema" Server_URI="opc.tcp://192.168.1.106:4840"/>
Beremiz/beremiz_tutorial_opc_ua_hexadeceimal/opcua_0@opcua/selected.csv deleted 100644 → 0
View file @ 8b91d7cc
input,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 0)",1,str,relay0,Int32,0
input,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 1)",1,str,relay1,Int32,1
input,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 2)",1,str,relay2,Int32,2
input,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 3)",1,str,relay3,Int32,3
output,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 0)",1,str,relay0,Int32,0
output,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 1)",1,str,relay1,Int32,1
output,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 2)",1,str,relay2,Int32,2
output,"LocalizedText(Encoding:3, Locale:en-US, Text:Relay 3)",1,str,relay3,Int32,3
Beremiz/beremiz_tutorial_opc_ua_hexadeceimal/plc.xml deleted 100644 → 0
View file @ 8b91d7cc
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2021-05-14T14:33:11"/>
<contentHeader name="Counter (OSIE)" modificationDateTime="2021-10-28T20:09:02">
<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>
<pou name="plc_prg" pouType="program">
<interface>
<inputVars>
<variable name="Reset">
<type>
<BOOL/>
</type>
</variable>
</inputVars>
<outputVars>
<variable name="Cnt0">
<type>
<INT/>
</type>
</variable>
<variable name="Cnt1">
<type>
<INT/>
</type>
</variable>
</outputVars>
<localVars>
<variable name="CounterST0">
<type>
<derived name="CounterST"/>
</type>
</variable>
</localVars>
</interface>
<body>
<FBD>
<comment localId="1" height="143" width="201">
<position x="566" y="75"/>
<content>
<xhtml:p><![CDATA[Test Ivan: this PLC will switch ON / OFF attached over modbus relays {0..3} of a Lime2 coupler.]]></xhtml:p>
</content>
</comment>
<block localId="2" typeName="CounterST" instanceName="CounterST0" executionOrderId="0" height="109" width="99">
<position x="288" y="192"/>
<inputVariables>
<variable formalParameter="Reset">
<connectionPointIn>
<relPosition x="0" y="42"/>
<connection refLocalId="3">
<position x="288" y="234"/>
<position x="258" y="234"/>
<position x="258" y="218"/>
<position x="231" y="218"/>
</connection>
</connectionPointIn>
</variable>
</inputVariables>
<inOutVariables/>
<outputVariables>
<variable formalParameter="Out1">
<connectionPointOut>
<relPosition x="99" y="42"/>
</connectionPointOut>
</variable>
<variable formalParameter="Out0">
<connectionPointOut>
<relPosition x="99" y="86"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="3" executionOrderId="0" height="24" width="50" negated="false">
<position x="181" y="206"/>
<connectionPointOut>
<relPosition x="50" y="12"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
<outVariable localId="4" executionOrderId="0" height="24" width="42" negated="false">
<position x="433" y="266"/>
<connectionPointIn>
<relPosition x="0" y="12"/>
<connection refLocalId="2" formalParameter="Out0">
<position x="433" y="278"/>
<position x="387" y="278"/>
</connection>
</connectionPointIn>
<expression>Cnt0</expression>
</outVariable>
<outVariable localId="6" executionOrderId="0" height="24" width="42" negated="false">
<position x="435" y="222"/>
<connectionPointIn>
<relPosition x="0" y="12"/>
<connection refLocalId="2" formalParameter="Out1">
<position x="435" y="234"/>
<position x="387" y="234"/>
</connection>
</connectionPointIn>
<expression>Cnt1</expression>
</outVariable>
</FBD>
</body>
</pou>
<pou name="CounterST" pouType="functionBlock">
<interface>
<inputVars>
<variable name="Reset">
<type>
<BOOL/>
</type>
</variable>
</inputVars>
<outputVars>
<variable name="Out1">
<type>
<INT/>
</type>
</variable>
<variable name="Out0">
<type>
<INT/>
</type>
</variable>
</outputVars>
<localVars>
<variable name="Cnt1">
<type>
<INT/>
</type>
</variable>
<variable name="Cnt0">
<type>
<INT/>
</type>
</variable>
</localVars>
<externalVars>
<variable name="ResetCounterValue">
<type>
<INT/>
</type>
</variable>
<variable name="Relay0">
<type>
<DINT/>
</type>
</variable>
<variable name="Relay1">
<type>
<DINT/>
</type>
</variable>
<variable name="Relay2">
<type>
<DINT/>
</type>
</variable>
<variable name="Relay3">
<type>
<DINT/>
</type>
</variable>
</externalVars>
</interface>
<body>
<ST>
<xhtml:p><![CDATA[IF Reset THEN
Cnt0 := ResetCounterValue;
Cnt1 := ResetCounterValue;
Reset := False;
ELSE
Cnt0 := Cnt0 + 1;
Cnt1 := Cnt1 + 1;
IF Cnt1 = 0 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 50 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 100 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 150 THEN
Relay0 := 0;
Relay1 := 0;
Relay2 := 1;
Relay3 := 1;
END_IF;
IF Cnt1 = 150 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 200 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 250 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 300 THEN
Relay0 := 0;
Relay1 := 1;
Relay2 := 1;
Relay3 := 1;
END_IF;
IF Cnt1 = 350 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 400 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 450 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 500 THEN
Relay0 := 1;
Relay1 := 0;
Relay2 := 1;
Relay3 := 1;
END_IF;
IF Cnt1 = 550 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 0;
Relay3 := 0;
END_IF;
IF Cnt1 = 600 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 0;
Relay3 := 1;
END_IF;
IF Cnt1 = 650 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 1;
Relay3 := 0;
END_IF;
IF Cnt1 = 700 THEN
Relay0 := 1;
Relay1 := 1;
Relay2 := 1;
Relay3 := 1;
Cnt1 := 0;
END_IF;
END_IF;
Out1 := Cnt1;
Out0 := Cnt0;]]></xhtml:p>
</ST>
</body>
</pou>
</pous>
</types>
<instances>
<configurations>
<configuration name="config">
<resource name="resource1">
<task name="task0" priority="0" interval="T#20ms">
<pouInstance name="instance0" typeName="plc_prg"/>
</task>
</resource>
<globalVars>
<variable name="ResetCounterValue">
<type>
<INT/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
</variable>
<variable name="Relay0" address="%QD1.0">
<type>
<DINT/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[OPC-UA relay 0]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay1" address="%QD1.1">
<type>
<DINT/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[OPC-UA relay 1]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay2" address="%QD1.2">
<type>
<DINT/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[OPC-UA relay 2]]></xhtml:p>
</documentation>
</variable>
<variable name="Relay3" address="%QD1.3">
<type>
<DINT/>
</type>
<initialValue>
<simpleValue value="0"/>
</initialValue>
<documentation>
<xhtml:p><![CDATA[OPC-UA relay 2]]></xhtml:p>
</documentation>
</variable>
</globalVars>
</configuration>
</configurations>
</instances>
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7