--- a/etherlab/EthercatCIA402Slave.py Fri Sep 28 18:06:59 2018 +0300
+++ b/etherlab/EthercatCIA402Slave.py Fri Sep 28 18:12:18 2018 +0300
@@ -159,10 +159,11 @@
("%s Axis Ref", "AXIS_REF", "%s", "%%IW%s.402")]]
children.extend(self.CTNParent.GetDeviceLocationTree(
self.GetSlavePos(), current_location, axis_name))
- return {"name": axis_name,
- "type": LOCATION_CONFNODE,
- "location": self.GetFullIEC_Channel(),
- "children": children,
+ return {
+ "name": axis_name,
+ "type": LOCATION_CONFNODE,
+ "location": self.GetFullIEC_Channel(),
+ "children": children,
}
def CTNGlobalInstances(self):
--- a/etherlab/EthercatSlave.py Fri Sep 28 18:06:59 2018 +0300
+++ b/etherlab/EthercatSlave.py Fri Sep 28 18:12:18 2018 +0300
@@ -152,10 +152,11 @@
return self.CTNParent.GetSlaveVariables(self.GetSlavePos(), limits)
def GetVariableLocationTree(self):
- return {"name": self.BaseParams.getName(),
- "type": LOCATION_CONFNODE,
- "location": self.GetFullIEC_Channel(),
- "children": self.CTNParent.GetDeviceLocationTree(self.GetSlavePos(), self.GetCurrentLocation(), self.BaseParams.getName())
+ return {
+ "name": self.BaseParams.getName(),
+ "type": LOCATION_CONFNODE,
+ "location": self.GetFullIEC_Channel(),
+ "children": self.CTNParent.GetDeviceLocationTree(self.GetSlavePos(), self.GetCurrentLocation(), self.BaseParams.getName())
}
def CTNGenerate_C(self, buildpath, locations):