]> rtime.felk.cvut.cz Git - orte.git/blobdiff - orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
ROBOT_DEMO: add more IP addresses to ORTE manager's list
[orte.git] / orte / Robot_Demo / src / org / ocera / orte / demo / MainActivity.java
index b4f7f4723944d1f59a463900a92099624d95dcb0..d50b0fe9858edc634afd45b3f386d849f67211d6 100644 (file)
@@ -51,7 +51,9 @@ public class MainActivity extends Activity {
     };
        
        private Manager manager = null;
-    private String[] mgrs = {"192.168.1.5","192.168.1.8","192.168.1.29","10.1.1.1"};
+    private String[] mgrs = {"192.168.1.5","192.168.1.8","192.168.1.29",
+               "10.1.1.1","10.1.1.2","10.1.1.3","10.1.1.4","10.1.1.5","10.1.1.6","10.1.1.7","10.1.1.8","10.1.1.9","10.1.1.10",
+               "10.1.1.11","10.1.1.12","10.1.1.13","10.1.1.14","10.1.1.15","10.1.1.16","10.1.1.17","10.1.1.18","10.1.1.19","10.1.1.20"};
        private MotionSpeedPublish motion_speed_publ = null;
        private MotionSpeedSubscribe motion_speed_subs = null;
        private HokuyoScanSubscribe hokuyo_scan = null;
@@ -232,20 +234,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")) {