Mercurial Mercurial > beremiz / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Merged
authorlaurent
Mon, 21 May 2012 10:07:35 +0200
changeset 2054 fea31f89b5f6
parent 2053 5998beb54a6c (current diff)
parent 2050 6da739ac1346 (diff)
child 2055 d845f2c546a6
Merged 
--- a/ethercat_tests/wago_higen/beremiz.xml	Mon May 21 10:07:11 2012 +0200
+++ b/ethercat_tests/wago_higen/beremiz.xml	Mon May 21 10:07:35 2012 +0200
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BeremizRoot URI_location="PYRO://192.168.42.101:3000">
-  <TargetType>
-    <Xenomai/>
-  </TargetType>
-</BeremizRoot>
+<?xml version="1.0" encoding="UTF-8"?>
+<BeremizRoot>
+  <TargetType>
+    <Xenomai/>
+  </TargetType>
+</BeremizRoot>
--- a/ethercat_tests/wago_higen/plc.xml	Mon May 21 10:07:11 2012 +0200
+++ b/ethercat_tests/wago_higen/plc.xml	Mon May 21 10:07:35 2012 +0200
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://www.plcopen.org/xml/tc6.xsd"
-         xmlns:xhtml="http://www.w3.org/1999/xhtml"
-         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
+<project xmlns="http://www.plcopen.org/xml/tc6.xsd"
+         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <fileHeader companyName="Laurent BESSARD"
               productName="test_ethercat"
               productVersion="1.0"
               creationDateTime="2011-10-20T19:01:52"/>
   <contentHeader name="test_ethercat"
-                 modificationDateTime="2012-05-13T14:57:09">
+                 modificationDateTime="2012-05-20T19:25:58">
     <coordinateInfo>
       <fbd>
         <scaling x="0" y="0"/>
@@ -32,7 +32,7 @@
                 <BOOL/>
               </type>
             </variable>
-            <variable name="LED" address="%QX0.0.2.28688.1">
+            <variable name="GREENLED" address="%QX0.0.2.28688.1">
               <type>
                 <BOOL/>
               </type>
--- a/ethercat_tests/wago_sanyo/beremiz.xml	Mon May 21 10:07:11 2012 +0200
+++ b/ethercat_tests/wago_sanyo/beremiz.xml	Mon May 21 10:07:35 2012 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<BeremizRoot URI_location="PYRO://127.0.1.1:3000">
+<BeremizRoot>
   <TargetType>
-    <Xenomai CFLAGS="" LDFLAGS=""/>
+    <Xenomai/>
   </TargetType>
 </BeremizRoot>
--- a/ethercat_tests/wago_sanyo/plc.xml	Mon May 21 10:07:11 2012 +0200
+++ b/ethercat_tests/wago_sanyo/plc.xml	Mon May 21 10:07:35 2012 +0200
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://www.plcopen.org/xml/tc6.xsd"
-         xmlns:xhtml="http://www.w3.org/1999/xhtml"
-         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
+<project xmlns="http://www.plcopen.org/xml/tc6.xsd"
+         xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns:xhtml="http://www.w3.org/1999/xhtml">
   <fileHeader companyName="Laurent BESSARD"
               productName="test_ethercat"
               productVersion="1.0"
               creationDateTime="2011-10-20T19:01:52"/>
   <contentHeader name="test_ethercat"
-                 modificationDateTime="2012-03-18T23:04:07">
+                 modificationDateTime="2012-05-20T19:26:53">
     <coordinateInfo>
       <fbd>
         <scaling x="0" y="0"/>
@@ -32,7 +32,7 @@
                 <BOOL/>
               </type>
             </variable>
-            <variable name="LED" address="%QX0.0.2.28688.1">
+            <variable name="GREENLED" address="%QX0.0.2.28688.1">
               <type>
                 <BOOL/>
               </type>
beremiz