Merge pull request #115 from BillBrown341/KrakenDriverUpdates

Kraken Driver Updates

Author: drewbotts

sensors/detection/sensorhub-driver-krakenSDR/src/main/java/org/sensorhub/impl/sensor/krakenSDR/KrakenSdrConfig.java

@@ -34,11 +34,11 @@ public class KrakenSdrConfig extends SensorConfig {
      */
     @DisplayInfo.Required
     @DisplayInfo(desc = "Serial number or unique identifier")
-    public String serialNumber = "test";
+    public String serialNumber = "kraken_rt";
 
     @DisplayInfo.Required
     @DisplayInfo(label="Kraken IP Address", desc="Provide the shared IP Address assigned to the KrakenSD")
-    public String krakenIPaddress = "192.168.50.186";
+    public String krakenIPaddress = "localhost";
 
     @DisplayInfo.Required
     @DisplayInfo(label="Kraken Data-out Port", desc="Provide the USB Port for your Sensor (Usually 8081)")

sensors/detection/sensorhub-driver-krakenSDR/src/main/java/org/sensorhub/impl/sensor/krakenSDR/KrakenSdrOutputDOA.java

@@ -21,8 +21,11 @@
 import org.vast.swe.helper.GeoPosHelper;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
 import java.net.URL;
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -79,7 +82,7 @@ public void doInit() {
                         .label("KrakenSDR Collection Time")
                         .description("Timestamp of when KrakenSDR reading was generated")
                         .definition(SWEHelper.getPropertyUri("time")))
-                .addField("raw-lob", sweFactory.createQuantity()
+                .addField("raw_lob", sweFactory.createQuantity()
                         .uomCode("deg")
                         .label("Raw LOB")
                         .description("The LOB to the emitter in absolute (true north) value")
@@ -95,7 +98,7 @@ public void doInit() {
                         .definition(SWEHelper.getPropertyUri("rssi")))
                 .addField("frequency", sweFactory.createQuantity()
                         .uomCode("Hz")
-                        .label("frequency")
+                        .label("Frequency")
                         .dataType(DataType.LONG)
                         .description("The transmission frequency of the event in Hertz")
                         .definition(SWEHelper.getPropertyUri("frequency")))
@@ -105,16 +108,20 @@ public void doInit() {
                         .definition(SWEHelper.getPropertyUri("antenna_arrangement")))
                 .addField("time-delta", sweFactory.createQuantity()
                         .uomCode("ms")
-                        .label("latency")
+                        .label("Latency")
                         .description("Latency in ms : (Time from signal arrival at antenna, to result. NOT including network latency.)")
                         .definition(SWEHelper.getPropertyUri("latency")))
                 .addField("uuid", sweFactory.createText()
                         .label("UUID")
                         .description("Name of the KrakenSDR station inputted in the Station Information box in the Web GUI")
-                        .definition(SWEHelper.getPropertyUri("id")))
-                .addField("location", geoFac.newLocationVectorLatLon(SWEHelper.getPropertyUri("location")))
+                        .definition(SWEHelper.getPropertyUri("id"))
+                )
+                .addField("location", geoFac.createLocationVectorLatLon().label(SWEHelper.getPropertyUri("location"))
+                        .label("Location")
+                        .description("Lat and Long of the Kraken's Position")
+                )
                 .addField("heading", sweFactory.createQuantity()
-                        .label("heading")
+                        .label("Heading")
                         .uomCode("deg")
                         .description("heading")
                         .definition(SWEHelper.getPropertyUri("heading")))
@@ -123,9 +130,9 @@ public void doInit() {
                         .description("Main Heading Sensor Used (\"GPS\"/\"Compass\")")
                         .definition(SWEHelper.getPropertyUri("heading")))
                 ;
-
         dataStruct = recordBuilder.build();
 
+
         dataEncoding = sweFactory.newTextEncoding(",", "\n");
     }
 
@@ -151,7 +158,7 @@ public double getAverageSamplingPeriod() {
     }
 
     public void SetData() {
-               DataBlock dataBlock;
+        DataBlock dataBlock;
         try {
             if (latestRecord == null) {
                 dataBlock = dataStruct.createDataBlock();
@@ -177,9 +184,14 @@ public void SetData() {
             String DoA_csv;
             String[] DOA_Array;
 
-            while ((DoA_csv = in.readLine()) != null) {
-
+            DoA_csv = in.readLine();
+            DoA_csv = DoA_csv.trim();
+            if (!DoA_csv.isEmpty()) {
+                // Create an array from the html csv data. If it's not the right amount of fields, go to next iteration.
                 DOA_Array = DoA_csv.split(",");
+                if (DOA_Array.length < 13) {
+                    return;
+                }
 
                 // Convert Unix Epoch time provided by GPS to OffsetDateTime
                 Instant krakenTimeInstant = Instant.ofEpochMilli(Long.parseLong(DOA_Array[0]));
@@ -207,10 +219,8 @@ public void SetData() {
 
                 eventHandler.publish(new DataEvent(latestRecordTime, KrakenSdrOutputDOA.this, dataBlock));
             }
-
-        } catch (Exception e) {
-            System.err.println("Error reading from krakenSDR: " + e.getMessage());
-            e.printStackTrace();
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
         }
     }
 

sensors/detection/sensorhub-driver-krakenSDR/src/main/java/org/sensorhub/impl/sensor/krakenSDR/KrakenSdrOutputSettings.java

@@ -155,7 +155,7 @@ public double getAverageSamplingPeriod() {
     }
 
     public void SetData() {
-               DataBlock dataBlock;
+        DataBlock dataBlock;
         try {
             if (latestRecord == null) {
                 dataBlock = dataStruct.createDataBlock();
@@ -174,6 +174,10 @@ public void SetData() {
             // RETRIEVE CURRENT JSON SETTINGS AS A JSON OBJECT
             JsonObject currentSettings = util.retrieveJSONFromAddr(parent.settings_URL);
 
+            if(currentSettings == null || currentSettings.entrySet().isEmpty()){
+                return;
+            }
+
             dataBlock.setDoubleValue(0, System.currentTimeMillis() / 1000d);                                  // time
             dataBlock.setBooleanValue(1, currentSettings.get("en_remote_control").getAsBoolean());
             dataBlock.setDoubleValue(2, currentSettings.get("center_freq").getAsDouble());

sensors/detection/sensorhub-driver-krakenSDR/src/main/java/org/sensorhub/impl/sensor/krakenSDR/KrakenSdrSensor.java

@@ -89,7 +89,10 @@ public void doInit() throws SensorHubException {
             krakenSdrControlStation.doInit(initialSettings);
 
         } catch (SensorHubException e) {
-            throw new RuntimeException("Failed to connect to: " + settings_URL);
+//            System.err.println("Failed to connect to: " + settings_URL + "\nConfirm that Kraken DOA Software Configuration is displaying this output");
+            logger.error("Failed to connect to: " + settings_URL + "\nConfirm that Kraken DOA Software Configuration is displaying this output");
+            throw new SensorHubException("Failed to connect to: (" + settings_URL + "). Confirm Kraken DOA Software Configuration is displaying to this this output");
+//            throw new RuntimeException("Failed to connect to: " + settings_URL);
         }
 
         /// INITIALIZE OUTPUTS

sensors/detection/sensorhub-driver-krakenSDR/src/main/resources/org/sensorhub/impl/sensor/krakenSDR/README.md

@@ -55,7 +55,8 @@ To set this up properly, i found the following [YouTube Tutorial](https://www.yo
 to type these commands in your Raspberry Pi's terminal:
 1. Install GPSD
 ```commandline
-sudo apt-get install gpsd gpsd-clients python-gps
+sudo apt-get install gpsd gpsd-clients
+pip3 install gpsd-py3
 ```
 2. Stop current GPSD service, rebind to the correct serial, and then restart it.