From 16741d2cd257c0fadb83825234f3832e8f8315bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20=C5=81ukawski?= <bwmn.peter@gmail.com>
Date: Thu, 3 May 2018 16:46:34 +0200
Subject: [PATCH] Fix port names, comment out obsolete simulator

---
 share/amorSimBase/scripts/amorSimBase.xml | 8 ++++----
 share/amorTools/scripts/amorTools.xml     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/share/amorSimBase/scripts/amorSimBase.xml b/share/amorSimBase/scripts/amorSimBase.xml
index 3778026..a6aface 100644
--- a/share/amorSimBase/scripts/amorSimBase.xml
+++ b/share/amorSimBase/scripts/amorSimBase.xml
@@ -1,22 +1,22 @@
 <application>
     <name>amorSimBase App</name>
 
-    <module>
+    <!--<module>
         <name>teoSim</name>
         <parameters>--env /usr/local/share/amor/contexts/openrave/models/amor_clean.env.xml --amor::initPoss "(-90 0 0 -180 180 90 -90)"</parameters>
         <node>localhost</node>
-    </module>
+    </module>-->
 
     <module>
         <name>BasicCartesianControl</name>
-        <parameters>--name /amorSim/CartesianControl --from /usr/local/share/amor/contexts/kinematics/armKinematics.ini --angleRepr RPY --robot remote_controlboard --local /BasicCartesianControl/amorSim --remote /amor/amorManipulator</parameters>
+        <parameters>--name /amorSim/CartesianControl --from /usr/local/share/amor/contexts/kinematics/armKinematics.ini --angleRepr RPY --robot remote_controlboard --local /BasicCartesianControl/amorSim --remote /amorRobot/amorManipulator</parameters>
         <node>localhost</node>
         <deployer>yarpdev</deployer>
     </module>
 
     <module>
         <name>gnome-terminal</name>
-        <parameters>-e "yarp rpc /amor/amorManipulator/rpc:i"</parameters>
+        <parameters>-e "yarp rpc /amorRobot/amorManipulator/rpc:i"</parameters>
         <node>localhost</node>
         <deployer>gksu</deployer>
     </module>
diff --git a/share/amorTools/scripts/amorTools.xml b/share/amorTools/scripts/amorTools.xml
index 26bfea9..4d9b67e 100644
--- a/share/amorTools/scripts/amorTools.xml
+++ b/share/amorTools/scripts/amorTools.xml
@@ -4,14 +4,14 @@
     <!-- JOINT -->
     <module>
         <name>gnome-terminal</name>
-        <parameters>-e "yarp rpc /amor/amorManipulator/rpc:i"</parameters>
+        <parameters>-e "yarp rpc /amorRobot/amorManipulator/rpc:i"</parameters>
         <node>localhost</node>
     </module>
 
     <!-- CARTESIAN -->
     <module>
         <name>gnome-terminal</name>
-        <parameters>-e "yarp rpc /asibot/CartesianControl/rpc_transform:s"</parameters>
+        <parameters>-e "yarp rpc /amor/CartesianControl/rpc_transform:s"</parameters>
         <node>localhost</node>
     </module>
 
@@ -35,12 +35,12 @@
 
     <module>
         <name>gnome-terminal</name>
-        <parameters>-e "keyboardController --remoteCartesian /amorSim/CartesianControl --remoteRobot /amor/amorManipulator"</parameters>
+        <parameters>-e "keyboardController --remoteCartesian /amorSim/CartesianControl --remoteRobot /amorRobot/amorManipulator"</parameters>
     </module>
 
     <module>
         <name>streamingDeviceController</name>
-        <parameters>--streamingDevice SpaceNavigator --remoteCartesian /amorSim/CartesianControl --SpaceNavigator::remote /spacenavigator</parameters>
+        <parameters>--streamingDevice SpaceNavigator --remoteCartesian /amorSim/CartesianControl --SpaceNavigator::remote /spacenavigator/mouse</parameters>
     </module>
 
     <module>