Revert "ROBOT_DEMO: incorporate changes in ORTETypeRegisterAdd()"

This reverts commit 4e4e50c8a29fc3a2cf37d681e7f95b3d5e01d932.

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
index d75444c277321ae976507e3446e060e0d9643072..4a9cebb6b69b9ad5c7f3eedaf8b6305779df5728 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java
@@ -16,7 +16,7 @@ public class HokuyoScanType extends MessageData {
                     boolean b;
                     counter++;
                 this.setTopic(newTopic); 
-                b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength(),this.buffer); 
+                b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength()); 
                     if (b == false) {
                       System.out.println(":j!: cannot register data type!");    
                     }

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 2e3d650477a3b76fcc46568c6aaa7d6abc12eef9..f4d299ad60d018fa388df8830e285555d37e362a 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java
@@ -18,7 +18,7 @@ import android.view.MenuItem;
 public class MainActivity extends Activity {
        
        private Manager manager = null;
-    private String[] mgrs = {"192.168.1.5","192.168.1.8","10.1.1.1","10.1.1.4"};
+    private String[] mgrs = {"192.168.1.5","192.168.1.8"};
        private MotionSpeedPublish motion_speed = null;
        private HokuyoScanSubscribe hokuyo_scan = null;
     private SensorManager mSensorManager = null;

diff --git a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java b/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
index 3823a7cebe88a5c1a9d3d6aff40138f2f36e6150..e953f19150bd33677ce2e524b010d03c0243c8b1 100644 (file)
--- a/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
+++ b/orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java
@@ -16,7 +16,7 @@ public class SpeedMotionType extends MessageData
             boolean b;
             counter++;
          this.setTopic(newTopic);
-        b = domainApp.regNewDataType("motion_speed",getMaxDataLength(),this.buffer); 
+        b = domainApp.regNewDataType("motion_speed",getMaxDataLength()); 
             if (b == false) {
               System.out.println(":j!: cannot register data type!");    
             }