From 575a15ce3e5110f1f69bd7b134a7f7c355c67b29 Mon Sep 17 00:00:00 2001 From: Martin Vajnar Date: Thu, 25 Jul 2013 19:11:47 +0200 Subject: [PATCH] ROBOT_DEMO: incorporate changes in ORTETypeRegisterAdd() --- orte/Robot_Demo/src/org/ocera/orte/demo/HokuyoScanType.java | 2 +- orte/Robot_Demo/src/org/ocera/orte/demo/MainActivity.java | 2 +- orte/Robot_Demo/src/org/ocera/orte/demo/SpeedMotionType.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 4a9cebb..d75444c 100644 --- 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()); + b = domainApp.regNewDataType("hokuyo_scan",getMaxDataLength(),this.buffer); 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 f4d299a..2e3d650 100644 --- 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"}; + private String[] mgrs = {"192.168.1.5","192.168.1.8","10.1.1.1","10.1.1.4"}; 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 e953f19..3823a7c 100644 --- 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()); + b = domainApp.regNewDataType("motion_speed",getMaxDataLength(),this.buffer); if (b == false) { System.out.println(":j!: cannot register data type!"); } -- 2.39.2