# HG changeset patch
# User Edouard Tisserant
# Date 1337547936 -7200
# Node ID 438a4a1ff18806500a0fa9509d9110a512fb8a3b
# Parent  5726f2bbdaced516361d745da1fff604e7e1565b
updated examples also

diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/MCL@motion/baseplugin.xml
--- a/ethercat_tests/wago_higen/MCL@motion/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="MCL" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="ethercat" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="ethercat" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EtherlabInstance/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="master" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="master" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EtherlabNode/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="coupler" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="coupler" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="higen" IEC_Channel="3"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="higen" IEC_Channel="3"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CIA402SlaveParams RatioNumerator="65536" RatioDenominator="360" PositionOffset="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/plugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/higen@EthercatCIA402Slave/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CIA402SlaveParams RatioNumerator="65536" RatioDenominator="360" PositionOffset="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="inputs" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="inputs" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="outputs" IEC_Channel="2"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="outputs" IEC_Channel="2"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/plugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/master@EthercatNode/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EtherlabNode/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_higen/ethercat@etherlab/plugin.xml
--- a/ethercat_tests/wago_higen/ethercat@etherlab/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EtherlabInstance/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/MCL@motion/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/MCL@motion/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="MCL" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="ethercat" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="ethercat" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EtherlabInstance/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="master" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="master" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EtherlabNode/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="coupler" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/coupler@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="coupler" IEC_Channel="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="inputs" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/inputs@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="inputs" IEC_Channel="1"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="outputs" IEC_Channel="2"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/outputs@EthercatSlave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="outputs" IEC_Channel="2"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/plugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EtherlabNode/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/baseconfnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/baseconfnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BaseParams Name="sanyo" IEC_Channel="3"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/baseplugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/baseplugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<BaseParams Name="sanyo" IEC_Channel="3"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/confnode.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/confnode.xml	Sun May 20 23:05:36 2012 +0200
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CIA402SlaveParams RatioNumerator="65536" RatioDenominator="180" PositionOffset="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/plugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/master@EthercatNode/sanyo@EthercatCIA402Slave/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CIA402SlaveParams RatioNumerator="65536" RatioDenominator="180" PositionOffset="0"/>
diff -r 5726f2bbdace -r 438a4a1ff188 ethercat_tests/wago_sanyo/ethercat@etherlab/plugin.xml
--- a/ethercat_tests/wago_sanyo/ethercat@etherlab/plugin.xml	Sun May 20 22:42:37 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EtherlabInstance/>
diff -r 5726f2bbdace -r 438a4a1ff188 etherlab/etherlab.py
--- a/etherlab/etherlab.py	Sun May 20 22:42:37 2012 +0200
+++ b/etherlab/etherlab.py	Sun May 20 23:05:36 2012 +0200
@@ -10,7 +10,7 @@
 from ConfigEditor import NodeEditor, CIA402NodeEditor, ETHERCAT_VENDOR, ETHERCAT_GROUP, ETHERCAT_DEVICE
 
 try:
-    from confnodes.motion import Headers, AxisXSD
+    from MotionLibrary import Headers, AxisXSD
     HAS_MCL = True
 except:
     HAS_MCL = False