Merge pull request #315 from EasternEdgeRobotics/keithID

Discover local IP on rov network

Author: k-sutherland

build.gradle

@@ -24,6 +24,7 @@ repositories {
 }
 
 dependencies {
+    compile files("${System.properties['java.home']}/../lib/tools.jar")
     compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.8.7"
     compile 'com.neuronrobotics:nrjavaserial:3.11.0'
     compile 'com.pi4j:pi4j-core:1.0'

src/main/java/com/easternedgerobotics/rov/Topside.java

@@ -113,9 +113,9 @@ public void init() throws SocketException, UnknownHostException {
             Schedulers.io());
 
         videoDecoder = new VideoDecoder(
-            eventPublisher,
-            configSource.getConfig("videoDecoder",
-                VideoDecoderConfig.class));
+                eventPublisher,
+                configSource.getConfig("videoDecoder", VideoDecoderConfig.class),
+                launchConfig.broadcast());
 
         final ValueStore<CameraCalibrationValue> cameraCalibrationStore = ValueStore.of(
             CameraCalibrationValue.class, config.preferencesHome());

src/main/java/com/easternedgerobotics/rov/video/VideoDecoder.java

@@ -6,8 +6,17 @@
 import com.easternedgerobotics.rov.value.VideoValueB;
 
 import javafx.scene.image.Image;
+import org.pmw.tinylog.Logger;
 import rx.Observable;
 
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
 public final class VideoDecoder {
     private final EventPublisher eventPublisher;
 
@@ -17,9 +26,12 @@ public final class VideoDecoder {
 
     private final FFmpegFXImageDecoder decoderB;
 
+    private final String broadcastIP;
+
     public VideoDecoder(
         final EventPublisher eventPublisher,
-        final VideoDecoderConfig config
+        final VideoDecoderConfig config,
+        final String broadcast
     ) {
         this.eventPublisher = eventPublisher;
         this.config = config;
@@ -41,13 +53,41 @@ public VideoDecoder(
             config.preset(),
             config.numBuffers(),
             config.introVideoLocation());
+        final int lastLocation = broadcast.lastIndexOf('.');
+        broadcastIP = broadcast.substring(0, lastLocation - 1);
     }
 
     public void start() {
         decoderA.start();
         decoderB.start();
-        eventPublisher.emit(new VideoValueA(config.host(), config.portA()));
-        eventPublisher.emit(new VideoValueB(config.host(), config.portB()));
+        boolean initialized = false;
+        final List<String> ipAddresses = new ArrayList<String>();
+        try {
+            final Enumeration<NetworkInterface> network = NetworkInterface.getNetworkInterfaces();
+            while (network.hasMoreElements()) {
+                final Enumeration<InetAddress> inet = network.nextElement().getInetAddresses();
+                while (inet.hasMoreElements()) {
+                    ipAddresses.add(inet.nextElement().toString());
+                }
+            }
+        } catch (final SocketException error) {
+            Logger.error(error);
+        }
+        for (final String newAddress: ipAddresses) {
+            final int lastLocation = newAddress.lastIndexOf('.');
+            if (lastLocation >= 0) {
+                final String testAddress = newAddress.substring(1, lastLocation - 1);
+                if (broadcastIP.equals(testAddress)) {
+                    eventPublisher.emit(new VideoValueA(newAddress, config.portA()));
+                    eventPublisher.emit(new VideoValueB(newAddress, config.portB()));
+                    initialized = true;
+                    break;
+                }
+            }
+        }
+        if (!initialized) {
+            Logger.warn("Could not detect the IP of the runtime system");
+        }
     }
 
     public void stop() {