Commit f7052b68 authored by blissadm's avatar blissadm

+raw_com e517 -xml config in git +config test e517

parent e17a56be
......@@ -4,3 +4,11 @@ build
*.swp
doc/_build
.coverage
# Do not track config files :
tango/*.xml
# except tests :
!test_config.xml
!cyril_config.xml
......@@ -59,6 +59,7 @@ class PI_E517(Controller):
add_axis_method(axis, self.get_id)
add_axis_method(axis, self.get_info)
add_axis_method(axis, self.steps_per_unit)
add_axis_method(axis, self.raw_com)
# Enables the closed-loop.
# self.sock.write("SVO 1 1\n")
......@@ -203,6 +204,9 @@ class PI_E517(Controller):
else:
print "steps_per_unit writing is not (yet?) implemented."
def raw_com(self, axis, cmd):
return self.send(axis, cmd)
def send(self, axis, cmd):
"""
- Adds the 'newline' terminator character : "\\\\n"
......
......@@ -241,7 +241,6 @@ class PMD206(Controller):
pmd206_debug("axis %d status : %s" % (axis.channel, self._axes_status[axis.channel]))
# we don't care of errors.
# running means position is corrected, related to closed loop
# we just check if target position was reached
if _s & 0x04:
......
......@@ -258,23 +258,29 @@ f=get_axis("p6")
load_cfg_fromstring("""
<config>
<controller class="PI_E517" name="testid16b">
<host value="192.168.16b.10"/>
<controller class="PI_E517" name="e517b">
<host value="192.168.168.10" />
<axis name="p1">
<channel value="1"/>
<chan_letter value="A"/>
</axis>
<channel value="1" />
<chan_letter value="A" />
<velocity value="10" />
<steps_per_unit value="1" />
<settings><velocity value="10.0" /><position value="20.3624" /><low_limit value="-1000000000.0" /><high_limit value="1000000000.0" /></settings></axis>
<axis name="p2">
<channel value="2"/>
<chan_letter value="B"/>
</axis>
<channel value="2" />
<chan_letter value="B" />
<velocity value="10" />
<steps_per_unit value="1" />
<settings><velocity value="10.0" /><position value="38.3457" /><low_limit value="-1000000000.0" /><high_limit value="1000000000.0" /></settings></axis>
<axis name="p3">
<channel value="3"/>
<chan_letter value="C"/>
</axis>
<channel value="3" />
<chan_letter value="C" />
<velocity value="10" />
<steps_per_unit value="1" />
<settings><velocity value="10.0" /><position value="-0.3161" /><low_limit value="-1000000000.0" /><high_limit value="1000000000.0" /></settings></axis>
</controller>
</config>
""")
""") ;
a=get_axis("p1")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment