ROBOT_DEMO: add more IP addresses to ORTE manager's list

diff --git a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
index d179362d67e17449b56ce7d645f4ee4d698fcea7..02d2e0fc8d978798b0c4573d6ea85e1153ec9669 100644 (file)
--- a/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
+++ b/orte/Robot_Demo/gen/org/ocera/orte/demo/R.java
@@ -15,6 +15,7 @@ public final class R {
     }
     public static final class id {
         public static final int button1=0x7f07000d;
+        public static final int crane=0x7f070011;
         public static final int editText1=0x7f070003;
         public static final int editText2=0x7f070006;
         public static final int editText3=0x7f070009;
@@ -22,7 +23,6 @@ public final class R {
         public static final int exit=0x7f070014;
         public static final int hokuyo=0x7f070010;
         public static final int hokuyo_view=0x7f070000;
-        public static final int lift=0x7f070011;
         public static final int magnet=0x7f070012;
         public static final int speed=0x7f07000e;
         public static final int speed_mon=0x7f07000f;

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 6094064ae7762378467ff919bd55c97abdb35b65..d50b0fe9858edc634afd45b3f386d849f67211d6 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
@@ -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;