ROBOT_DEMO: change lift to crane

diff --git a/orte/Robot_Demo/res/menu/activity_main.xml b/orte/Robot_Demo/res/menu/activity_main.xml
index 05560e2a06dee79e6697dab8ba84cf8a834e1726..d85a49b6941783e38756661bfa7f46317df1a30d 100644 (file)
--- a/orte/Robot_Demo/res/menu/activity_main.xml
+++ b/orte/Robot_Demo/res/menu/activity_main.xml
@@ -17,8 +17,8 @@
         android:orderInCategory="3">
     </item>
     
-    <item android:id="@+id/lift"
-        android:title="Lift up"
+    <item android:id="@+id/crane"
+        android:title="Crane up"
         android:orderInCategory="4"
         android:showAsAction="never">
     </item>
@@ -40,4 +40,4 @@
         android:orderInCategory="7"
         android:showAsAction="never">
     </item>
-</menu>
\ No newline at end of file
+</menu>

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java b/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
index d75d6acaaab88fd63023f0a420ff9795a8c3281b..92df568e90e2884f2cc45af225258f2835781a3c 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/CraneCmdPublish.java
@@ -65,7 +65,7 @@ public class CraneCmdPublish {
                }
        }
        
-       public void send(short magnet) {
+       public void send(int magnet) {
                liftmsg.position = magnet;
                pub.send(liftmsg);
        }

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java b/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
index f56d42f31b8c7ffbc06fc7d2bd47d3d7932cffb7..e0a3b3896a2e0b15b550aff0bce34d37cd24260b 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MagnetCmdPublish.java
@@ -65,7 +65,7 @@ public class MagnetCmdPublish {
                }
        }
        
-       public void send(short magnet) {
+       public void send(int magnet) {
                magnetmsg.magnet = magnet;
                pub.send(magnetmsg);
        }

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
index b4f7f4723944d1f59a463900a92099624d95dcb0..6094064ae7762378467ff919bd55c97abdb35b65 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
@@ -232,20 +232,20 @@ public class MainActivity extends Activity {
                        hokuyo_view.invalidate();
                        item.setTitle("Start LRF");
                }
-               else if (item.getTitle().equals("Lift up")) {
-                       crane_cmd.send((short)0x100);
-                       item.setTitle("Lift down");
+               else if (item.getTitle().equals("Crane up")) {
+                       crane_cmd.send(0x100);
+                       item.setTitle("Crane down");
                }
-               else if (item.getTitle().equals("Lift down")) {
-                       crane_cmd.send((short)0x190);
-                       item.setTitle("Lift up");
+               else if (item.getTitle().equals("Crane down")) {
+                       crane_cmd.send(0x190);
+                       item.setTitle("Crane up");
                }
                else if (item.getTitle().equals("Magnet on")) {
-                       magnet_cmd.send((short)1);
+                       magnet_cmd.send(1);
                        item.setTitle("Magnet off");                    
                }
                else if (item.getTitle().equals("Magnet off")) {
-                       magnet_cmd.send((short)0);
+                       magnet_cmd.send(0);
                        item.setTitle("Magnet on");                     
                }
                else if (item.getTitle().equals("Voltage monitor")) {