vato007/picar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add recording functionality, did some other minor tweaks as well to protos

Browse Source
This commit is contained in:
Piv
2020-04-22 20:57:41 +09:30
parent f44877397c
commit 54770d7675
15 changed files with 184 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
View File

@@ -13,7 +13,8 @@ import android.view.SurfaceView;
import androidx.preference.PreferenceManager;
import org.vato.carcontroller.Empty;
import com.google.protobuf.Empty;
import org.vato.carcontroller.Int32Value;
import org.vato.carcontroller.PersonTrackingGrpc;
import org.vato.carcontroller.PointScan;
@@ -89,7 +90,7 @@ public class LidarView extends SurfaceView implements AbstractUpdater.MapChanged
}
};
// use async grpc method, ZMQ doesn't need to connect straight away.
stub.startTracking(Int32Value.newBuilder().setValue(Integer.parseInt(port)).build(), response);
stub.startTracking(Empty.newBuilder().build(), response);
}
@Override

5
app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
View File

@@ -13,8 +13,8 @@ import android.view.SurfaceView;
import androidx.preference.PreferenceManager;
import com.google.protobuf.ByteString;
import com.google.protobuf.Empty;
import org.vato.carcontroller.Empty;
import org.vato.carcontroller.SlamControlGrpc;
import org.vato.carcontroller.SlamDetails;
import org.vato.carcontroller.SlamLocation;
@@ -57,7 +57,7 @@ public class SlamView extends SurfaceView implements AbstractUpdater.MapChangedL
private void init() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String host = prefs.getString("host", "10.0.0.53");
port = prefs.getString("zmqPort", "5050");
port = prefs.getString("zmqPort", "50052");
String gRPCPort = prefs.getString("port", "50051");
mapSizePixels = Integer.parseInt(prefs.getString("MAPSIZEPIXELS", "540"));
mapSizeMeters = Integer.parseInt(prefs.getString("MAPSIZEMETRES", "10"));
@@ -96,7 +96,6 @@ public class SlamView extends SurfaceView implements AbstractUpdater.MapChangedL
stub.startMapStreaming(SlamDetails.newBuilder()
.setMapSizePixels(mapSizePixels)
.setMapSizeMeters(mapSizeMeters)
.setPort(Integer.parseInt(port))
.build(), response);
}