Update project.

fef7c81f · Ivan Tyagov · 08344b2e · 08344b2e · 08344b2e · fef7c81f
Commit fef7c81f authored Apr 10, 2023 by Ivan Tyagov
10 changed files
--- a/Beremiz/beremiz_network_test/k3@opcua/confnode.xml
+++ b/Beremiz/beremiz_network_test/k3@opcua/confnode.xml
-<?xml version='1.0' encoding='utf-8'?>
-<OPCUAClient xmlns:xsd="http://www.w3.org/2001/XMLSchema" Server_URI="opc.tcp://192.168.0.54:4840"/>
--- a/Beremiz/beremiz_network_test/k3@opcua/selected.csv
+++ b/Beremiz/beremiz_network_test/k3@opcua/selected.csv
-output,I2C0 / Relay 0,1,str,i2c0.relay0,Int32,0
--- a/Beremiz/beremiz_network_test/plc.xml
+++ b/Beremiz/beremiz_network_test/plc.xml
 <?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="2023-03-10T15:13:15">
+  <contentHeader name="Counter (OSIE)" modificationDateTime="2023-04-10T11:35:47">
    <coordinateInfo>
      <fbd>
        <scaling x="0" y="0"/>
@@ -194,11 +194,6 @@
                <DINT/>
              </type>
            </variable>
-            <variable name="Coupler2_Relay0">
-              <type>
-                <DINT/>
-              </type>
-            </variable>
          </externalVars>
        </interface>
        <body>
@@ -210,30 +205,15 @@
 ELSE
  Cnt0 := Cnt0 + 1;
  Cnt1 := Cnt1 + 1;
-  Coupler2_Relay0 := Coupler2_Relay0 + 1;
-  IF Cnt1 = 50 THEN
+  IF Cnt1 = 5 THEN
    Coupler0_Relay0 := 1;
-    Coupler0_Relay1 := 1; 
-    Coupler0_Relay2 := 1;
-    Coupler0_Relay3 := 1;
-    Coupler1_Relay0 := 0;
-    Coupler1_Relay1 := 0; 
-    Coupler1_Relay2 := 0;
-    Coupler1_Relay3 := 0;
+    Coupler1_Relay0 := 1;
  END_IF;
-  
-  IF Cnt1 = 100 THEN
+  IF Cnt1 = 10 THEN
    Coupler0_Relay0 := 0;
-    Coupler0_Relay1 := 0;
-    Coupler0_Relay2 := 0;
-    Coupler0_Relay3 := 0;
-    Coupler1_Relay0 := 1;
-    Coupler1_Relay1 := 1; 
-    Coupler1_Relay2 := 1;
-    Coupler1_Relay3 := 1;
+    Coupler1_Relay0 := 0;
    Cnt1 := 0;
  END_IF;
-  
 END_IF;

 Out1 := Cnt1;
@@ -247,7 +227,7 @@ Out0 := Cnt0;]]></xhtml:p>
    <configurations>
      <configuration name="config">
        <resource name="resource1">
-          <task name="task0" priority="0" interval="T#0.01ms">
+          <task name="task0" priority="0" interval="T#10ms">
            <pouInstance name="instance0" typeName="plc_prg"/>
          </task>
        </resource>
@@ -348,17 +328,6 @@ Out0 := Cnt0;]]></xhtml:p>
              <xhtml:p><![CDATA[OPC-UA relay 2]]></xhtml:p>
            </documentation>
          </variable>
-          <variable name="Coupler2_Relay0" address="%QD2.0">
-            <type>
-              <DINT/>
-            </type>
-            <initialValue>
-              <simpleValue value="0"/>
-            </initialValue>
-            <documentation>
-              <xhtml:p><![CDATA[OPC-UA relay 2]]></xhtml:p>
-            </documentation>
-          </variable>
        </globalVars>
      </configuration>
    </configurations>

--- a/Beremiz/beremiz_network_test/stm32mp1-0@opcua/baseconfnode.xml
+++ b/Beremiz/beremiz_network_test/stm32mp1-0@opcua/baseconfnode.xml
-<?xml version='1.0' encoding='utf-8'?>
-<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="1" Name="stm32mp1-0"/>
--- a/Beremiz/beremiz_network_test/k3@opcua/baseconfnode.xml
+++ b/Beremiz/beremiz_network_test/k3@opcua/baseconfnode.xml
 <?xml version='1.0' encoding='utf-8'?>
-<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="2" Name="k3"/>
+<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="stm32mp1-2"/>
--- a/Beremiz/beremiz_network_test/stm32mp1-1@opcua/confnode.xml
+++ b/Beremiz/beremiz_network_test/stm32mp1-1@opcua/confnode.xml
 <?xml version='1.0' encoding='utf-8'?>
-<OPCUAClient xmlns:xsd="http://www.w3.org/2001/XMLSchema" Server_URI="opc.tcp://192.168.0.66:4840">
+<OPCUAClient xmlns:xsd="http://www.w3.org/2001/XMLSchema" Server_URI="opc.tcp://192.168.0.29:4840">
  <AuthType/>
 </OPCUAClient>
--- a/Beremiz/beremiz_network_test/stm32mp1-0@opcua/selected.csv
+++ b/Beremiz/beremiz_network_test/stm32mp1-0@opcua/selected.csv
--- a/Beremiz/beremiz_network_test/stm32mp1-1@opcua/baseconfnode.xml
+++ b/Beremiz/beremiz_network_test/stm32mp1-1@opcua/baseconfnode.xml
 <?xml version='1.0' encoding='utf-8'?>
-<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="0" Name="stm32mp1-1"/>
+<BaseParams xmlns:xsd="http://www.w3.org/2001/XMLSchema" IEC_Channel="1" Name="stm32mp1-3"/>
--- a/Beremiz/beremiz_network_test/stm32mp1-0@opcua/confnode.xml
+++ b/Beremiz/beremiz_network_test/stm32mp1-0@opcua/confnode.xml
--- a/Beremiz/beremiz_network_test/stm32mp1-1@opcua/selected.csv
+++ b/Beremiz/beremiz_network_test/stm32mp1-1@opcua/selected.csv