# HG changeset patch
# User Laurent Bessard
# Date 1348308426 -7200
# Node ID 7d0ebbff1d083345702aa18bc42486b6bf7d4190
# Parent  22e9993348f682b8a2963b52ad74a1c228806426# Parent  14dfb786c53e7ebd709925c19563bf7c7f149683
Merged

diff -r 22e9993348f6 -r 7d0ebbff1d08 etherlab/etherlab.py
--- a/etherlab/etherlab.py	Fri Sep 21 16:02:33 2012 +0200
+++ b/etherlab/etherlab.py	Sat Sep 22 12:07:06 2012 +0200
@@ -133,13 +133,12 @@
             self.CTNParent.SetSlaveAlias(position, value)
             return value, True
         
-        value, changed = ConfigTreeNode.SetParamsAttribute(self, path, value)
         # Filter IEC_Channel, Slave_Type and Alias that have specific behavior
         if path == "BaseParams.IEC_Channel":
             self.CTNParent.SetSlavePosition(position, value)
         
-        return value, changed
-
+        return ConfigTreeNode.SetParamsAttribute(self, path, value)
+    
     def GetSlaveInfos(self):
         return self.CTNParent.GetSlaveInfos(self.GetSlavePos())
     
diff -r 22e9993348f6 -r 7d0ebbff1d08 etherlab/plc_cia402node.c
--- a/etherlab/plc_cia402node.c	Fri Sep 21 16:02:33 2012 +0200
+++ b/etherlab/plc_cia402node.c	Sat Sep 22 12:07:06 2012 +0200
@@ -29,14 +29,14 @@
 	__SwitchedOn,
 	__OperationEnabled,
 	__QuickStopActive,
-	__FaultReactionActive,
-	__Fault,
+    __FaultReactionActive,
+    __Fault,
 } __CIA402NodeState;
 
 typedef struct {
 %(entry_variables)s
-	__CIA402NodeState state;
-	axis_s* axis;
+    __CIA402NodeState state;
+    axis_s* axis;
 } __CIA402Node;
 
 static __CIA402Node __CIA402Node_%(location)s;