From 084703cb6a48e9394d496448f926fbb3261ca729 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Wed, 15 Jul 2026 08:38:21 -0400 Subject: [PATCH 1/9] Update URNs and bump versions --- build.gradle | 23 ++++++++++--------- .../sensorhub-process-ffmpeg/build.gradle | 2 +- .../impl/process/video/FFmpegProcess.java | 2 +- .../sensorhub-process-helpers/build.gradle | 2 +- .../botts/process/helpers/ProcessHelper.java | 5 ++-- .../build.gradle | 2 +- .../helpers/ProcessHelper.java | 8 ++----- .../sensorhub-process-utils/build.gradle | 2 +- .../process/utils/AutoWiringComponent.java | 2 +- .../sensorhub-driver-fltaware/build.gradle | 2 +- .../sensor/flightAware/FlightAwareDriver.java | 4 ++-- .../sensorhub-driver-misb-uas/build.gradle | 2 +- .../impl/sensor/uas/UasSensorBase.java | 4 ++-- .../org/sensorhub/utils/aero/AeroHelper.java | 4 ++-- .../sensorhub/utils/aero/impl/AeroUtils.java | 4 ++-- .../avl/sensorhub-driver-avl-911/build.gradle | 2 +- .../sensorhub/impl/sensor/avl/AVLDriver.java | 2 +- .../cbrne/sensorhub-driver-gamma/build.gradle | 2 +- .../impl/sensor/gamma/GammaSensor.java | 2 +- .../sensor/krakensdr/KrakenSdrSensor.java | 0 .../sensorhub-driver-angelsensor/build.gradle | 2 +- .../impl/sensor/angel/AngelSensor.java | 2 +- .../build.gradle | 2 +- .../intellisense/IntellisenseSensor.java | 2 +- .../sensorhub-driver-usgswater/build.gradle | 2 +- .../sensor/usgswater/USGSWaterDriver.java | 4 ++-- .../hydro/sensorhub-storage-ndbc/build.gradle | 2 +- .../org/sensorhub/impl/ndbc/NDBCArchive.java | 2 +- .../sensorhub-storage-usgswater/build.gradle | 2 +- .../impl/usgs/water/USGSWaterDataArchive.java | 2 +- .../others/sensorhub-driver-f20/build.gradle | 2 +- .../com/botts/impl/driver/f20/F20Driver.java | 2 +- .../sensorhub-driver-intelipod/build.gradle | 2 +- .../sensor/intelipod/IntelipodSensor.java | 2 +- .../others/sensorhub-driver-isa/build.gradle | 2 +- .../sensorhub/impl/sensor/isa/ISADriver.java | 2 +- .../impl/sensor/isa/ISASimulation.java | 4 ++-- .../sensorhub-driver-logback/build.gradle | 2 +- .../impl/sensor/logback/LogbackDriver.java | 2 +- .../sensorhub-driver-meshtastic/build.gradle | 2 +- .../sensor/meshtastic/MeshtasticSensor.java | 2 +- .../build.gradle | 2 +- .../UniversalControllerSensor.java | 2 +- .../sensorhub-utils-datafiles/build.gradle | 2 +- .../sensorhub-driver-ahrs/build.gradle | 2 +- .../impl/sensor/ahrs/AHRSSensor.java | 2 +- .../sensorhub-driver-bno055/build.gradle | 2 +- .../impl/sensor/bno055/Bno055Sensor.java | 2 +- .../sensorhub-driver-bno085/build.gradle | 2 +- .../impl/sensor/BNO085/Bno085Sensor.java | 2 +- .../sensorhub-driver-gps-nmea/build.gradle | 2 +- .../impl/sensor/nmea/gps/NMEAGpsSensor.java | 2 +- .../sensorhub-driver-mti/build.gradle | 2 +- .../sensorhub/impl/sensor/mti/MtiSensor.java | 2 +- .../sensorhub-driver-nmeaais/build.gradle | 2 +- .../impl/sensor/nmeaais/NmeaAisDriver.java | 2 +- .../sensorhub-driver-notecardgps/build.gradle | 2 +- .../sensor/notecardGPS/notecardGPSSensor.java | 2 +- .../sensorhub-driver-trek1000/build.gradle | 2 +- .../impl/sensor/trek1000/Trek1000Sensor.java | 2 +- .../sensorhub-driver-trupulse/build.gradle | 2 +- .../impl/sensor/trupulse/TruPulseSensor.java | 2 +- .../sensorhub-driver-vectornav/build.gradle | 2 +- .../impl/sensor/vectornav/VN200Sensor.java | 2 +- .../sensorhub-driver-rplidar/build.gradle | 2 +- .../impl/sensor/rplidar/RpLidarSensor.java | 2 +- .../sensorhub-driver-movebase/build.gradle | 2 +- .../impl/sensor/movebase/MoveBaseSensor.java | 2 +- .../sensorhub-driver-nav-gps/build.gradle | 2 +- .../impl/sensor/nav/NavGoalSensor.java | 2 +- .../sensorhub-driver-track/build.gradle | 2 +- .../impl/sensor/track/TrackControlSensor.java | 2 +- .../spot/sensorhub-driver-spot/build.gradle | 2 +- .../impl/sensor/spot/SpotSensor.java | 2 +- .../sensorhub-driver-battery/build.gradle | 2 +- .../transbot/battery/BatterySensor.java | 2 +- .../sensorhub-driver-teleop/build.gradle | 2 +- .../remotecontrol/RemoteControlSensor.java | 2 +- .../sensorhub-driver-gps-nmea/build.gradle | 2 +- .../impl/sensor/nmea_gps/NmeaGpsSensor.java | 2 +- .../sensorhub-driver-imu/build.gradle | 2 +- .../sensorhub/impl/sensor/imu/ImuSensor.java | 2 +- .../sensorhub-driver-astracam/build.gradle | 2 +- .../impl/sensor/astracam/AstraCamSensor.java | 2 +- .../sensorhub-driver-mavlink/build.gradle | 2 +- .../impl/sensor/mavlink/MavlinkDriver.java | 2 +- .../sensorhub-driver-mavsdk/build.gradle | 2 +- .../impl/sensor/mavsdk/UnmannedSystem.java | 2 +- .../sensorhub-driver-pwm-servos/build.gradle | 2 +- .../actuator/pca9685/PwmServoActuators.java | 2 +- .../sensorhub-driver-fakecam/build.gradle | 2 +- .../impl/sensor/fakecam/FakeCamSensor.java | 2 +- .../sensorhub-driver-fakegps/build.gradle | 2 +- .../impl/sensor/fakegps/FakeGpsOutput.java | 2 +- .../impl/sensor/fakegps/FakeGpsSensor.java | 2 +- .../sensorhub-driver-fakeweather/build.gradle | 2 +- .../fakeweather/FakeWeatherNetwork.java | 2 +- .../sensor/fakeweather/FakeWeatherOutput.java | 2 +- .../sensor/fakeweather/FakeWeatherSensor.java | 2 +- .../fakeweather/FakeWeatherStation.java | 2 +- .../sensorhub-driver-plume/build.gradle | 2 +- .../impl/sensor/plume/PlumeSensor.java | 2 +- .../build.gradle | 2 +- .../simorientation/SimOrientationSensor.java | 2 +- .../sensorhub-driver-simuav/build.gradle | 2 +- .../impl/sensor/simuav/SimUavDriver.java | 2 +- .../build.gradle | 2 +- .../sensor/simulatedcbrn/SimCBRNSensor.java | 2 +- .../build.gradle | 2 +- .../SimWeatherStationSensor.java | 2 +- .../sensorhub-driver-domoticz/build.gradle | 2 +- .../impl/sensor/domoticz/DomoticzDriver.java | 2 +- .../impl/sensor/openhab/OpenHabDriver.java | 2 +- .../sensorhub-driver-twitter/build.gradle | 2 +- .../impl/sensor/twitter/TwitterSensor.java | 2 +- .../impl/sensor/axis/AxisCameraDriver.java | 20 ++++++++-------- .../video/sensorhub-driver-dahua/build.gradle | 2 +- .../impl/sensor/dahua/DahuaCameraDriver.java | 2 +- .../sensorhub-driver-ffmpeg/build.gradle | 2 +- .../impl/sensor/ffmpeg/FFMPEGSensor.java | 2 +- .../sensorhub-driver-flir-dh390/build.gradle | 2 +- .../impl/sensor/flir/dh390/DH390Driver.java | 2 +- .../sensorhub-driver-foscam/build.gradle | 2 +- .../impl/sensor/foscam/FoscamDriver.java | 7 ++++++ .../sensorhub-driver-kinect/build.gradle | 2 +- .../impl/sensor/kinect/KinectSensor.java | 2 +- .../video/sensorhub-driver-onvif/build.gradle | 2 +- .../impl/sensor/onvif/OnvifCameraDriver.java | 2 +- .../video/sensorhub-driver-rtmp/build.gradle | 2 +- .../impl/sensor/rtmp/RtmpDriver.java | 2 +- .../sensorhub-driver-rtpcam/build.gradle | 2 +- .../impl/sensor/rtpcam/RTPCameraDriver.java | 2 +- .../sensorhub-driver-sony-vb600/build.gradle | 2 +- .../impl/sensor/sony/vb600/VB600Driver.java | 2 +- .../video/sensorhub-driver-v4l/build.gradle | 2 +- .../impl/sensor/v4l/V4LCameraDriver.java | 2 +- .../sensorhub-driver-virb-xe/build.gradle | 2 +- .../impl/sensor/virbxe/VirbXeDriver.java | 2 +- .../sensorhub-driver-httpweather/build.gradle | 2 +- .../sensor/httpweather/HttpWeatherSensor.java | 2 +- .../sensorhub-driver-kestrel/build.gradle | 2 +- .../impl/sensor/kestrel/Kestrel.java | 2 +- .../sensorhub-driver-metar/build.gradle | 2 +- .../impl/sensor/station/StationSensor.java | 2 +- .../sensor/station/metar/MetarSensor.java | 2 +- .../sensorhub-driver-meteobridge/build.gradle | 2 +- .../sensor/meteobridge/MeteobridgeSensor.java | 2 +- .../sensorhub-driver-nexrad/build.gradle | 2 +- .../impl/sensor/nexrad/NexradSensor.java | 2 +- .../sensorhub-driver-storm/build.gradle | 2 +- .../impl/sensor/mesh/MeshSensor.java | 2 +- .../impl/sensor/nldn/NldnSensor.java | 2 +- .../sensorhub-driver-uahweather/build.gradle | 2 +- .../sensor/uahweather/UAHweatherSensor.java | 2 +- .../sensorhub-driver-vaisala/build.gradle | 2 +- .../sensor/vaisala/VaisalaWeatherSensor.java | 2 +- .../build.gradle | 2 +- .../impl/service/sta/STAService.java | 2 +- .../impl/service/sta/STAServiceConfig.java | 2 +- services/sensorhub-service-video/build.gradle | 2 +- .../muxer/tracks/ttml/TtmlTrackImpl.java | 2 +- 161 files changed, 195 insertions(+), 190 deletions(-) create mode 100644 sensors/detection/sensorhub-driver-krakensdr/src/main/java/org/sensorhub/impl/sensor/krakensdr/KrakenSdrSensor.java diff --git a/build.gradle b/build.gradle index bbbea2dc4..6820c4d5c 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ subprojects { } } } - + version = oshCoreVersion ext.pom = {} // pom data that subprojects can append to @@ -328,29 +328,30 @@ subprojects { repositories { //mavenLocal() maven { - name = "GitHubPackages" - url = "https://maven.pkg.github.com/opensensorhub/osh-addons" + name = "Nexus" + url = System.getenv("NEXUS_REPO_URL") + allowInsecureProtocol=true credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") + username = System.getenv("NEXUS_ACTOR") + password = System.getenv("NEXUS_TOKEN") } } } } - p.tasks.named("generateMetadataFileForMavenJavaPublication") { + project.tasks.named("generateMetadataFileForMavenJavaPublication") { doFirst { - if (System.getenv("GITHUB_ACTOR") == null) { - throw new Exception("Environment variable GITHUB_ACTOR not set. Please set to your github username.") + if (System.getenv("NEXUS_ACTOR") == null) { + throw new Exception("Environment variable NEXUS_ACTOR not set. Please set to your github username.") } - if (System.getenv("GITHUB_TOKEN") == null) { - throw new Exception("Environment variable GITHUB_TOKEN not set. Please generate and set to your personal access token: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens") + if (System.getenv("NEXUS_TOKEN") == null) { + throw new Exception("Environment variable NEXUS_TOKEN not set. Please generate and set to your personal access token: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens") } } } - p.tasks.named("publishMavenJavaPublicationToGitHubPackagesRepository") { + project.tasks.named("publishMavenJavaPublicationToNexusRepository") { onlyIf { // MavenArtifactRepository repo = repository as MavenArtifactRepository; diff --git a/processing/sensorhub-process-ffmpeg/build.gradle b/processing/sensorhub-process-ffmpeg/build.gradle index c5f28da61..394600046 100644 --- a/processing/sensorhub-process-ffmpeg/build.gradle +++ b/processing/sensorhub-process-ffmpeg/build.gradle @@ -1,6 +1,6 @@ description = 'FFMPEG processing modules' ext.details = 'FFMPEG based modules for video processing' -version = '0.1' +version = '0.1.1' dependencies { diff --git a/processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/FFmpegProcess.java b/processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/FFmpegProcess.java index 77193644e..5ad72b915 100644 --- a/processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/FFmpegProcess.java +++ b/processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/FFmpegProcess.java @@ -37,7 +37,7 @@ * Extend this class for any process module with video input/output. */ public abstract class FFmpegProcess extends AbstractProcessModule { - final String ID_PREFIX = "urn:osh:process:ffmpeg:" + this.getClass().getSimpleName().toLowerCase() + ":"; + final String ID_PREFIX = "urn:osh:process:georobotix:ffmpeg:" + this.getClass().getSimpleName().toLowerCase() + ":"; SimpleProcessImpl process; IModule sensorModule; protected IProcessExec executable; diff --git a/processing/sensorhub-process-helpers/build.gradle b/processing/sensorhub-process-helpers/build.gradle index d0f0d8489..b4e0a6349 100644 --- a/processing/sensorhub-process-helpers/build.gradle +++ b/processing/sensorhub-process-helpers/build.gradle @@ -1,6 +1,6 @@ description = 'Process Helper Classes' ext.details = 'Collection of SensorML process helpers and templates' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/processing/sensorhub-process-helpers/src/main/java/com/botts/process/helpers/ProcessHelper.java b/processing/sensorhub-process-helpers/src/main/java/com/botts/process/helpers/ProcessHelper.java index 8e09adeca..e00472e45 100644 --- a/processing/sensorhub-process-helpers/src/main/java/com/botts/process/helpers/ProcessHelper.java +++ b/processing/sensorhub-process-helpers/src/main/java/com/botts/process/helpers/ProcessHelper.java @@ -24,7 +24,6 @@ Developer are Copyright (C) 2025 the Initial Developer. All Rights Reserved. import net.opengis.swe.v20.AbstractSWEIdentifiable; import net.opengis.swe.v20.DataComponent; import net.opengis.swe.v20.DataRecord; -import org.slf4j.Logger; import org.vast.process.ExecutableProcessImpl; import org.vast.process.ProcessException; import org.vast.sensorML.*; @@ -69,8 +68,8 @@ public ProcessChainBuilder createProcessChain() { } public class ProcessChainBuilder { - ReferenceImpl controlType = new ReferenceImpl("urn:osh:process:datasink:commandstream"); - ReferenceImpl sourceType = new ReferenceImpl("urn:osh:process:datasource:stream"); + ReferenceImpl controlType = new ReferenceImpl("urn:osh:process:georobotix:datasink:commandstream"); + ReferenceImpl sourceType = new ReferenceImpl("urn:osh:process:georobotix:datasource:stream"); ProcessHelper helper; AggregateProcessImpl aggregateProcess; diff --git a/processing/sensorhub-process-universalcontroller/build.gradle b/processing/sensorhub-process-universalcontroller/build.gradle index dcf518122..b3aaad358 100644 --- a/processing/sensorhub-process-universalcontroller/build.gradle +++ b/processing/sensorhub-process-universalcontroller/build.gradle @@ -1,6 +1,6 @@ description = 'Universal Controller Processing' ext.details = 'Take controller input to process command outputs' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/processing/sensorhub-process-universalcontroller/src/main/java/org/sensorhub/impl/process/universalcontroller/helpers/ProcessHelper.java b/processing/sensorhub-process-universalcontroller/src/main/java/org/sensorhub/impl/process/universalcontroller/helpers/ProcessHelper.java index e9188f6f3..6712acb8c 100644 --- a/processing/sensorhub-process-universalcontroller/src/main/java/org/sensorhub/impl/process/universalcontroller/helpers/ProcessHelper.java +++ b/processing/sensorhub-process-universalcontroller/src/main/java/org/sensorhub/impl/process/universalcontroller/helpers/ProcessHelper.java @@ -1,21 +1,17 @@ package org.sensorhub.impl.process.universalcontroller.helpers; import net.opengis.gml.v32.impl.ReferenceImpl; -import net.opengis.sensorml.v20.AbstractProcess; import net.opengis.sensorml.v20.IOPropertyList; -import net.opengis.sensorml.v20.SimpleProcess; import net.opengis.sensorml.v20.impl.SettingsImpl; import net.opengis.swe.v20.AbstractSWEIdentifiable; import net.opengis.swe.v20.DataComponent; import net.opengis.swe.v20.DataRecord; import org.vast.process.ExecutableProcessImpl; -import org.vast.process.IProcessExec; import org.vast.process.ProcessException; import org.vast.sensorML.*; import org.vast.xml.XMLWriterException; import java.io.OutputStream; -import java.util.ArrayList; public class ProcessHelper extends SMLUtils { AggregateProcessImpl aggregateProcess; @@ -24,8 +20,8 @@ public class ProcessHelper extends SMLUtils { public ProcessHelper() { super(V2_0); - controlType = new ReferenceImpl("urn:osh:process:datasink:commandstream"); - sourceType = new ReferenceImpl("urn:osh:process:datasource:stream"); + controlType = new ReferenceImpl("urn:osh:process:georobotix:datasink:commandstream"); + sourceType = new ReferenceImpl("urn:osh:process:georobotix:datasource:stream"); aggregateProcess = new AggregateProcessImpl(); } diff --git a/processing/sensorhub-process-utils/build.gradle b/processing/sensorhub-process-utils/build.gradle index 5ec9c3feb..d6e9c5cc8 100644 --- a/processing/sensorhub-process-utils/build.gradle +++ b/processing/sensorhub-process-utils/build.gradle @@ -1,6 +1,6 @@ description = 'Common Utility Functions' ext.details = 'Basic processing blocks for control flow and array handling' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/processing/sensorhub-process-utils/src/main/java/org/sensorhub/impl/process/utils/AutoWiringComponent.java b/processing/sensorhub-process-utils/src/main/java/org/sensorhub/impl/process/utils/AutoWiringComponent.java index 1bf0e09d6..c7d8114c6 100644 --- a/processing/sensorhub-process-utils/src/main/java/org/sensorhub/impl/process/utils/AutoWiringComponent.java +++ b/processing/sensorhub-process-utils/src/main/java/org/sensorhub/impl/process/utils/AutoWiringComponent.java @@ -29,7 +29,7 @@ public class AutoWiringComponent extends AbstractDataComponentImpl { - public static final String AUTO_WIRING_URI = "urn:osh:process:wiring:auto"; + public static final String AUTO_WIRING_URI = "urn:osh:process:georobotix:wiring:auto"; public void replaceWithComponent(ExecutableProcessImpl process, DataComponent comp) diff --git a/sensors/aviation/sensorhub-driver-fltaware/build.gradle b/sensors/aviation/sensorhub-driver-fltaware/build.gradle index 032487317..2c1b8f6f5 100644 --- a/sensors/aviation/sensorhub-driver-fltaware/build.gradle +++ b/sensors/aviation/sensorhub-driver-fltaware/build.gradle @@ -1,6 +1,6 @@ description = 'Flight Aware Adaptor' ext.details = 'Flight Aware flight plans and real-time position provider' -version = '0.8.1' +version = '0.8.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/aviation/sensorhub-driver-fltaware/src/main/java/org/sensorhub/impl/sensor/flightAware/FlightAwareDriver.java b/sensors/aviation/sensorhub-driver-fltaware/src/main/java/org/sensorhub/impl/sensor/flightAware/FlightAwareDriver.java index 3f8d9ba12..34e16461b 100644 --- a/sensors/aviation/sensorhub-driver-fltaware/src/main/java/org/sensorhub/impl/sensor/flightAware/FlightAwareDriver.java +++ b/sensors/aviation/sensorhub-driver-fltaware/src/main/java/org/sensorhub/impl/sensor/flightAware/FlightAwareDriver.java @@ -67,8 +67,8 @@ public class FlightAwareDriver extends AbstractSensorModule GMLFactory gmlFac = new GMLFactory(true); // Dynamically created FOIs - static final String SENSOR_UID_PREFIX = "urn:osh:sensor:aviation:"; - static final String FLIGHT_UID_PREFIX = "urn:osh:aviation:flight:"; + static final String SENSOR_UID_PREFIX = "urn:osh:sensor:georobotix:aviation:"; + static final String FLIGHT_UID_PREFIX = "urn:osh:sensor:georobotix:aviation:flight:"; IFlightObjectFilter flightFilter; IFlightRouteDecoder flightRouteDecoder; diff --git a/sensors/aviation/sensorhub-driver-misb-uas/build.gradle b/sensors/aviation/sensorhub-driver-misb-uas/build.gradle index 1928bceb5..d127e4875 100644 --- a/sensors/aviation/sensorhub-driver-misb-uas/build.gradle +++ b/sensors/aviation/sensorhub-driver-misb-uas/build.gradle @@ -1,6 +1,6 @@ description = 'MISB UAS Sensors' ext.details = "Driver for UAS system providing video and telemetry based on MISB ST 0601 / STANAG 4609" -version = '2.2.0' +version = '2.2.1' // To build in entire java cv platform of projects use // implementation('org.bytedeco:javacv-platform:1.5.2') diff --git a/sensors/aviation/sensorhub-driver-misb-uas/src/main/java/org/sensorhub/impl/sensor/uas/UasSensorBase.java b/sensors/aviation/sensorhub-driver-misb-uas/src/main/java/org/sensorhub/impl/sensor/uas/UasSensorBase.java index 46b341a81..452c61e2e 100644 --- a/sensors/aviation/sensorhub-driver-misb-uas/src/main/java/org/sensorhub/impl/sensor/uas/UasSensorBase.java +++ b/sensors/aviation/sensorhub-driver-misb-uas/src/main/java/org/sensorhub/impl/sensor/uas/UasSensorBase.java @@ -175,7 +175,7 @@ protected void shutdownExecutor() { * Creates the strings that uniquely identify this sensor in OpenSensorHub. */ protected void generateIds() { - generateUniqueID("urn:osh:sensor:uas:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:uas:", config.serialNumber); generateXmlID("MISB_UAS_", config.serialNumber); } @@ -380,7 +380,7 @@ protected void createFois() { addFoi(uasFoi); imagedFoi = new MovingFeature(); - imagedFoi.setUniqueIdentifier("urn:osh:foi:imagedArea:" + config.serialNumber); + imagedFoi.setUniqueIdentifier("urn:osh:foi:georobotix:imagedArea:" + config.serialNumber); imagedFoi.setName("UAS " + config.serialNumber + " Imaged Area"); imagedFoi.setDescription("Area viewed by imaging sensor on-board platform " + config.serialNumber); addFoi(imagedFoi); diff --git a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/AeroHelper.java b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/AeroHelper.java index b6ba0787c..54ad2313b 100644 --- a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/AeroHelper.java +++ b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/AeroHelper.java @@ -36,8 +36,8 @@ public class AeroHelper extends GeoPosHelper { // SWE definition URIs - public static final String AERO_DEF_URI_PREFIX = "urn:osh:def:aero:"; - public static final String AERO_RECORD_URI_PREFIX = "urn:osh:def:aero:record:"; + public static final String AERO_DEF_URI_PREFIX = "urn:osh:def:georobotix:aero:"; + public static final String AERO_RECORD_URI_PREFIX = "urn:osh:def:georobotix:aero:record:"; public static final String ICAO_CODESPACE = AERO_DEF_URI_PREFIX + "ICAO"; public static final String DEF_TAIL_NUMBER = AERO_DEF_URI_PREFIX + "TailNumber"; diff --git a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/AeroUtils.java b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/AeroUtils.java index ba04a11e0..3a5323351 100644 --- a/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/AeroUtils.java +++ b/sensors/aviation/sensorhub-utils-aero/src/main/java/org/sensorhub/utils/aero/impl/AeroUtils.java @@ -53,11 +53,11 @@ public class AeroUtils { // System URIs - public static final String AERO_SYSTEM_URI_PREFIX = "urn:osh:system:aero:"; + public static final String AERO_SYSTEM_URI_PREFIX = "urn:osh:system:georobotix:aero:"; public static final String AERO_FOI_REGISTRY_UID = AERO_SYSTEM_URI_PREFIX + "foiregistry"; // FOI URIs - public static final String AERO_FOI_URI_PREFIX = "urn:osh:foi:aero:"; + public static final String AERO_FOI_URI_PREFIX = "urn:osh:foi:georobotix:aero:"; public static final String FOI_TAIL_UID_PREFIX = AERO_FOI_URI_PREFIX + "ac:"; public static final String FOI_FLIGHT_UID_PREFIX = AERO_FOI_URI_PREFIX + "flt:"; public static final String FOI_AIRPORT_UID_PREFIX = AERO_FOI_URI_PREFIX + "apt:"; diff --git a/sensors/avl/sensorhub-driver-avl-911/build.gradle b/sensors/avl/sensorhub-driver-avl-911/build.gradle index 0855840f3..245587c71 100644 --- a/sensors/avl/sensorhub-driver-avl-911/build.gradle +++ b/sensors/avl/sensorhub-driver-avl-911/build.gradle @@ -1,6 +1,6 @@ description = 'AVL 911 Sensor' ext.details = "Driver for Automatic Vehicle Location providing location and status based on Intergraph's 911 system" -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/avl/sensorhub-driver-avl-911/src/main/java/org/sensorhub/impl/sensor/avl/AVLDriver.java b/sensors/avl/sensorhub-driver-avl-911/src/main/java/org/sensorhub/impl/sensor/avl/AVLDriver.java index 4fa027a3f..d0e3926e4 100644 --- a/sensors/avl/sensorhub-driver-avl-911/src/main/java/org/sensorhub/impl/sensor/avl/AVLDriver.java +++ b/sensors/avl/sensorhub-driver-avl-911/src/main/java/org/sensorhub/impl/sensor/avl/AVLDriver.java @@ -32,7 +32,7 @@ */ public class AVLDriver extends AbstractSensorModule { - static final String UID_PREFIX = "urn:osh:sensor:avl:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:avl:"; ICommProvider commProvider; AVLOutput dataInterface; diff --git a/sensors/cbrne/sensorhub-driver-gamma/build.gradle b/sensors/cbrne/sensorhub-driver-gamma/build.gradle index 5c2468cbf..a2eddefbf 100644 --- a/sensors/cbrne/sensorhub-driver-gamma/build.gradle +++ b/sensors/cbrne/sensorhub-driver-gamma/build.gradle @@ -1,6 +1,6 @@ description = 'Gamma Sensor' ext.details = 'Driver for gamma sensor model 2070 by Health Physics Instruments' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/cbrne/sensorhub-driver-gamma/src/main/java/org/sensorhub/impl/sensor/gamma/GammaSensor.java b/sensors/cbrne/sensorhub-driver-gamma/src/main/java/org/sensorhub/impl/sensor/gamma/GammaSensor.java index 033f43d71..2e295d888 100644 --- a/sensors/cbrne/sensorhub-driver-gamma/src/main/java/org/sensorhub/impl/sensor/gamma/GammaSensor.java +++ b/sensors/cbrne/sensorhub-driver-gamma/src/main/java/org/sensorhub/impl/sensor/gamma/GammaSensor.java @@ -62,7 +62,7 @@ protected void doInit() throws SensorHubException // add unique ID based on serial number - this.uniqueID = "urn:gamma:" + config.modelNumber + ":" + config.serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:gamma:" + config.modelNumber + ":" + config.serialNumber; this.xmlID = "GAMMA_" + config.modelNumber + "_" + config.serialNumber.toUpperCase(); // create data interfaces diff --git a/sensors/detection/sensorhub-driver-krakensdr/src/main/java/org/sensorhub/impl/sensor/krakensdr/KrakenSdrSensor.java b/sensors/detection/sensorhub-driver-krakensdr/src/main/java/org/sensorhub/impl/sensor/krakensdr/KrakenSdrSensor.java new file mode 100644 index 000000000..e69de29bb diff --git a/sensors/health/sensorhub-driver-angelsensor/build.gradle b/sensors/health/sensorhub-driver-angelsensor/build.gradle index 97a303f59..1375bd3ef 100644 --- a/sensors/health/sensorhub-driver-angelsensor/build.gradle +++ b/sensors/health/sensorhub-driver-angelsensor/build.gradle @@ -1,6 +1,6 @@ description = 'Angel Sensor' ext.details = 'Driver for Angel Sensor BLE wrist band' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/health/sensorhub-driver-angelsensor/src/main/java/org/sensorhub/impl/sensor/angel/AngelSensor.java b/sensors/health/sensorhub-driver-angelsensor/src/main/java/org/sensorhub/impl/sensor/angel/AngelSensor.java index 2744adf27..1ae76f87b 100644 --- a/sensors/health/sensorhub-driver-angelsensor/src/main/java/org/sensorhub/impl/sensor/angel/AngelSensor.java +++ b/sensors/health/sensorhub-driver-angelsensor/src/main/java/org/sensorhub/impl/sensor/angel/AngelSensor.java @@ -92,7 +92,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:osh:angelsensor:", config.btAddress); + generateUniqueID("urn:osh:sensor:georobotix:angelsensor:", config.btAddress); generateXmlID("ANGEL_SENSOR_", config.btAddress); // create output interfaces diff --git a/sensors/hydro/sensorhub-driver-intellisense/build.gradle b/sensors/hydro/sensorhub-driver-intellisense/build.gradle index 02084b440..b8fee8d1b 100644 --- a/sensors/hydro/sensorhub-driver-intellisense/build.gradle +++ b/sensors/hydro/sensorhub-driver-intellisense/build.gradle @@ -1,6 +1,6 @@ description = 'Intellisense Flood Sensor Driver' ext.details = 'Driver for pulling measurements from Intellisense Flood Sensor API and publishing in SWE format' -version = '0.1.0' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/hydro/sensorhub-driver-intellisense/src/main/java/org/sensorhub/impl/sensor/intellisense/IntellisenseSensor.java b/sensors/hydro/sensorhub-driver-intellisense/src/main/java/org/sensorhub/impl/sensor/intellisense/IntellisenseSensor.java index 04681ccae..3f8d06f4f 100644 --- a/sensors/hydro/sensorhub-driver-intellisense/src/main/java/org/sensorhub/impl/sensor/intellisense/IntellisenseSensor.java +++ b/sensors/hydro/sensorhub-driver-intellisense/src/main/java/org/sensorhub/impl/sensor/intellisense/IntellisenseSensor.java @@ -29,7 +29,7 @@ public class IntellisenseSensor extends AbstractSensorModule { // static final Logger log = LoggerFactory.getLogger(IntellisenseSensor.class); - static final String SENSOR_UID_PREFIX = "urn:osh:sensor:intellisense:"; + static final String SENSOR_UID_PREFIX = "urn:osh:sensor:georobotix:intellisense:"; static final String DEVICE_UID_PREFIX = SENSOR_UID_PREFIX + "station:"; IntellisenseOutput output; diff --git a/sensors/hydro/sensorhub-driver-usgswater/build.gradle b/sensors/hydro/sensorhub-driver-usgswater/build.gradle index fba9358d2..4780903ff 100644 --- a/sensors/hydro/sensorhub-driver-usgswater/build.gradle +++ b/sensors/hydro/sensorhub-driver-usgswater/build.gradle @@ -1,6 +1,6 @@ description = 'USGS Water Data Driver' ext.details = 'Connector to retrieve live observations from USGS water stations' -version = '0.1.0' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/hydro/sensorhub-driver-usgswater/src/main/java/org/sensorhub/impl/sensor/usgswater/USGSWaterDriver.java b/sensors/hydro/sensorhub-driver-usgswater/src/main/java/org/sensorhub/impl/sensor/usgswater/USGSWaterDriver.java index d0c0f0904..54958344e 100644 --- a/sensors/hydro/sensorhub-driver-usgswater/src/main/java/org/sensorhub/impl/sensor/usgswater/USGSWaterDriver.java +++ b/sensors/hydro/sensorhub-driver-usgswater/src/main/java/org/sensorhub/impl/sensor/usgswater/USGSWaterDriver.java @@ -64,7 +64,7 @@ public class USGSWaterDriver extends AbstractSensorModule impl { static final Logger log = LoggerFactory.getLogger(USGSWaterDriver.class); static final String BASE_URL = "https://waterservices.usgs.gov/nwis/iv?sites="; - static final String UID_PREFIX = "urn:usgs:water:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:usgs:water:"; final int urlChunkSize = 100; Timer timer; @@ -127,7 +127,7 @@ protected void doInit() throws SensorHubException loadQualCodes(); // generate identifiers - this.uniqueID = "urn:usgs:water:live"; + this.uniqueID = "urn:osh:sensor:georobotix:usgs:water:live"; this.xmlID = "USGS_WATER_DATA_NETWORK"; if (config.exposeFilter.parameters.contains(ObsParam.WATER_TEMP)) diff --git a/sensors/hydro/sensorhub-storage-ndbc/build.gradle b/sensors/hydro/sensorhub-storage-ndbc/build.gradle index 62530871d..2a535788e 100644 --- a/sensors/hydro/sensorhub-storage-ndbc/build.gradle +++ b/sensors/hydro/sensorhub-storage-ndbc/build.gradle @@ -1,6 +1,6 @@ description = 'NDBC Buoy Data Archive' ext.details = 'Connector to retrieve historical observations from NDBC datasets' -version = '0.1.0' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/hydro/sensorhub-storage-ndbc/src/main/java/org/sensorhub/impl/ndbc/NDBCArchive.java b/sensors/hydro/sensorhub-storage-ndbc/src/main/java/org/sensorhub/impl/ndbc/NDBCArchive.java index 13f6570fd..468c887e9 100644 --- a/sensors/hydro/sensorhub-storage-ndbc/src/main/java/org/sensorhub/impl/ndbc/NDBCArchive.java +++ b/sensors/hydro/sensorhub-storage-ndbc/src/main/java/org/sensorhub/impl/ndbc/NDBCArchive.java @@ -43,7 +43,7 @@ public class NDBCArchive extends AbstractModule implements IObsStorageModule, IMultiSourceStorage { static final String BASE_NDBC_URL = "https://sdf.ndbc.noaa.gov"; - static final String IOOS_UID_PREFIX = "urn:ioos:"; + static final String IOOS_UID_PREFIX = "urn:osh:sensor:georobotix:ioos:"; Map dataStores = new LinkedHashMap<>(); Map fois = new LinkedHashMap<>(); diff --git a/sensors/hydro/sensorhub-storage-usgswater/build.gradle b/sensors/hydro/sensorhub-storage-usgswater/build.gradle index 219353913..b7eebf498 100644 --- a/sensors/hydro/sensorhub-storage-usgswater/build.gradle +++ b/sensors/hydro/sensorhub-storage-usgswater/build.gradle @@ -1,6 +1,6 @@ description = 'USGS Water Data Archive' ext.details = 'Connector to retrieve historical observations from USGS water datasets' -version = '0.1.0' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/hydro/sensorhub-storage-usgswater/src/main/java/org/sensorhub/impl/usgs/water/USGSWaterDataArchive.java b/sensors/hydro/sensorhub-storage-usgswater/src/main/java/org/sensorhub/impl/usgs/water/USGSWaterDataArchive.java index 036dda1a8..1fe1869c9 100644 --- a/sensors/hydro/sensorhub-storage-usgswater/src/main/java/org/sensorhub/impl/usgs/water/USGSWaterDataArchive.java +++ b/sensors/hydro/sensorhub-storage-usgswater/src/main/java/org/sensorhub/impl/usgs/water/USGSWaterDataArchive.java @@ -49,7 +49,7 @@ public class USGSWaterDataArchive extends AbstractModule implements IObsSystemDatabaseModule { static final String BASE_USGS_URL = "https://waterservices.usgs.gov/nwis/"; - static final String UID_PREFIX = "urn:usgs:water:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:usgs:water:"; ISystemDescStore procStore; IFoiStore foiStore; diff --git a/sensors/others/sensorhub-driver-f20/build.gradle b/sensors/others/sensorhub-driver-f20/build.gradle index 713258eaa..4986c5d06 100644 --- a/sensors/others/sensorhub-driver-f20/build.gradle +++ b/sensors/others/sensorhub-driver-f20/build.gradle @@ -1,6 +1,6 @@ description = 'F20 Driver' ext.details = "Driver for F20 attachable sensors" -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/others/sensorhub-driver-f20/src/main/java/com/botts/impl/driver/f20/F20Driver.java b/sensors/others/sensorhub-driver-f20/src/main/java/com/botts/impl/driver/f20/F20Driver.java index c747ce465..d28766468 100644 --- a/sensors/others/sensorhub-driver-f20/src/main/java/com/botts/impl/driver/f20/F20Driver.java +++ b/sensors/others/sensorhub-driver-f20/src/main/java/com/botts/impl/driver/f20/F20Driver.java @@ -40,7 +40,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("urn:osh:driver:f20:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:f20:", config.serialNumber); generateXmlID("F20", config.serialNumber); // Create and initialize output diff --git a/sensors/others/sensorhub-driver-intelipod/build.gradle b/sensors/others/sensorhub-driver-intelipod/build.gradle index 7d331cc03..f1ec758fb 100644 --- a/sensors/others/sensorhub-driver-intelipod/build.gradle +++ b/sensors/others/sensorhub-driver-intelipod/build.gradle @@ -1,6 +1,6 @@ description = 'Intelipod Sensor' ext.details = 'Driver for Intelipod sensors built by Venti' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/others/sensorhub-driver-intelipod/src/main/java/org/sensorhub/impl/sensor/intelipod/IntelipodSensor.java b/sensors/others/sensorhub-driver-intelipod/src/main/java/org/sensorhub/impl/sensor/intelipod/IntelipodSensor.java index e2b180cac..3ae3ece81 100644 --- a/sensors/others/sensorhub-driver-intelipod/src/main/java/org/sensorhub/impl/sensor/intelipod/IntelipodSensor.java +++ b/sensors/others/sensorhub-driver-intelipod/src/main/java/org/sensorhub/impl/sensor/intelipod/IntelipodSensor.java @@ -95,7 +95,7 @@ protected void doInit() throws SensorHubException } // generate identifiers: use serial number from config or first characters of local ID - generateUniqueID("urn:osh:intelipod:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:intelipod:", config.serialNumber); generateXmlID("INTELIPOD_", config.serialNumber); intelipodOut.init(); diff --git a/sensors/others/sensorhub-driver-isa/build.gradle b/sensors/others/sensorhub-driver-isa/build.gradle index dd713e7c7..6d84f2da3 100644 --- a/sensors/others/sensorhub-driver-isa/build.gradle +++ b/sensors/others/sensorhub-driver-isa/build.gradle @@ -1,6 +1,6 @@ description = 'ISA Sensor Driver' ext.details = 'Driver for sensors compatible with the Integrated Sensor Architecture (ISA) developed by the US Army' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISADriver.java b/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISADriver.java index 7b68ce2bb..9b2fa909d 100644 --- a/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISADriver.java +++ b/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISADriver.java @@ -47,7 +47,7 @@ protected void doInit() throws SensorHubException super.doInit(); // add unique ID based on serial number - this.uniqueID = "urn:osh:sensor:isa:" + config.networkID; + this.uniqueID = "urn:osh:sensor:georobotix:isa:" + config.networkID; this.xmlID = "ISA_" + config.networkID.toUpperCase(); /*// init comm provider diff --git a/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISASimulation.java b/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISASimulation.java index d49a7afa8..88dc1634e 100644 --- a/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISASimulation.java +++ b/sensors/others/sensorhub-driver-isa/src/main/java/org/sensorhub/impl/sensor/isa/ISASimulation.java @@ -96,7 +96,7 @@ void init() { // setup simulation clock to synchronize with MISB // + set handler to reset outputs when simulation restarts - this.clock = new SynchronizedClock(hub, "urn:osh:sensor:uas:predator001", "sensorLocation", time -> { + this.clock = new SynchronizedClock(hub, "urn:osh:sensor:georobotix:uas:predator001:", "sensorLocation", time -> { // reset all sensor output time if simulation is restarting if (time.toEpochMilli() < lastTime) @@ -129,7 +129,7 @@ void init() { var loc = sensorLocations[i]; driver.registerSensor(new RadiologicalSensor(driver, String.format("RADIO%03d", i+1)) - .addTriggerSource("urn:osh:process:vmti", "targetLocation", RadioReadingOutput.RADIO_MATERIAL_CATEGORY_CODE[1], 1200.0f) + .addTriggerSource("urn:osh:process:georobotix:vmti", "targetLocation", RadioReadingOutput.RADIO_MATERIAL_CATEGORY_CODE[1], 1200.0f) .setManufacturer("Radiological Sensors, Inc.") .setModelNumber("RD123") .setSoftwareVersion("FW21.23.89") diff --git a/sensors/others/sensorhub-driver-logback/build.gradle b/sensors/others/sensorhub-driver-logback/build.gradle index 949e43455..c78f93847 100644 --- a/sensors/others/sensorhub-driver-logback/build.gradle +++ b/sensors/others/sensorhub-driver-logback/build.gradle @@ -1,6 +1,6 @@ description = 'Logback Capture' ext.details = 'Logback appender implementation forwarding logs to a system output' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/others/sensorhub-driver-logback/src/main/java/org/sensorhub/impl/sensor/logback/LogbackDriver.java b/sensors/others/sensorhub-driver-logback/src/main/java/org/sensorhub/impl/sensor/logback/LogbackDriver.java index 5bd006d29..f9fc58f02 100644 --- a/sensors/others/sensorhub-driver-logback/src/main/java/org/sensorhub/impl/sensor/logback/LogbackDriver.java +++ b/sensors/others/sensorhub-driver-logback/src/main/java/org/sensorhub/impl/sensor/logback/LogbackDriver.java @@ -48,7 +48,7 @@ protected void doInit() throws SensorHubException { Asserts.checkNotNullOrBlank(config.uniqueId, "Must configure or use default UID for this driver"); // Generate identifiers - generateUniqueID("urn:osh:sensor:logback:", config.uniqueId); + generateUniqueID("urn:osh:sensor:georobotix:logback:", config.uniqueId); generateXmlID("LOGBACK_SENSOR_", config.uniqueId); // Create log output diff --git a/sensors/others/sensorhub-driver-meshtastic/build.gradle b/sensors/others/sensorhub-driver-meshtastic/build.gradle index 315854d2e..ae93184ee 100644 --- a/sensors/others/sensorhub-driver-meshtastic/build.gradle +++ b/sensors/others/sensorhub-driver-meshtastic/build.gradle @@ -5,7 +5,7 @@ plugins { description = 'Meshtastic Driver' ext.details = "Driver that utilizes a meshtastic Radio pre-configured with meshtastic Node Software to communicate with other meshtastic Radio" -version = '1.0.1' +version = '1.0.2' dependencies { diff --git a/sensors/others/sensorhub-driver-meshtastic/src/main/java/org/sensorhub/impl/sensor/meshtastic/MeshtasticSensor.java b/sensors/others/sensorhub-driver-meshtastic/src/main/java/org/sensorhub/impl/sensor/meshtastic/MeshtasticSensor.java index 59118fe81..f93d77ef4 100644 --- a/sensors/others/sensorhub-driver-meshtastic/src/main/java/org/sensorhub/impl/sensor/meshtastic/MeshtasticSensor.java +++ b/sensors/others/sensorhub-driver-meshtastic/src/main/java/org/sensorhub/impl/sensor/meshtastic/MeshtasticSensor.java @@ -34,7 +34,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class MeshtasticSensor extends AbstractSensorModule { - static final String UID_PREFIX = "urn:osh:sensor:meshtastic:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:meshtastic:"; static final String XML_PREFIX = "meshtastic"; String localMeshNodeId = null; // discovered from radio during startup via myInfo diff --git a/sensors/others/sensorhub-driver-universalcontroller/build.gradle b/sensors/others/sensorhub-driver-universalcontroller/build.gradle index a8bb5cf6f..f37edc62a 100644 --- a/sensors/others/sensorhub-driver-universalcontroller/build.gradle +++ b/sensors/others/sensorhub-driver-universalcontroller/build.gradle @@ -1,6 +1,6 @@ description = 'Universal Controller Driver' ext.details = "Driver to be able to read inputs from a gamepad device such as from a PS2 or Xbox controller OR read from a Wii Remote with or without nunchuk." -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/others/sensorhub-driver-universalcontroller/src/main/java/org/sensorhub/impl/sensor/universalcontroller/UniversalControllerSensor.java b/sensors/others/sensorhub-driver-universalcontroller/src/main/java/org/sensorhub/impl/sensor/universalcontroller/UniversalControllerSensor.java index 79f2e0122..adb05ceeb 100644 --- a/sensors/others/sensorhub-driver-universalcontroller/src/main/java/org/sensorhub/impl/sensor/universalcontroller/UniversalControllerSensor.java +++ b/sensors/others/sensorhub-driver-universalcontroller/src/main/java/org/sensorhub/impl/sensor/universalcontroller/UniversalControllerSensor.java @@ -44,7 +44,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("urn:osh:sensor:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:", config.serialNumber); generateXmlID("UNIVERSAL_CONTROLLER", config.serialNumber); // Get what types of controllers to search for diff --git a/sensors/others/sensorhub-utils-datafiles/build.gradle b/sensors/others/sensorhub-utils-datafiles/build.gradle index 87d157350..adade65b7 100644 --- a/sensors/others/sensorhub-utils-datafiles/build.gradle +++ b/sensors/others/sensorhub-utils-datafiles/build.gradle @@ -1,6 +1,6 @@ description = 'Data Files Utils' ext.details = 'Common utility classes for handling data files' -version = '0.1.0' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-ahrs/build.gradle b/sensors/positioning/sensorhub-driver-ahrs/build.gradle index 3c077dc93..bbba2b7e0 100644 --- a/sensors/positioning/sensorhub-driver-ahrs/build.gradle +++ b/sensors/positioning/sensorhub-driver-ahrs/build.gradle @@ -1,6 +1,6 @@ description = 'Microstrain AHRS Sensor' ext.details = 'Driver for Microstrain 3DM-GX2 AHRS sensor' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-ahrs/src/main/java/org/sensorhub/impl/sensor/ahrs/AHRSSensor.java b/sensors/positioning/sensorhub-driver-ahrs/src/main/java/org/sensorhub/impl/sensor/ahrs/AHRSSensor.java index 815ac682d..9f98d3311 100644 --- a/sensors/positioning/sensorhub-driver-ahrs/src/main/java/org/sensorhub/impl/sensor/ahrs/AHRSSensor.java +++ b/sensors/positioning/sensorhub-driver-ahrs/src/main/java/org/sensorhub/impl/sensor/ahrs/AHRSSensor.java @@ -35,7 +35,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:osh:sensor:ahrs:", null); + generateUniqueID("urn:osh:sensor:georobotix:ahrs:", null); generateXmlID("AHRS_", null); dataInterface = new AHRSOutput(this); diff --git a/sensors/positioning/sensorhub-driver-bno055/build.gradle b/sensors/positioning/sensorhub-driver-bno055/build.gradle index f137e0f5b..d626489ed 100644 --- a/sensors/positioning/sensorhub-driver-bno055/build.gradle +++ b/sensors/positioning/sensorhub-driver-bno055/build.gradle @@ -1,6 +1,6 @@ description = 'BNO055 Orientation Sensor' ext.details = 'Driver for BNO055 absolute orientation sensor built by Bosch' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-bno055/src/main/java/org/sensorhub/impl/sensor/bno055/Bno055Sensor.java b/sensors/positioning/sensorhub-driver-bno055/src/main/java/org/sensorhub/impl/sensor/bno055/Bno055Sensor.java index 948576f9e..f1a4015d5 100644 --- a/sensors/positioning/sensorhub-driver-bno055/src/main/java/org/sensorhub/impl/sensor/bno055/Bno055Sensor.java +++ b/sensors/positioning/sensorhub-driver-bno055/src/main/java/org/sensorhub/impl/sensor/bno055/Bno055Sensor.java @@ -86,7 +86,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers: use serial number from config or first characters of local ID - generateUniqueID("urn:bosch:bno055:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:bosch:bno055:", config.serialNumber); generateXmlID("BOSCH_BNO055_", config.serialNumber); // create main data interface diff --git a/sensors/positioning/sensorhub-driver-bno085/build.gradle b/sensors/positioning/sensorhub-driver-bno085/build.gradle index a404de81c..840471150 100644 --- a/sensors/positioning/sensorhub-driver-bno085/build.gradle +++ b/sensors/positioning/sensorhub-driver-bno085/build.gradle @@ -1,6 +1,6 @@ description = 'BNO085' ext.details = "BNO085 Sensor over i2c Connection" -version = '1.0.1' +version = '1.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java b/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java index 68320792c..981d18fa0 100644 --- a/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java +++ b/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java @@ -37,7 +37,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class Bno085Sensor extends AbstractSensorModule implements Runnable { - static final String UID_PREFIX = "osh:bno085:"; + static final String UID_PREFIX = "urn:osh:system:georobotix:bno085:"; static final String XML_PREFIX = "BNO085"; private static final Logger logger = LoggerFactory.getLogger(Bno085Sensor.class); diff --git a/sensors/positioning/sensorhub-driver-gps-nmea/build.gradle b/sensors/positioning/sensorhub-driver-gps-nmea/build.gradle index ea18af63c..0042fda96 100644 --- a/sensors/positioning/sensorhub-driver-gps-nmea/build.gradle +++ b/sensors/positioning/sensorhub-driver-gps-nmea/build.gradle @@ -1,6 +1,6 @@ description = 'NMEA GPS Sensor' ext.details = 'Driver for GNSS sensors compatible with NMEA 0183 standard' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea/gps/NMEAGpsSensor.java b/sensors/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea/gps/NMEAGpsSensor.java index 1d7ad973e..bdf20ead3 100644 --- a/sensors/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea/gps/NMEAGpsSensor.java +++ b/sensors/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea/gps/NMEAGpsSensor.java @@ -63,7 +63,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers: use serial number from config or first characters of local ID - generateUniqueID("urn:osh:sensor:nmea-gps:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:nmea-gps:", config.serialNumber); generateXmlID("GPS_SENSOR_", config.serialNumber); // create outputs depending on selected sentences diff --git a/sensors/positioning/sensorhub-driver-mti/build.gradle b/sensors/positioning/sensorhub-driver-mti/build.gradle index e2636e210..d78b71fd2 100644 --- a/sensors/positioning/sensorhub-driver-mti/build.gradle +++ b/sensors/positioning/sensorhub-driver-mti/build.gradle @@ -1,6 +1,6 @@ description = 'XSense MTi IMU Sensor' ext.details = 'Sensor driver for XSense MTi inertial measurement units' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-mti/src/main/java/org/sensorhub/impl/sensor/mti/MtiSensor.java b/sensors/positioning/sensorhub-driver-mti/src/main/java/org/sensorhub/impl/sensor/mti/MtiSensor.java index 72e414788..29b68babc 100644 --- a/sensors/positioning/sensorhub-driver-mti/src/main/java/org/sensorhub/impl/sensor/mti/MtiSensor.java +++ b/sensors/positioning/sensorhub-driver-mti/src/main/java/org/sensorhub/impl/sensor/mti/MtiSensor.java @@ -55,7 +55,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:xsens:imu:mti:", null); + generateUniqueID("urn:osh:sensor:georobotix:xsens:imu:mti:", null); generateXmlID("XSENS_IMU_", null); // create main data interface diff --git a/sensors/positioning/sensorhub-driver-nmeaais/build.gradle b/sensors/positioning/sensorhub-driver-nmeaais/build.gradle index ee3ecae4b..1b4a57ee6 100644 --- a/sensors/positioning/sensorhub-driver-nmeaais/build.gradle +++ b/sensors/positioning/sensorhub-driver-nmeaais/build.gradle @@ -1,6 +1,6 @@ description = 'NMEA AIS Decoder' ext.details = "Driver to Decode NMEA AIS Messages" -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-nmeaais/src/main/java/org/sensorhub/impl/sensor/nmeaais/NmeaAisDriver.java b/sensors/positioning/sensorhub-driver-nmeaais/src/main/java/org/sensorhub/impl/sensor/nmeaais/NmeaAisDriver.java index c0a901235..93e219b80 100644 --- a/sensors/positioning/sensorhub-driver-nmeaais/src/main/java/org/sensorhub/impl/sensor/nmeaais/NmeaAisDriver.java +++ b/sensors/positioning/sensorhub-driver-nmeaais/src/main/java/org/sensorhub/impl/sensor/nmeaais/NmeaAisDriver.java @@ -47,7 +47,7 @@ * as properties on the vessel FOI. Navigational status is streamed in the vesselLocation output. */ public class NmeaAisDriver extends AbstractSensorModule { - static final String UID_PREFIX = "urn:osh:sensor:nmea:ais:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:nmea:ais:"; static final String XML_PREFIX = "nmea:ais:"; NmeaAisHandler nmeaAisHandler; diff --git a/sensors/positioning/sensorhub-driver-notecardgps/build.gradle b/sensors/positioning/sensorhub-driver-notecardgps/build.gradle index 55fa268ea..732bac528 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/build.gradle +++ b/sensors/positioning/sensorhub-driver-notecardgps/build.gradle @@ -1,6 +1,6 @@ description = 'Blues Notecard GPS' ext.details = "Blues Notecard GPS Module over i2c Connection" -version = '1.0.1' +version = '1.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java index 4fab39e66..8d9d0a335 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java @@ -39,7 +39,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class notecardGPSSensor extends AbstractSensorModule implements Runnable { - static final String UID_PREFIX = "osh:notecardGPS:"; + static final String UID_PREFIX = "urn:osh:system:georobotix:notecardGPS:"; static final String XML_PREFIX = "notecardGPS"; private static final Logger logger = LoggerFactory.getLogger(notecardGPSSensor.class); diff --git a/sensors/positioning/sensorhub-driver-trek1000/build.gradle b/sensors/positioning/sensorhub-driver-trek1000/build.gradle index 946827102..cd340255f 100644 --- a/sensors/positioning/sensorhub-driver-trek1000/build.gradle +++ b/sensors/positioning/sensorhub-driver-trek1000/build.gradle @@ -1,6 +1,6 @@ description = 'DecaWave TREK1000' ext.details = 'Driver for DecaWave\'s TREK1000 UWB positioning system' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-trek1000/src/main/java/org/sensorhub/impl/sensor/trek1000/Trek1000Sensor.java b/sensors/positioning/sensorhub-driver-trek1000/src/main/java/org/sensorhub/impl/sensor/trek1000/Trek1000Sensor.java index ec84adb61..4daa472d5 100644 --- a/sensors/positioning/sensorhub-driver-trek1000/src/main/java/org/sensorhub/impl/sensor/trek1000/Trek1000Sensor.java +++ b/sensors/positioning/sensorhub-driver-trek1000/src/main/java/org/sensorhub/impl/sensor/trek1000/Trek1000Sensor.java @@ -62,7 +62,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers - generateUniqueID("urn:osh:sensor:trek1000:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:trek1000:", config.serialNumber); generateXmlID("TREK1000_", config.serialNumber); // init anchor positions diff --git a/sensors/positioning/sensorhub-driver-trupulse/build.gradle b/sensors/positioning/sensorhub-driver-trupulse/build.gradle index 66703949b..446a85bee 100644 --- a/sensors/positioning/sensorhub-driver-trupulse/build.gradle +++ b/sensors/positioning/sensorhub-driver-trupulse/build.gradle @@ -1,6 +1,6 @@ description = 'TruPulse 360R Range Finder' ext.details = 'Driver for TruPulse 360R Laser Range Finder with inclination and azimuth' -version = '2.0.1' +version = '2.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-trupulse/src/main/java/org/sensorhub/impl/sensor/trupulse/TruPulseSensor.java b/sensors/positioning/sensorhub-driver-trupulse/src/main/java/org/sensorhub/impl/sensor/trupulse/TruPulseSensor.java index 24f3ab21f..6283d772e 100644 --- a/sensors/positioning/sensorhub-driver-trupulse/src/main/java/org/sensorhub/impl/sensor/trupulse/TruPulseSensor.java +++ b/sensors/positioning/sensorhub-driver-trupulse/src/main/java/org/sensorhub/impl/sensor/trupulse/TruPulseSensor.java @@ -56,7 +56,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers: use serial number from config or first characters of local ID - generateUniqueID("urn:lasertech:trupulse360:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:lasertech:trupulse360:", config.serialNumber); generateXmlID("TRUPULSE_", config.serialNumber); // init main data interface diff --git a/sensors/positioning/sensorhub-driver-vectornav/build.gradle b/sensors/positioning/sensorhub-driver-vectornav/build.gradle index 3abbfe4ec..54d8fc971 100644 --- a/sensors/positioning/sensorhub-driver-vectornav/build.gradle +++ b/sensors/positioning/sensorhub-driver-vectornav/build.gradle @@ -1,6 +1,6 @@ description = 'VectorNav VN200 GPS/INS' ext.details = 'Driver for VectorNav VN200 Inertial Navigation Systems' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/positioning/sensorhub-driver-vectornav/src/main/java/org/sensorhub/impl/sensor/vectornav/VN200Sensor.java b/sensors/positioning/sensorhub-driver-vectornav/src/main/java/org/sensorhub/impl/sensor/vectornav/VN200Sensor.java index b80859a68..563313666 100644 --- a/sensors/positioning/sensorhub-driver-vectornav/src/main/java/org/sensorhub/impl/sensor/vectornav/VN200Sensor.java +++ b/sensors/positioning/sensorhub-driver-vectornav/src/main/java/org/sensorhub/impl/sensor/vectornav/VN200Sensor.java @@ -68,7 +68,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:vectornav:imu:", null); + generateUniqueID("urn:osh:sensor:georobotix:vectornav:imu:", null); generateXmlID("VNAV_INS_", null); // create data interfaces diff --git a/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/build.gradle b/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/build.gradle index 71e90332b..3b6ab6d4e 100644 --- a/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/build.gradle +++ b/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/build.gradle @@ -1,6 +1,6 @@ description = 'RPLidar Sensor' ext.details = 'ROS interface for OpenSensorHub to receive RP-LIDAR measurements' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/src/main/java/org/sensorhub/impl/sensor/rplidar/RpLidarSensor.java b/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/src/main/java/org/sensorhub/impl/sensor/rplidar/RpLidarSensor.java index dfac12ffd..7db2cc9c4 100644 --- a/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/src/main/java/org/sensorhub/impl/sensor/rplidar/RpLidarSensor.java +++ b/sensors/robotics/ros/lidar/sensorhub-driver-rplidar/src/main/java/org/sensorhub/impl/sensor/rplidar/RpLidarSensor.java @@ -35,7 +35,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("ros-rplidar-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-rplidar:", config.id); generateXmlID("ros-rplidar-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/motion/sensorhub-driver-movebase/build.gradle b/sensors/robotics/ros/motion/sensorhub-driver-movebase/build.gradle index f199e6eb5..5bf8af220 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-movebase/build.gradle +++ b/sensors/robotics/ros/motion/sensorhub-driver-movebase/build.gradle @@ -1,6 +1,6 @@ description = 'Move Base Goal Sensor' ext.details = "ROS interface for OpenSensorHub to Send Direct Remote Controlled target pose to drive a platform to desired location" -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/motion/sensorhub-driver-movebase/src/main/java/org/sensorhub/impl/sensor/movebase/MoveBaseSensor.java b/sensors/robotics/ros/motion/sensorhub-driver-movebase/src/main/java/org/sensorhub/impl/sensor/movebase/MoveBaseSensor.java index c19a6b1d8..bbfc3742b 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-movebase/src/main/java/org/sensorhub/impl/sensor/movebase/MoveBaseSensor.java +++ b/sensors/robotics/ros/motion/sensorhub-driver-movebase/src/main/java/org/sensorhub/impl/sensor/movebase/MoveBaseSensor.java @@ -34,7 +34,7 @@ public void doInit() throws SensorHubException { logger = LoggerFactory.getLogger(MoveBaseSensor.class); // Generate identifiers - generateUniqueID("ros-movebase-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-movebase:", config.id); generateXmlID("ros-movebase-", config.id); moveBaseControl = new MoveBaseControl(this); diff --git a/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/build.gradle b/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/build.gradle index c179df9ae..b3eb1dadb 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/build.gradle +++ b/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/build.gradle @@ -1,6 +1,6 @@ description = 'GPS Goal Sensor' ext.details = "ROS interface for OpenSensorHub to Send Direct Remote Controlled GPS target pose to drive a platform to desired location" -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/src/main/java/org/sensorhub/impl/sensor/nav/NavGoalSensor.java b/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/src/main/java/org/sensorhub/impl/sensor/nav/NavGoalSensor.java index 97abfc5f6..149f6a012 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/src/main/java/org/sensorhub/impl/sensor/nav/NavGoalSensor.java +++ b/sensors/robotics/ros/motion/sensorhub-driver-nav-gps/src/main/java/org/sensorhub/impl/sensor/nav/NavGoalSensor.java @@ -36,7 +36,7 @@ public void doInit() throws SensorHubException { logger = LoggerFactory.getLogger(NavGoalSensor.class); // Generate identifiers - generateUniqueID("ros-nav-gps-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-nav-gps:", config.id); generateXmlID("ros-nav-gps-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/motion/sensorhub-driver-track/build.gradle b/sensors/robotics/ros/motion/sensorhub-driver-track/build.gradle index b7aa94dbc..68576c91d 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-track/build.gradle +++ b/sensors/robotics/ros/motion/sensorhub-driver-track/build.gradle @@ -1,6 +1,6 @@ description = 'Track Control Sensor' ext.details = 'ROS interface for OpenSensorHub to Send Direct Remote Controlled Operations to drive a platform and Receive Commanded Velocities' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/motion/sensorhub-driver-track/src/main/java/org/sensorhub/impl/sensor/track/TrackControlSensor.java b/sensors/robotics/ros/motion/sensorhub-driver-track/src/main/java/org/sensorhub/impl/sensor/track/TrackControlSensor.java index 01d2e4498..2152af5d6 100644 --- a/sensors/robotics/ros/motion/sensorhub-driver-track/src/main/java/org/sensorhub/impl/sensor/track/TrackControlSensor.java +++ b/sensors/robotics/ros/motion/sensorhub-driver-track/src/main/java/org/sensorhub/impl/sensor/track/TrackControlSensor.java @@ -36,7 +36,7 @@ public void doInit() throws SensorHubException { logger = LoggerFactory.getLogger(TrackControlSensor.class); // Generate identifiers - generateUniqueID("ros-track-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-track:", config.id); generateXmlID("ros-track-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/build.gradle b/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/build.gradle index ecfca1919..cba8b16f7 100644 --- a/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/build.gradle +++ b/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/build.gradle @@ -1,6 +1,6 @@ description = 'Boston Dynamics Spot Driver' ext.details = "Driver to control Boston Dynamics SPOT platform" -version = '1.1.0' +version = '1.1.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/src/main/java/org/sensorhub/impl/sensor/spot/SpotSensor.java b/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/src/main/java/org/sensorhub/impl/sensor/spot/SpotSensor.java index 551a02769..34bfd6529 100644 --- a/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/src/main/java/org/sensorhub/impl/sensor/spot/SpotSensor.java +++ b/sensors/robotics/ros/platforms/boston-dynamics/spot/sensorhub-driver-spot/src/main/java/org/sensorhub/impl/sensor/spot/SpotSensor.java @@ -74,7 +74,7 @@ public void doInit() throws SensorHubException { } // Generate identifiers - generateUniqueID("urn:osh:system:boston_dynamics:spot:", config.serialNumber); + generateUniqueID("urn:osh:system:georobotix:boston_dynamics:spot:", config.serialNumber); generateXmlID("BOSTON_DYNAMICS_SPOT_", config.serialNumber); // Create and initialize outputs diff --git a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/build.gradle b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/build.gradle index 987548c8e..fe7ebbdca 100644 --- a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/build.gradle +++ b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/build.gradle @@ -1,6 +1,6 @@ description = 'Transbot Battery Sensor' ext.details = 'ROS interface for OpenSensorHub to receive battery voltage measurements' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/src/main/java/org/sensorhub/impl/sensor/transbot/battery/BatterySensor.java b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/src/main/java/org/sensorhub/impl/sensor/transbot/battery/BatterySensor.java index 7017da280..1ce8374cf 100644 --- a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/src/main/java/org/sensorhub/impl/sensor/transbot/battery/BatterySensor.java +++ b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-battery/src/main/java/org/sensorhub/impl/sensor/transbot/battery/BatterySensor.java @@ -35,7 +35,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("ros-transbot-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-transbot:", config.id); generateXmlID("ros-transbot-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/build.gradle b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/build.gradle index d33442ada..534e79de4 100644 --- a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/build.gradle +++ b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/build.gradle @@ -1,6 +1,6 @@ description = 'Remote Control Sensor' ext.details = 'ROS interface for OpenSensorHub to Send Remote Controlled Operations and Receive Commanded Velocities' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/src/main/java/org/sensorhub/impl/sensor/remotecontrol/RemoteControlSensor.java b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/src/main/java/org/sensorhub/impl/sensor/remotecontrol/RemoteControlSensor.java index 58cbae1f1..f6b274316 100644 --- a/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/src/main/java/org/sensorhub/impl/sensor/remotecontrol/RemoteControlSensor.java +++ b/sensors/robotics/ros/platforms/yahboom/transbot/sensorhub-driver-teleop/src/main/java/org/sensorhub/impl/sensor/remotecontrol/RemoteControlSensor.java @@ -36,7 +36,7 @@ public void doInit() throws SensorHubException { logger = LoggerFactory.getLogger(RemoteControlSensor.class); // Generate identifiers - generateUniqueID("ros-teleop-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-teleop:", config.id); generateXmlID("ros-teleop-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/build.gradle b/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/build.gradle index 4e2e68beb..b85305777 100644 --- a/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/build.gradle +++ b/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/build.gradle @@ -1,6 +1,6 @@ description = 'NMEA GPS Sensor' ext.details = 'ROS interface for OpenSensorHub to receive GPS measurements' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea_gps/NmeaGpsSensor.java b/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea_gps/NmeaGpsSensor.java index 1e2ab9e06..d98fc5783 100644 --- a/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea_gps/NmeaGpsSensor.java +++ b/sensors/robotics/ros/positioning/sensorhub-driver-gps-nmea/src/main/java/org/sensorhub/impl/sensor/nmea_gps/NmeaGpsSensor.java @@ -35,7 +35,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("ros-nmea-gps-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-nmea-gps:", config.id); generateXmlID("ros-nmea-gps-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/positioning/sensorhub-driver-imu/build.gradle b/sensors/robotics/ros/positioning/sensorhub-driver-imu/build.gradle index 46583db81..af1f5df1d 100644 --- a/sensors/robotics/ros/positioning/sensorhub-driver-imu/build.gradle +++ b/sensors/robotics/ros/positioning/sensorhub-driver-imu/build.gradle @@ -1,6 +1,6 @@ description = 'IMU Sensor' ext.details = 'ROS interface for OpenSensorHub to receive IMU measurements' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/positioning/sensorhub-driver-imu/src/main/java/org/sensorhub/impl/sensor/imu/ImuSensor.java b/sensors/robotics/ros/positioning/sensorhub-driver-imu/src/main/java/org/sensorhub/impl/sensor/imu/ImuSensor.java index 32c4c448b..014bd3407 100644 --- a/sensors/robotics/ros/positioning/sensorhub-driver-imu/src/main/java/org/sensorhub/impl/sensor/imu/ImuSensor.java +++ b/sensors/robotics/ros/positioning/sensorhub-driver-imu/src/main/java/org/sensorhub/impl/sensor/imu/ImuSensor.java @@ -35,7 +35,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("ros-imu-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-imu:", config.id); generateXmlID("ros-imu-", config.id); // Create and initialize output diff --git a/sensors/robotics/ros/video/sensorhub-driver-astracam/build.gradle b/sensors/robotics/ros/video/sensorhub-driver-astracam/build.gradle index 54aa2e534..040542fa2 100644 --- a/sensors/robotics/ros/video/sensorhub-driver-astracam/build.gradle +++ b/sensors/robotics/ros/video/sensorhub-driver-astracam/build.gradle @@ -1,6 +1,6 @@ description = 'Astracam Pro' ext.details = 'ROS interface for OpenSensorHub to receive image frames' -version = '1.0.0' +version = '1.0.1' repositories { mavenCentral() diff --git a/sensors/robotics/ros/video/sensorhub-driver-astracam/src/main/java/org/sensorhub/impl/sensor/astracam/AstraCamSensor.java b/sensors/robotics/ros/video/sensorhub-driver-astracam/src/main/java/org/sensorhub/impl/sensor/astracam/AstraCamSensor.java index 34cdfa728..795fc8ca7 100644 --- a/sensors/robotics/ros/video/sensorhub-driver-astracam/src/main/java/org/sensorhub/impl/sensor/astracam/AstraCamSensor.java +++ b/sensors/robotics/ros/video/sensorhub-driver-astracam/src/main/java/org/sensorhub/impl/sensor/astracam/AstraCamSensor.java @@ -32,7 +32,7 @@ public void doInit() throws SensorHubException { super.doInit(); // Generate identifiers - generateUniqueID("ros-image-", config.id); + generateUniqueID("urn:osh:sensor:georobotix:ros-image:", config.id); generateXmlID("ros-image-", config.id); // Create and initialize output diff --git a/sensors/robotics/sensorhub-driver-mavlink/build.gradle b/sensors/robotics/sensorhub-driver-mavlink/build.gradle index d8568e1af..57569879a 100644 --- a/sensors/robotics/sensorhub-driver-mavlink/build.gradle +++ b/sensors/robotics/sensorhub-driver-mavlink/build.gradle @@ -1,6 +1,6 @@ description = 'MAVLink System' ext.details = 'Driver for MAVLink compatible UAV and robots' -version = '1.0.1' +version = '1.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/robotics/sensorhub-driver-mavlink/src/main/java/org/sensorhub/impl/sensor/mavlink/MavlinkDriver.java b/sensors/robotics/sensorhub-driver-mavlink/src/main/java/org/sensorhub/impl/sensor/mavlink/MavlinkDriver.java index 5e16903e2..83b7d4312 100644 --- a/sensors/robotics/sensorhub-driver-mavlink/src/main/java/org/sensorhub/impl/sensor/mavlink/MavlinkDriver.java +++ b/sensors/robotics/sensorhub-driver-mavlink/src/main/java/org/sensorhub/impl/sensor/mavlink/MavlinkDriver.java @@ -92,7 +92,7 @@ enum CopterModes protected void doInit() throws SensorHubException { // generate identifiers - generateUniqueID("urn:osh:sensor:mavlink:", config.vehicleID); + generateUniqueID("urn:osh:sensor:georobotix:mavlink:", config.vehicleID); generateXmlID("MAVLINK_SYSTEM_", config.vehicleID); // create outputs depending on selected sentences diff --git a/sensors/robotics/sensorhub-driver-mavsdk/build.gradle b/sensors/robotics/sensorhub-driver-mavsdk/build.gradle index daff7854f..f20895737 100644 --- a/sensors/robotics/sensorhub-driver-mavsdk/build.gradle +++ b/sensors/robotics/sensorhub-driver-mavsdk/build.gradle @@ -1,7 +1,7 @@ description = 'Unmanned System' ext.details = 'MAVLink adapter' -version='2.1.0' +version='2.1.1' dependencies{ implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/robotics/sensorhub-driver-mavsdk/src/main/java/org/sensorhub/impl/sensor/mavsdk/UnmannedSystem.java b/sensors/robotics/sensorhub-driver-mavsdk/src/main/java/org/sensorhub/impl/sensor/mavsdk/UnmannedSystem.java index 7d7103b3f..0c7a9a010 100644 --- a/sensors/robotics/sensorhub-driver-mavsdk/src/main/java/org/sensorhub/impl/sensor/mavsdk/UnmannedSystem.java +++ b/sensors/robotics/sensorhub-driver-mavsdk/src/main/java/org/sensorhub/impl/sensor/mavsdk/UnmannedSystem.java @@ -31,7 +31,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class UnmannedSystem extends AbstractSensorModule { - static final String UID_PREFIX = "urn:osh:driver:mavsdk:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:mavsdk:"; static final String XML_PREFIX = "MAVSDK_DRIVER_"; private static final Logger logger = LoggerFactory.getLogger(UnmannedSystem.class); diff --git a/sensors/robotics/sensorhub-driver-pwm-servos/build.gradle b/sensors/robotics/sensorhub-driver-pwm-servos/build.gradle index 0040ff1b4..b6eb394ad 100644 --- a/sensors/robotics/sensorhub-driver-pwm-servos/build.gradle +++ b/sensors/robotics/sensorhub-driver-pwm-servos/build.gradle @@ -1,6 +1,6 @@ description = 'PCA9685 PWM Servos Driver' ext.details = 'Driver for Adafruit PCA9685 16-channels PWM servo board' -version = '0.1-SNAPSHOT' +version = '0.1.1' rootProject.allprojects { repositories { diff --git a/sensors/robotics/sensorhub-driver-pwm-servos/src/main/java/org/sensorhub/impl/actuator/pca9685/PwmServoActuators.java b/sensors/robotics/sensorhub-driver-pwm-servos/src/main/java/org/sensorhub/impl/actuator/pca9685/PwmServoActuators.java index 50424ab58..860f38337 100644 --- a/sensors/robotics/sensorhub-driver-pwm-servos/src/main/java/org/sensorhub/impl/actuator/pca9685/PwmServoActuators.java +++ b/sensors/robotics/sensorhub-driver-pwm-servos/src/main/java/org/sensorhub/impl/actuator/pca9685/PwmServoActuators.java @@ -49,7 +49,7 @@ protected void doInit() throws SensorHubException super.init(config); // generate IDs - generateUniqueID("urn:osh:actuator:servos:", null); + generateUniqueID("urn:osh:actuator:georobotix:servos:", null); generateXmlID("PWM_SERVOS_", null); // create control inputs diff --git a/sensors/simulated/sensorhub-driver-fakecam/build.gradle b/sensors/simulated/sensorhub-driver-fakecam/build.gradle index 99e8128f6..79992517f 100644 --- a/sensors/simulated/sensorhub-driver-fakecam/build.gradle +++ b/sensors/simulated/sensorhub-driver-fakecam/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated Camera Sensor' ext.details = 'Demo sensor simulating a live video feed by replaying a video file' -version = '0.1' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-fakecam/src/main/java/org/sensorhub/impl/sensor/fakecam/FakeCamSensor.java b/sensors/simulated/sensorhub-driver-fakecam/src/main/java/org/sensorhub/impl/sensor/fakecam/FakeCamSensor.java index ffeb05c70..97b4003c5 100644 --- a/sensors/simulated/sensorhub-driver-fakecam/src/main/java/org/sensorhub/impl/sensor/fakecam/FakeCamSensor.java +++ b/sensors/simulated/sensorhub-driver-fakecam/src/main/java/org/sensorhub/impl/sensor/fakecam/FakeCamSensor.java @@ -44,7 +44,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:osh:sensor:simcam:", config.cameraID); + generateUniqueID("urn:osh:sensor:georobotix:simcam:", config.cameraID); generateXmlID("VIDEO_CAM_", config.cameraID); // create output diff --git a/sensors/simulated/sensorhub-driver-fakegps/build.gradle b/sensors/simulated/sensorhub-driver-fakegps/build.gradle index ed50dff24..d36ef3544 100644 --- a/sensors/simulated/sensorhub-driver-fakegps/build.gradle +++ b/sensors/simulated/sensorhub-driver-fakegps/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated GPS Sensor' ext.details = 'Demo sensor outputting simulated GPS data obtained using Google Directions API' -version = '1.0.1' +version = '1.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsOutput.java b/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsOutput.java index 80d93fb29..a0b139e1c 100644 --- a/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsOutput.java +++ b/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsOutput.java @@ -119,7 +119,7 @@ protected void init() GeoPosHelper fac = new GeoPosHelper(); var recBuilder = fac.createRecord() .name(getName()) - .definition("urn:osh:sensor:simgps:gpsdata") + .definition("urn:osh:sensor:georobotix:simgps:gpsdata") .addField("time", fac.createTime() .asSamplingTimeIsoGPS()); diff --git a/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsSensor.java b/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsSensor.java index b4145feac..941c29256 100644 --- a/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsSensor.java +++ b/sensors/simulated/sensorhub-driver-fakegps/src/main/java/org/sensorhub/impl/sensor/fakegps/FakeGpsSensor.java @@ -49,7 +49,7 @@ protected void doInit() throws SensorHubException config.validate(); // generate IDs - generateUniqueID("urn:osh:sensor:simgps:", null); + generateUniqueID("urn:osh:sensor:georobotix:simgps:", null); generateXmlID("GPS_SENSOR_", null); // init main data interface diff --git a/sensors/simulated/sensorhub-driver-fakeweather/build.gradle b/sensors/simulated/sensorhub-driver-fakeweather/build.gradle index f9eb18bab..14e2b3d87 100644 --- a/sensors/simulated/sensorhub-driver-fakeweather/build.gradle +++ b/sensors/simulated/sensorhub-driver-fakeweather/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated Weather Sensor' ext.details = 'Demo sensor outputting pseudo random weather measurements' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherNetwork.java b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherNetwork.java index 0e9d4414c..ae4cc1ce0 100644 --- a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherNetwork.java +++ b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherNetwork.java @@ -35,7 +35,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers - generateUniqueID("urn:osh:sensor:simweathernetwork:", config.networkID); + generateUniqueID("urn:osh:sensor:georobotix:simweathernetwork:", config.networkID); generateXmlID("WEATHER_NETWORK_", config.networkID); // init main data interface diff --git a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherOutput.java b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherOutput.java index 9919f7861..99a9b17d2 100644 --- a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherOutput.java +++ b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherOutput.java @@ -61,7 +61,7 @@ protected void init() // create output data structure dataStruct = fac.createRecord() .name(getName()) - .definition("urn:osh:data:weather") + .definition("urn:osh:data:georobotix:weather") .description("Weather measurements") .addField("time", fac.createTime() diff --git a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherSensor.java b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherSensor.java index 34e826ceb..0597876f6 100644 --- a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherSensor.java +++ b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherSensor.java @@ -43,7 +43,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers - generateUniqueID("urn:osh:sensor:simweather:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:simweather:", config.serialNumber); generateXmlID("WEATHER_STATION_", config.serialNumber); // init main data interface diff --git a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherStation.java b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherStation.java index 6dfb9c3e3..ba0a37e0f 100644 --- a/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherStation.java +++ b/sensors/simulated/sensorhub-driver-fakeweather/src/main/java/org/sensorhub/impl/sensor/fakeweather/FakeWeatherStation.java @@ -55,7 +55,7 @@ public class FakeWeatherStation implements IFeature FakeWeatherStation(int num, double lat, double lon) { this.id = String.format("WS%03d", num); - this.uid = "urn:osh:sensor:simweather:station:" + id; + this.uid = "urn:osh:sensor:georobotix:simweather:station:" + id; this.lat = lat; this.lon = lon; } diff --git a/sensors/simulated/sensorhub-driver-plume/build.gradle b/sensors/simulated/sensorhub-driver-plume/build.gradle index 8b942d59e..e409cc858 100644 --- a/sensors/simulated/sensorhub-driver-plume/build.gradle +++ b/sensors/simulated/sensorhub-driver-plume/build.gradle @@ -1,6 +1,6 @@ description = 'Lagrangian Plume Model' ext.details = 'Driver for tasking and retrieving data from Lagrangian Plume model developed at University of Alabama in Huntsville' -version = '1.0-SNAPSHOT' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-plume/src/main/java/org/sensorhub/impl/sensor/plume/PlumeSensor.java b/sensors/simulated/sensorhub-driver-plume/src/main/java/org/sensorhub/impl/sensor/plume/PlumeSensor.java index ec40dd2ee..3dcfef7cc 100644 --- a/sensors/simulated/sensorhub-driver-plume/src/main/java/org/sensorhub/impl/sensor/plume/PlumeSensor.java +++ b/sensors/simulated/sensorhub-driver-plume/src/main/java/org/sensorhub/impl/sensor/plume/PlumeSensor.java @@ -41,7 +41,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:osh:model:plume:", null); + generateUniqueID("urn:osh:sensor:georobotix:model:plume:", null); generateXmlID("PLUME_MODEL_", null); this.dataInterface = new PlumeOutput(this); diff --git a/sensors/simulated/sensorhub-driver-simorientation/build.gradle b/sensors/simulated/sensorhub-driver-simorientation/build.gradle index 909852bc7..76c0ec19e 100644 --- a/sensors/simulated/sensorhub-driver-simorientation/build.gradle +++ b/sensors/simulated/sensorhub-driver-simorientation/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated Orientation Sensor' ext.details = 'Demo sensor outputting random orientation data' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-simorientation/src/main/java/com/botts/impl/sensor/simorientation/SimOrientationSensor.java b/sensors/simulated/sensorhub-driver-simorientation/src/main/java/com/botts/impl/sensor/simorientation/SimOrientationSensor.java index 90c10d511..80497733f 100644 --- a/sensors/simulated/sensorhub-driver-simorientation/src/main/java/com/botts/impl/sensor/simorientation/SimOrientationSensor.java +++ b/sensors/simulated/sensorhub-driver-simorientation/src/main/java/com/botts/impl/sensor/simorientation/SimOrientationSensor.java @@ -29,7 +29,7 @@ protected void doInit() throws SensorHubException { super.doInit(); // generate identifiers - generateUniqueID("urn:osh:sensor:simorientation:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:simorientation:", config.serialNumber); generateXmlID("SIMULATED_ORIENTATION_SENSOR_", config.serialNumber); // init main data interface diff --git a/sensors/simulated/sensorhub-driver-simuav/build.gradle b/sensors/simulated/sensorhub-driver-simuav/build.gradle index 1dd199b90..0a510945b 100644 --- a/sensors/simulated/sensorhub-driver-simuav/build.gradle +++ b/sensors/simulated/sensorhub-driver-simuav/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated UAV' ext.details = 'Simulated UAV with tasking capabilities' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-simuav/src/main/java/org/sensorhub/impl/sensor/simuav/SimUavDriver.java b/sensors/simulated/sensorhub-driver-simuav/src/main/java/org/sensorhub/impl/sensor/simuav/SimUavDriver.java index 5ae208dad..7246dbfb2 100644 --- a/sensors/simulated/sensorhub-driver-simuav/src/main/java/org/sensorhub/impl/sensor/simuav/SimUavDriver.java +++ b/sensors/simulated/sensorhub-driver-simuav/src/main/java/org/sensorhub/impl/sensor/simuav/SimUavDriver.java @@ -58,7 +58,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate identifiers - generateUniqueID("urn:osh:system:simuav:", config.serialNumber); + generateUniqueID("urn:osh:system:georobotix:simuav:", config.serialNumber); generateXmlID("SIMULATED_UAV_", config.serialNumber); // init outputs diff --git a/sensors/simulated/sensorhub-driver-simulatedcbrn/build.gradle b/sensors/simulated/sensorhub-driver-simulatedcbrn/build.gradle index de16b25a0..02637a69e 100644 --- a/sensors/simulated/sensorhub-driver-simulatedcbrn/build.gradle +++ b/sensors/simulated/sensorhub-driver-simulatedcbrn/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated CBRN Sensor' ext.details = 'Demo sensor outputting pseudo random CBRN measurements' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-simulatedcbrn/src/main/java/org/sensorhub/impl/sensor/simulatedcbrn/SimCBRNSensor.java b/sensors/simulated/sensorhub-driver-simulatedcbrn/src/main/java/org/sensorhub/impl/sensor/simulatedcbrn/SimCBRNSensor.java index 6d46b539f..b8523646c 100644 --- a/sensors/simulated/sensorhub-driver-simulatedcbrn/src/main/java/org/sensorhub/impl/sensor/simulatedcbrn/SimCBRNSensor.java +++ b/sensors/simulated/sensorhub-driver-simulatedcbrn/src/main/java/org/sensorhub/impl/sensor/simulatedcbrn/SimCBRNSensor.java @@ -50,7 +50,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate ID - generateUniqueID("urn:osh:sensor:simcbrn:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:simcbrn:", config.serialNumber); generateXmlID("CBRN_SENSOR_", config.serialNumber); // Create output interfaces diff --git a/sensors/simulated/sensorhub-driver-simweatherstation/build.gradle b/sensors/simulated/sensorhub-driver-simweatherstation/build.gradle index 8c7dbe0f5..e31f8a661 100644 --- a/sensors/simulated/sensorhub-driver-simweatherstation/build.gradle +++ b/sensors/simulated/sensorhub-driver-simweatherstation/build.gradle @@ -1,6 +1,6 @@ description = 'Simulated Weather Station' ext.details = 'Driver for simulated home weather station' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/simulated/sensorhub-driver-simweatherstation/src/main/java/org/sensorhub/impl/sensor/simweatherstation/SimWeatherStationSensor.java b/sensors/simulated/sensorhub-driver-simweatherstation/src/main/java/org/sensorhub/impl/sensor/simweatherstation/SimWeatherStationSensor.java index cf50bffba..e5d1e22be 100644 --- a/sensors/simulated/sensorhub-driver-simweatherstation/src/main/java/org/sensorhub/impl/sensor/simweatherstation/SimWeatherStationSensor.java +++ b/sensors/simulated/sensorhub-driver-simweatherstation/src/main/java/org/sensorhub/impl/sensor/simweatherstation/SimWeatherStationSensor.java @@ -24,7 +24,7 @@ protected void doInit() throws SensorHubException super.doInit(); // add unique ID based on serial number - this.uniqueID = "urn:simweatherstation:" + config.modelNumber + ":" + config.serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:simweatherstation:" + config.modelNumber + ":" + config.serialNumber; this.xmlID = "SIMWEATHERSTATION_" + config.modelNumber + "_" + config.serialNumber.toUpperCase(); // create data interfaces diff --git a/sensors/smarthome/sensorhub-driver-domoticz/build.gradle b/sensors/smarthome/sensorhub-driver-domoticz/build.gradle index d45610917..84310a88b 100644 --- a/sensors/smarthome/sensorhub-driver-domoticz/build.gradle +++ b/sensors/smarthome/sensorhub-driver-domoticz/build.gradle @@ -1,6 +1,6 @@ description = 'Domoticz Smart Home' ext.details = 'Driver for connecting to Domoticz Home Automation System' -version = '0.1.0-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/smarthome/sensorhub-driver-domoticz/src/main/java/org/sensorhub/impl/sensor/domoticz/DomoticzDriver.java b/sensors/smarthome/sensorhub-driver-domoticz/src/main/java/org/sensorhub/impl/sensor/domoticz/DomoticzDriver.java index c38522f89..ddc54d079 100644 --- a/sensors/smarthome/sensorhub-driver-domoticz/src/main/java/org/sensorhub/impl/sensor/domoticz/DomoticzDriver.java +++ b/sensors/smarthome/sensorhub-driver-domoticz/src/main/java/org/sensorhub/impl/sensor/domoticz/DomoticzDriver.java @@ -228,7 +228,7 @@ protected void doInit() throws SensorHubException } // add unique ID based on serial number - this.uniqueID = "urn:domoticz:" + config.modelNumber + ":" + config.serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:domoticz:" + config.modelNumber + ":" + config.serialNumber; this.xmlID = "DOMOTICZ_" + config.modelNumber + "_" + config.serialNumber.toUpperCase(); } diff --git a/sensors/smarthome/sensorhub-driver-openhab/src/main/java/org/sensorhub/impl/sensor/openhab/OpenHabDriver.java b/sensors/smarthome/sensorhub-driver-openhab/src/main/java/org/sensorhub/impl/sensor/openhab/OpenHabDriver.java index 6ef93a69b..dee2735a5 100644 --- a/sensors/smarthome/sensorhub-driver-openhab/src/main/java/org/sensorhub/impl/sensor/openhab/OpenHabDriver.java +++ b/sensors/smarthome/sensorhub-driver-openhab/src/main/java/org/sensorhub/impl/sensor/openhab/OpenHabDriver.java @@ -411,7 +411,7 @@ protected void doInit() throws SensorHubException // } // add unique ID based on serial number - this.uniqueID = "urn:openhab:" + config.modelNumber + ":" + config.serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:openhab:" + config.modelNumber + ":" + config.serialNumber; this.xmlID = "OPENHAB_" + config.modelNumber + "_" + config.serialNumber.toUpperCase(); } diff --git a/sensors/social/sensorhub-driver-twitter/build.gradle b/sensors/social/sensorhub-driver-twitter/build.gradle index c27bdc725..dd1a56cca 100644 --- a/sensors/social/sensorhub-driver-twitter/build.gradle +++ b/sensors/social/sensorhub-driver-twitter/build.gradle @@ -1,6 +1,6 @@ description = 'Twitter Sensor' ext.details = 'Twitter Sensor via Twitter\'s API' -version = '0.0.1' +version = '0.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/social/sensorhub-driver-twitter/src/main/java/org/sensorhub/impl/sensor/twitter/TwitterSensor.java b/sensors/social/sensorhub-driver-twitter/src/main/java/org/sensorhub/impl/sensor/twitter/TwitterSensor.java index 56d654d93..8616541a9 100644 --- a/sensors/social/sensorhub-driver-twitter/src/main/java/org/sensorhub/impl/sensor/twitter/TwitterSensor.java +++ b/sensors/social/sensorhub-driver-twitter/src/main/java/org/sensorhub/impl/sensor/twitter/TwitterSensor.java @@ -14,7 +14,7 @@ */ public class TwitterSensor extends AbstractSensorModule { - public final String urn = "urn:osh:sensor:twitter"; + public final String urn = "urn:osh:sensor:georobotix:twitter"; public final String xmlID = "TWITTER_STREAM_"; TwitterOutput dataInterface; diff --git a/sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraDriver.java b/sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraDriver.java index 4c19b3e7c..6f3e3eb7b 100644 --- a/sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraDriver.java +++ b/sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraDriver.java @@ -15,25 +15,26 @@ Developer are Copyright (C) 2014 the Initial Developer. All Rights Reserved. package org.sensorhub.impl.sensor.axis; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import net.opengis.sensorml.v20.IdentifierList; import net.opengis.sensorml.v20.Term; +import org.sensorhub.api.common.SensorHubException; import org.sensorhub.api.sensor.SensorException; import org.sensorhub.impl.comm.RobustHTTPConnection; import org.sensorhub.impl.module.RobustConnection; import org.sensorhub.impl.security.ClientAuth; import org.sensorhub.impl.sensor.AbstractSensorModule; import org.sensorhub.impl.sensor.rtpcam.RTSPClient; -import org.sensorhub.api.common.SensorHubException; import org.vast.sensorML.SMLFactory; import org.vast.swe.SWEHelper; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + /** *

@@ -124,6 +125,7 @@ protected void doInit() throws SensorHubException { // create connection handler connection = new RobustHTTPConnection(this, config.connection, "Axis Camera") { public boolean tryConnect() throws IOException { + // check we can reach the HTTP server // and access the param URL HttpURLConnection conn = tryConnectGET(getHostUrl() + VAPIX_QUERY_PARAMS_LIST); @@ -215,7 +217,7 @@ else if (tokens[0].trim().equalsIgnoreCase("root.Properties.API.HTTP.Version")) connection.waitForConnection(); // generate identifiers - generateUniqueID("urn:axis:cam:", config.uidExtension.isBlank() ? serialNumber : serialNumber.trim() + ":" + config.uidExtension); + generateUniqueID("urn:osh:sensor:georobotix:axis:cam:", config.uidExtension.isBlank() ? serialNumber : serialNumber.trim() + ":" + config.uidExtension); generateXmlID("AXIS_CAM_", config.uidExtension.isBlank() ? serialNumber : serialNumber.trim() + "_" + config.uidExtension); // create I/O objects diff --git a/sensors/video/sensorhub-driver-dahua/build.gradle b/sensors/video/sensorhub-driver-dahua/build.gradle index 4300cf325..dddf6e237 100644 --- a/sensors/video/sensorhub-driver-dahua/build.gradle +++ b/sensors/video/sensorhub-driver-dahua/build.gradle @@ -1,6 +1,6 @@ description = 'Dahua Video Camera' ext.details = 'Driver for IP video cameras from Dahua (with PTZ tasking support)' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-dahua/src/main/java/org/sensorhub/impl/sensor/dahua/DahuaCameraDriver.java b/sensors/video/sensorhub-driver-dahua/src/main/java/org/sensorhub/impl/sensor/dahua/DahuaCameraDriver.java index 5a2cf76b3..8f24cb311 100644 --- a/sensors/video/sensorhub-driver-dahua/src/main/java/org/sensorhub/impl/sensor/dahua/DahuaCameraDriver.java +++ b/sensors/video/sensorhub-driver-dahua/src/main/java/org/sensorhub/impl/sensor/dahua/DahuaCameraDriver.java @@ -166,7 +166,7 @@ else if (tokens[0].trim().equalsIgnoreCase("deviceType")) connection.waitForConnection(); // generate identifiers - generateUniqueID("urn:dahua:cam:", serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:dahua:cam:", serialNumber); generateXmlID("DAHUA_CAM_", serialNumber); // create I/O objects diff --git a/sensors/video/sensorhub-driver-ffmpeg/build.gradle b/sensors/video/sensorhub-driver-ffmpeg/build.gradle index 6e344f4b3..c0efbc7fd 100644 --- a/sensors/video/sensorhub-driver-ffmpeg/build.gradle +++ b/sensors/video/sensorhub-driver-ffmpeg/build.gradle @@ -1,6 +1,6 @@ description = 'FFMPEG Video Driver' ext.details = "Driver for connecting to ffmpeg capable video streams" -version = '1.1.0' +version = '1.1.1' // To build in entire java cv platform of projects use // implementation('org.bytedeco:javacv-platform:1.5.2') diff --git a/sensors/video/sensorhub-driver-ffmpeg/src/main/java/org/sensorhub/impl/sensor/ffmpeg/FFMPEGSensor.java b/sensors/video/sensorhub-driver-ffmpeg/src/main/java/org/sensorhub/impl/sensor/ffmpeg/FFMPEGSensor.java index 53764ea32..c14048e0e 100644 --- a/sensors/video/sensorhub-driver-ffmpeg/src/main/java/org/sensorhub/impl/sensor/ffmpeg/FFMPEGSensor.java +++ b/sensors/video/sensorhub-driver-ffmpeg/src/main/java/org/sensorhub/impl/sensor/ffmpeg/FFMPEGSensor.java @@ -54,7 +54,7 @@ protected void doInit() throws SensorHubException { clearStatus(); logger.info("Initializing FFMPEG sensor for {}", getUniqueIdentifier()); - generateUniqueID("urn:osh:sensor:ffmpeg:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:ffmpeg:", config.serialNumber); generateXmlID("FFMPEG_", config.serialNumber); if (config.connection.fps < 0) diff --git a/sensors/video/sensorhub-driver-flir-dh390/build.gradle b/sensors/video/sensorhub-driver-flir-dh390/build.gradle index 2cae2507c..530525e4b 100644 --- a/sensors/video/sensorhub-driver-flir-dh390/build.gradle +++ b/sensors/video/sensorhub-driver-flir-dh390/build.gradle @@ -1,6 +1,6 @@ description = "FLIR DH-390 Driver" ext.details = "Driver for connecting to the FLIR DH-390 dome camera." -version = "1.0.0" +version = "1.0.1" // To build in entire java cv platform of projects use // implementation("org.bytedeco:javacv-platform:1.5.2") diff --git a/sensors/video/sensorhub-driver-flir-dh390/src/main/java/org/sensorhub/impl/sensor/flir/dh390/DH390Driver.java b/sensors/video/sensorhub-driver-flir-dh390/src/main/java/org/sensorhub/impl/sensor/flir/dh390/DH390Driver.java index 9afbfb7b7..8c1b597a6 100644 --- a/sensors/video/sensorhub-driver-flir-dh390/src/main/java/org/sensorhub/impl/sensor/flir/dh390/DH390Driver.java +++ b/sensors/video/sensorhub-driver-flir-dh390/src/main/java/org/sensorhub/impl/sensor/flir/dh390/DH390Driver.java @@ -42,7 +42,7 @@ public class DH390Driver extends AbstractSensorModule { protected void doInit() throws SensorHubException { super.doInit(); - generateUniqueID("urn:osh:sensor:flir:dh-390:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:flir:dh-390:", config.serialNumber); generateXmlID("FLIR_DH-390_", config.serialNumber); if (visualMpegTsProcessor != null) diff --git a/sensors/video/sensorhub-driver-foscam/build.gradle b/sensors/video/sensorhub-driver-foscam/build.gradle index 7ab8db195..df7205ab4 100755 --- a/sensors/video/sensorhub-driver-foscam/build.gradle +++ b/sensors/video/sensorhub-driver-foscam/build.gradle @@ -1,6 +1,6 @@ description = 'Foscam Cameras' ext.details = 'Driver for Foscam video cameras using IP protocol' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java b/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java index 0df20c689..27892237a 100644 --- a/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java +++ b/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java @@ -38,6 +38,9 @@ Developer are Copyright (C) 2016 the Initial Developer. All Rights Reserved. */ public class FoscamDriver extends AbstractSensorModule { private static final Logger logger = LoggerFactory.getLogger(FoscamDriver.class); + static final String UID_PREFIX = "urn:osh:system:georobotix:foscam:"; + static final String XML_PREFIX = "foscam"; + private FoscamPtzControl ptzControlInterface; RobustIPConnection connection; FoscamVideoOutput videoDataInterface; @@ -59,6 +62,10 @@ protected void doInit() throws SensorHubException { ptzControlInterface = null; ptzSupported = false; + // Create SensorHub Identifiers using designated prefix and serial number from Admin Panel + generateUniqueID(UID_PREFIX, config.cameraID); + generateXmlID(XML_PREFIX, config.cameraID); + // create connection handler this.connection = new RobustIPConnection(this, config.connection, "Foscam Camera") { diff --git a/sensors/video/sensorhub-driver-kinect/build.gradle b/sensors/video/sensorhub-driver-kinect/build.gradle index dd9a3dd40..938d33ff0 100644 --- a/sensors/video/sensorhub-driver-kinect/build.gradle +++ b/sensors/video/sensorhub-driver-kinect/build.gradle @@ -1,6 +1,6 @@ description = 'Kinect Driver' ext.details = 'An OpenSensorHub driver for the Microsoft Kinect using the OpenKinect freenect library and Java wrappers' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-kinect/src/main/java/org/sensorhub/impl/sensor/kinect/KinectSensor.java b/sensors/video/sensorhub-driver-kinect/src/main/java/org/sensorhub/impl/sensor/kinect/KinectSensor.java index 059f22895..f164e7526 100644 --- a/sensors/video/sensorhub-driver-kinect/src/main/java/org/sensorhub/impl/sensor/kinect/KinectSensor.java +++ b/sensors/video/sensorhub-driver-kinect/src/main/java/org/sensorhub/impl/sensor/kinect/KinectSensor.java @@ -135,7 +135,7 @@ protected void doInit() throws SensorHubException { kinectDevice = kinectContext.openDevice(0); - generateUniqueID("urn:osh:sensor:kinect:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:kinect:", config.serialNumber); generateXmlID("KINECT_", config.serialNumber); diff --git a/sensors/video/sensorhub-driver-onvif/build.gradle b/sensors/video/sensorhub-driver-onvif/build.gradle index 94e239faa..9d236d39f 100644 --- a/sensors/video/sensorhub-driver-onvif/build.gradle +++ b/sensors/video/sensorhub-driver-onvif/build.gradle @@ -1,6 +1,6 @@ description = 'ONVIF Video Camera' ext.details = 'Driver for IP video cameras using the ONVIF standard' -version = '1.1.2' +version = '1.1.3' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraDriver.java b/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraDriver.java index 81c4a6f6a..46c0d92a7 100644 --- a/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraDriver.java +++ b/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraDriver.java @@ -414,7 +414,7 @@ else if (ex.getCause().getClass() == java.net.ConnectException.class) { streamId = "noVideo"; } - generateUniqueID("urn:onvif:cam:", serialNumber + (streamId != null ? (":" + streamId) : "")); + generateUniqueID("urn:osh:sensor:georobotix:onvif:cam:", serialNumber + (streamId != null ? (":" + streamId) : "")); generateXmlID("ONVIF_CAM_", serialNumber + (streamId != null ? (":" + streamId) : "")); // Add inputs/outputs for supported features diff --git a/sensors/video/sensorhub-driver-rtmp/build.gradle b/sensors/video/sensorhub-driver-rtmp/build.gradle index e0872f41d..236fc4cf6 100644 --- a/sensors/video/sensorhub-driver-rtmp/build.gradle +++ b/sensors/video/sensorhub-driver-rtmp/build.gradle @@ -1,6 +1,6 @@ description = 'RTMP Video Driver' ext.details = 'Driver to listen for and demux RTMP video streams' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-rtmp/src/main/java/org/sensorhub/impl/sensor/rtmp/RtmpDriver.java b/sensors/video/sensorhub-driver-rtmp/src/main/java/org/sensorhub/impl/sensor/rtmp/RtmpDriver.java index f28a7f409..f7c844c88 100644 --- a/sensors/video/sensorhub-driver-rtmp/src/main/java/org/sensorhub/impl/sensor/rtmp/RtmpDriver.java +++ b/sensors/video/sensorhub-driver-rtmp/src/main/java/org/sensorhub/impl/sensor/rtmp/RtmpDriver.java @@ -90,7 +90,7 @@ protected void doInit() throws SensorHubException { super.doInit(); if (getUniqueIdentifier() == null) { - generateUniqueID("urn:osh:sensor:rtmp:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:rtmp:", config.serialNumber); generateXmlID("RTMP_", config.serialNumber); } diff --git a/sensors/video/sensorhub-driver-rtpcam/build.gradle b/sensors/video/sensorhub-driver-rtpcam/build.gradle index b62c03ddc..5ebd1f58c 100644 --- a/sensors/video/sensorhub-driver-rtpcam/build.gradle +++ b/sensors/video/sensorhub-driver-rtpcam/build.gradle @@ -1,6 +1,6 @@ description = 'RTSP/RTP Camera Driver' ext.details = 'Sensor driver for IP cameras streaming H264 video through RTSP/RTP' -version = '1.0.1' +version = '1.0.2' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-rtpcam/src/main/java/org/sensorhub/impl/sensor/rtpcam/RTPCameraDriver.java b/sensors/video/sensorhub-driver-rtpcam/src/main/java/org/sensorhub/impl/sensor/rtpcam/RTPCameraDriver.java index b85250739..ecaa74ea1 100644 --- a/sensors/video/sensorhub-driver-rtpcam/src/main/java/org/sensorhub/impl/sensor/rtpcam/RTPCameraDriver.java +++ b/sensors/video/sensorhub-driver-rtpcam/src/main/java/org/sensorhub/impl/sensor/rtpcam/RTPCameraDriver.java @@ -48,7 +48,7 @@ protected void doInit() throws SensorHubException dataInterface = null; // generate identifiers - generateUniqueID("urn:osh:sensor:rtpcam:", config.cameraID); + generateUniqueID("urn:osh:sensor:georobotix:rtpcam:", config.cameraID); generateXmlID("RTP_CAM_", config.cameraID); // create connection handler diff --git a/sensors/video/sensorhub-driver-sony-vb600/build.gradle b/sensors/video/sensorhub-driver-sony-vb600/build.gradle index 8bbac0a61..1810d1a70 100644 --- a/sensors/video/sensorhub-driver-sony-vb600/build.gradle +++ b/sensors/video/sensorhub-driver-sony-vb600/build.gradle @@ -1,6 +1,6 @@ description = "Sony SNC-VB600 Driver" ext.details = "Driver for connecting to the Sony Network Camera VB600." -version = "1.0.0" +version = "1.0.1" // To build in entire java cv platform of projects use // implementation("org.bytedeco:javacv-platform:1.5.2") diff --git a/sensors/video/sensorhub-driver-sony-vb600/src/main/java/org/sensorhub/impl/sensor/sony/vb600/VB600Driver.java b/sensors/video/sensorhub-driver-sony-vb600/src/main/java/org/sensorhub/impl/sensor/sony/vb600/VB600Driver.java index 1d3c7d9bd..ac6b39679 100644 --- a/sensors/video/sensorhub-driver-sony-vb600/src/main/java/org/sensorhub/impl/sensor/sony/vb600/VB600Driver.java +++ b/sensors/video/sensorhub-driver-sony-vb600/src/main/java/org/sensorhub/impl/sensor/sony/vb600/VB600Driver.java @@ -40,7 +40,7 @@ public class VB600Driver extends AbstractSensorModule { protected void doInit() throws SensorHubException { super.doInit(); - generateUniqueID("urn:osh:sensor:sony:vb600:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:sony:vb600:", config.serialNumber); generateXmlID("SONY_VB600_", config.serialNumber); if (visualMpegTsProcessor != null) diff --git a/sensors/video/sensorhub-driver-v4l/build.gradle b/sensors/video/sensorhub-driver-v4l/build.gradle index 019266ef5..f7300a813 100644 --- a/sensors/video/sensorhub-driver-v4l/build.gradle +++ b/sensors/video/sensorhub-driver-v4l/build.gradle @@ -1,6 +1,6 @@ description = 'Video4Linux Camera' ext.details = 'Driver for Video4Linux compatible cameras (only supported on Linux)' -version = '1.1.0' +version = '1.1.1' def thisProjectDir = projectDir rootProject.allprojects { diff --git a/sensors/video/sensorhub-driver-v4l/src/main/java/org/sensorhub/impl/sensor/v4l/V4LCameraDriver.java b/sensors/video/sensorhub-driver-v4l/src/main/java/org/sensorhub/impl/sensor/v4l/V4LCameraDriver.java index efe5f62b4..4d9d3bd55 100644 --- a/sensors/video/sensorhub-driver-v4l/src/main/java/org/sensorhub/impl/sensor/v4l/V4LCameraDriver.java +++ b/sensors/video/sensorhub-driver-v4l/src/main/java/org/sensorhub/impl/sensor/v4l/V4LCameraDriver.java @@ -67,7 +67,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - generateUniqueID("urn:osh:sensor:v4l-cam:", config.serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:v4l-cam:", config.serialNumber); generateXmlID("V4L_CAMERA_", config.serialNumber); this.camParams = config.defaultParams.clone(); diff --git a/sensors/video/sensorhub-driver-virb-xe/build.gradle b/sensors/video/sensorhub-driver-virb-xe/build.gradle index 96f03f67f..9767568b5 100644 --- a/sensors/video/sensorhub-driver-virb-xe/build.gradle +++ b/sensors/video/sensorhub-driver-virb-xe/build.gradle @@ -1,6 +1,6 @@ description = 'Garmin VIRB-XE Camera' ext.details = 'Driver for Garmin VIRB-XE camera which includes GPS, orientation and ANT+ external sensors' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/video/sensorhub-driver-virb-xe/src/main/java/org/sensorhub/impl/sensor/virbxe/VirbXeDriver.java b/sensors/video/sensorhub-driver-virb-xe/src/main/java/org/sensorhub/impl/sensor/virbxe/VirbXeDriver.java index 9f5d9f127..99f49920c 100644 --- a/sensors/video/sensorhub-driver-virb-xe/src/main/java/org/sensorhub/impl/sensor/virbxe/VirbXeDriver.java +++ b/sensors/video/sensorhub-driver-virb-xe/src/main/java/org/sensorhub/impl/sensor/virbxe/VirbXeDriver.java @@ -150,7 +150,7 @@ public boolean tryConnect() throws IOException connection.waitForConnection(); // generate identifiers - generateUniqueID("urn:garmin:cam:", serialNumber); + generateUniqueID("urn:osh:sensor:georobotix:garmin:cam:", serialNumber); generateXmlID("GARMIN_VIRB_XE_", serialNumber); // create I/O objects diff --git a/sensors/weather/sensorhub-driver-httpweather/build.gradle b/sensors/weather/sensorhub-driver-httpweather/build.gradle index a47edff44..e1ddb6b42 100644 --- a/sensors/weather/sensorhub-driver-httpweather/build.gradle +++ b/sensors/weather/sensorhub-driver-httpweather/build.gradle @@ -1,7 +1,7 @@ group = 'uk.co.envsys' description = 'Generic HTTP Weather Driver' ext.details = 'Provides HTTP endpoint for weather stations to push measurements to' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-httpweather/src/main/java/uk/co/envsys/sensorhub/sensor/httpweather/HttpWeatherSensor.java b/sensors/weather/sensorhub-driver-httpweather/src/main/java/uk/co/envsys/sensorhub/sensor/httpweather/HttpWeatherSensor.java index 765ce2abf..88717c35a 100644 --- a/sensors/weather/sensorhub-driver-httpweather/src/main/java/uk/co/envsys/sensorhub/sensor/httpweather/HttpWeatherSensor.java +++ b/sensors/weather/sensorhub-driver-httpweather/src/main/java/uk/co/envsys/sensorhub/sensor/httpweather/HttpWeatherSensor.java @@ -13,7 +13,7 @@ import net.opengis.gml.v32.impl.GMLFactory; public class HttpWeatherSensor extends AbstractSensorModule { - private static final String UID_PREFIX = "urn:envsys:sensors:httpweather:"; + private static final String UID_PREFIX = "urn:osh:sensor:georobotix:envsys:httpweather:"; private static final String SENSOR_DESCRIPTION = "Provides HTTP endpoint on which it can receive weather data"; private boolean serverRunning; private HttpWeatherOutput dataInterface; diff --git a/sensors/weather/sensorhub-driver-kestrel/build.gradle b/sensors/weather/sensorhub-driver-kestrel/build.gradle index 59f59cadf..32817d71c 100644 --- a/sensors/weather/sensorhub-driver-kestrel/build.gradle +++ b/sensors/weather/sensorhub-driver-kestrel/build.gradle @@ -1,7 +1,7 @@ description = 'Kestrel Weather' ext.details = '' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-kestrel/src/main/java/org/sensorhub/impl/sensor/kestrel/Kestrel.java b/sensors/weather/sensorhub-driver-kestrel/src/main/java/org/sensorhub/impl/sensor/kestrel/Kestrel.java index f8aff903e..3045885d6 100644 --- a/sensors/weather/sensorhub-driver-kestrel/src/main/java/org/sensorhub/impl/sensor/kestrel/Kestrel.java +++ b/sensors/weather/sensorhub-driver-kestrel/src/main/java/org/sensorhub/impl/sensor/kestrel/Kestrel.java @@ -63,7 +63,7 @@ protected void doInit() throws SensorHubException { super.doInit(); // generate IDs - generateUniqueID("urn:osh:sensor:kestrel:", config.deviceAddress); + generateUniqueID("urn:osh:sensor:georobotix:kestrel:", config.deviceAddress); generateXmlID("KESTREL_WEATHER_", config.deviceAddress); // create output interfaces diff --git a/sensors/weather/sensorhub-driver-metar/build.gradle b/sensors/weather/sensorhub-driver-metar/build.gradle index 0f941247f..5be960f94 100644 --- a/sensors/weather/sensorhub-driver-metar/build.gradle +++ b/sensors/weather/sensorhub-driver-metar/build.gradle @@ -1,6 +1,6 @@ description = 'METAR Weather Sensor Network' ext.details = 'Driver for METAR weather station network through Anything Weather server' -version = '1.0.0' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/StationSensor.java b/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/StationSensor.java index 508404a32..a76865881 100644 --- a/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/StationSensor.java +++ b/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/StationSensor.java @@ -42,7 +42,7 @@ protected void doInit() throws SensorHubException super.doInit(); // generate IDs - this.uniqueID = "urn:osh:sensor:metar:network"; + this.uniqueID = "urn:osh:sensor:georobotix:metar:network"; this.xmlID = "METAR_NETWORK"; dataInterface = new StationOutput(this); diff --git a/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/metar/MetarSensor.java b/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/metar/MetarSensor.java index 050fc0d5e..3bd92a2df 100644 --- a/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/metar/MetarSensor.java +++ b/sensors/weather/sensorhub-driver-metar/src/main/java/org/sensorhub/impl/sensor/station/metar/MetarSensor.java @@ -16,7 +16,7 @@ public class MetarSensor extends AbstractSensorModule { static final Logger log = LoggerFactory.getLogger(MetarSensor.class); - static final String SENSOR_UID_PREFIX = "urn:osh:sensor:metar:"; + static final String SENSOR_UID_PREFIX = "urn:osh:sensor:georobotix:metar:"; static final String STATION_UID_PREFIX = SENSOR_UID_PREFIX + "station:"; MetarOutput metarInterface; diff --git a/sensors/weather/sensorhub-driver-meteobridge/build.gradle b/sensors/weather/sensorhub-driver-meteobridge/build.gradle index b10a9f5de..058fe18ba 100644 --- a/sensors/weather/sensorhub-driver-meteobridge/build.gradle +++ b/sensors/weather/sensorhub-driver-meteobridge/build.gradle @@ -1,7 +1,7 @@ group = 'uk.co.envsys' description = 'MeteoBridge Sensor' ext.details = 'Sensor driver for the MeteoBridge weather gateway' -version = '0.1-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-meteobridge/src/main/java/uk/co/envsys/sensorhub/sensor/meteobridge/MeteobridgeSensor.java b/sensors/weather/sensorhub-driver-meteobridge/src/main/java/uk/co/envsys/sensorhub/sensor/meteobridge/MeteobridgeSensor.java index 127ba4cac..4134f36cb 100644 --- a/sensors/weather/sensorhub-driver-meteobridge/src/main/java/uk/co/envsys/sensorhub/sensor/meteobridge/MeteobridgeSensor.java +++ b/sensors/weather/sensorhub-driver-meteobridge/src/main/java/uk/co/envsys/sensorhub/sensor/meteobridge/MeteobridgeSensor.java @@ -5,7 +5,7 @@ public class MeteobridgeSensor extends AbstractSensorModule{ - private static final String UID_PREFIX = "urn:envsys:sensors:meteobridge:"; + private static final String UID_PREFIX = "urn:osh:sensor:georobotix:envsys:meteobridge:"; private boolean connected; private MeteobridgeOutput dataInterface; diff --git a/sensors/weather/sensorhub-driver-nexrad/build.gradle b/sensors/weather/sensorhub-driver-nexrad/build.gradle index a6a59621c..e9366f056 100644 --- a/sensors/weather/sensorhub-driver-nexrad/build.gradle +++ b/sensors/weather/sensorhub-driver-nexrad/build.gradle @@ -1,6 +1,6 @@ description = 'Nexrad Doppler Radar Network' ext.details = 'Driver for Nexrad Doppler radars, supporting both Level II and Level III products' -version = '1.0.0-SNAPSHOT' +version = '1.0.1' rootProject.allprojects { repositories { diff --git a/sensors/weather/sensorhub-driver-nexrad/src/main/java/org/sensorhub/impl/sensor/nexrad/NexradSensor.java b/sensors/weather/sensorhub-driver-nexrad/src/main/java/org/sensorhub/impl/sensor/nexrad/NexradSensor.java index 078166a82..25b07e373 100644 --- a/sensors/weather/sensorhub-driver-nexrad/src/main/java/org/sensorhub/impl/sensor/nexrad/NexradSensor.java +++ b/sensors/weather/sensorhub-driver-nexrad/src/main/java/org/sensorhub/impl/sensor/nexrad/NexradSensor.java @@ -41,7 +41,7 @@ public class NexradSensor extends AbstractSensorModule { static final Logger logger = LoggerFactory.getLogger(NexradSensor.class); - static final String SITE_UID_PREFIX = "urn:osh:sensors:nexrad:"; + static final String SITE_UID_PREFIX = "urn:osh:sensor:georobotix:nexrad:"; NexradOutput dataInterface; RadialProvider radialProvider; // either Realtime or archive AWS source diff --git a/sensors/weather/sensorhub-driver-storm/build.gradle b/sensors/weather/sensorhub-driver-storm/build.gradle index 79e569552..db95bd1c6 100644 --- a/sensors/weather/sensorhub-driver-storm/build.gradle +++ b/sensors/weather/sensorhub-driver-storm/build.gradle @@ -1,6 +1,6 @@ description = 'Gridded Storm Weather Datasets' ext.details = 'Adaptor for gridded datasets of extreme weather events as lightning and hail' -version = '0.5.0' +version = '0.5.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/mesh/MeshSensor.java b/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/mesh/MeshSensor.java index 67ccb2c28..1af6656e3 100644 --- a/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/mesh/MeshSensor.java +++ b/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/mesh/MeshSensor.java @@ -44,7 +44,7 @@ protected void doInit() throws SensorHubException super.doInit(); // IDs - this.uniqueID = "urn:osh:sensor:mrms:mesh"; + this.uniqueID = "urn:osh:sensor:georobotix:mrms:mesh"; this.xmlID = "MRMS_MESH"; // initialize outputs diff --git a/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/nldn/NldnSensor.java b/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/nldn/NldnSensor.java index 1984d7e01..0c79ffdd9 100644 --- a/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/nldn/NldnSensor.java +++ b/sensors/weather/sensorhub-driver-storm/src/main/java/org/sensorhub/impl/sensor/nldn/NldnSensor.java @@ -43,7 +43,7 @@ protected void doInit() throws SensorHubException { super.doInit(); - this.uniqueID = "urn:osh:sensor:mrms:nldn"; + this.uniqueID = "urn:osh:sensor:georobotix:mrms:nldn"; this.xmlID = "MRMS_NLDN"; // initialize outputs diff --git a/sensors/weather/sensorhub-driver-uahweather/build.gradle b/sensors/weather/sensorhub-driver-uahweather/build.gradle index d70aac080..f815d1e7c 100644 --- a/sensors/weather/sensorhub-driver-uahweather/build.gradle +++ b/sensors/weather/sensorhub-driver-uahweather/build.gradle @@ -1,6 +1,6 @@ description = 'UAH Weather Station' ext.details = 'Driver for UAH home weather station' -version = '0.1.0-SNAPSHOT' +version = '0.1.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-uahweather/src/main/java/org/sensorhub/impl/sensor/uahweather/UAHweatherSensor.java b/sensors/weather/sensorhub-driver-uahweather/src/main/java/org/sensorhub/impl/sensor/uahweather/UAHweatherSensor.java index 0b438b971..e4ef9147e 100644 --- a/sensors/weather/sensorhub-driver-uahweather/src/main/java/org/sensorhub/impl/sensor/uahweather/UAHweatherSensor.java +++ b/sensors/weather/sensorhub-driver-uahweather/src/main/java/org/sensorhub/impl/sensor/uahweather/UAHweatherSensor.java @@ -64,7 +64,7 @@ protected void doInit() throws SensorHubException // add unique ID based on serial number - this.uniqueID = "urn:uahweather:" + config.modelNumber + ":" + config.serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:uahweather:" + config.modelNumber + ":" + config.serialNumber; this.xmlID = "UAHWEATHER_" + config.modelNumber + "_" + config.serialNumber.toUpperCase(); // create data interfaces diff --git a/sensors/weather/sensorhub-driver-vaisala/build.gradle b/sensors/weather/sensorhub-driver-vaisala/build.gradle index f2e34fe78..a31620181 100644 --- a/sensors/weather/sensorhub-driver-vaisala/build.gradle +++ b/sensors/weather/sensorhub-driver-vaisala/build.gradle @@ -1,6 +1,6 @@ description = 'Vaisala Weather Station' ext.details = 'Driver for Vaisala WXT520 Weather Transmitter' -version = '1.0.0-SNAPSHOT' +version = '1.0.1' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion diff --git a/sensors/weather/sensorhub-driver-vaisala/src/main/java/org/sensorhub/impl/sensor/vaisala/VaisalaWeatherSensor.java b/sensors/weather/sensorhub-driver-vaisala/src/main/java/org/sensorhub/impl/sensor/vaisala/VaisalaWeatherSensor.java index 107541074..6433e7e39 100644 --- a/sensors/weather/sensorhub-driver-vaisala/src/main/java/org/sensorhub/impl/sensor/vaisala/VaisalaWeatherSensor.java +++ b/sensors/weather/sensorhub-driver-vaisala/src/main/java/org/sensorhub/impl/sensor/vaisala/VaisalaWeatherSensor.java @@ -387,7 +387,7 @@ protected void doInit() throws SensorHubException serialNumber = config.id.substring(0, endIndex); } // add unique ID based on serial number - this.uniqueID = "urn:vaisala:" + modelNumber + ":" + serialNumber; + this.uniqueID = "urn:osh:sensor:georobotix:vaisala:" + modelNumber + ":" + serialNumber; this.xmlID = "VAISALA_" + modelNumber + "_" + serialNumber.toUpperCase(); // execute initializations in each output class diff --git a/services/sensorhub-service-sensorthings/build.gradle b/services/sensorhub-service-sensorthings/build.gradle index a9828e9f8..e1376aa7a 100644 --- a/services/sensorhub-service-sensorthings/build.gradle +++ b/services/sensorhub-service-sensorthings/build.gradle @@ -1,6 +1,6 @@ description = 'SensorThings API' ext.details = 'Implementation of OGC SensorThing API based on FROST server' -version = '0.1.0' +version = '0.1.1' def thisProjectDir = projectDir diff --git a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java index 38e7e8945..f82dd0e52 100644 --- a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java +++ b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java @@ -52,7 +52,7 @@ public class STAService extends AbstractHttpServiceModule impl { static final String SERVICE_INSTANCE_ID = "oshServiceId"; static final HashMap serviceInstances = new HashMap<>(); // static map needed to get access to service from persistence manager - static final String DEFAULT_GROUP_UID = "urn:osh:sta:group"; + static final String DEFAULT_GROUP_UID = "urn:osh:sensor:georobotix:sta:group"; static final long HUB_THING_ID = 1; IObsSystemDatabase readDatabase; diff --git a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java index 4a53c0fff..5d783b495 100644 --- a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java +++ b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java @@ -43,7 +43,7 @@ public static class HubThingInfo @DisplayInfo(label="UID Prefix", desc="Prefix to use for Things, Sensors and FOIs UIDs") - public String uidPrefix = "urn:osh:sta:"; + public String uidPrefix = "urn:osh:sensor:georobotix:sta:"; @DisplayInfo(desc="Metadata of system group that will be created to contain all sensors " diff --git a/services/sensorhub-service-video/build.gradle b/services/sensorhub-service-video/build.gradle index c032ec138..2d7ba53ff 100644 --- a/services/sensorhub-service-video/build.gradle +++ b/services/sensorhub-service-video/build.gradle @@ -1,6 +1,6 @@ description = 'Service Extensions for Video' ext.details = 'OGC web service and API extensions for supporting video' -version = '1.3.0' +version = '1.3.1' dependencies { diff --git a/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java b/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java index 9115f5a00..8b0f89060 100644 --- a/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java +++ b/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java @@ -122,7 +122,7 @@ protected static List extractImages(Document ttml) throws XPathExpressio String internalName = internalNames2Original.get(uri); if (internalName == null) { - internalName = "urn:mp4parser:" + p++ + ext; + internalName = "urn:osh:sensor:georobotix:mp4parser:" + p++ + ext; internalNames2Original.put(internalName, uri); } bgImageNode.setNodeValue(internalName); From a096cc70ac7041663a86835edbbdb26f9308cdbb Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Wed, 15 Jul 2026 08:42:57 -0400 Subject: [PATCH 2/9] Undo bump version --- sensors/others/sensorhub-utils-datafiles/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors/others/sensorhub-utils-datafiles/build.gradle b/sensors/others/sensorhub-utils-datafiles/build.gradle index adade65b7..87d157350 100644 --- a/sensors/others/sensorhub-utils-datafiles/build.gradle +++ b/sensors/others/sensorhub-utils-datafiles/build.gradle @@ -1,6 +1,6 @@ description = 'Data Files Utils' ext.details = 'Common utility classes for handling data files' -version = '0.1.1' +version = '0.1.0' dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion From 8092ef0f5629aaae315674c9f0d1bee787eceec4 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Wed, 15 Jul 2026 08:49:13 -0400 Subject: [PATCH 3/9] Change urn to be sensor type --- .../java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java b/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java index 981d18fa0..7ce500524 100644 --- a/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java +++ b/sensors/positioning/sensorhub-driver-bno085/src/main/java/org/sensorhub/impl/sensor/BNO085/Bno085Sensor.java @@ -37,7 +37,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class Bno085Sensor extends AbstractSensorModule implements Runnable { - static final String UID_PREFIX = "urn:osh:system:georobotix:bno085:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:bno085:"; static final String XML_PREFIX = "BNO085"; private static final Logger logger = LoggerFactory.getLogger(Bno085Sensor.class); From b1fd14e012b9678d15d56b7fd63a88e15c3658e7 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Wed, 15 Jul 2026 08:50:39 -0400 Subject: [PATCH 4/9] Change urn to be sensor type --- .../sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java index 8d9d0a335..59999099b 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java @@ -39,7 +39,7 @@ * and performing initialization and shutdown for the driver and its outputs. */ public class notecardGPSSensor extends AbstractSensorModule implements Runnable { - static final String UID_PREFIX = "urn:osh:system:georobotix:notecardGPS:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:notecardGPS:"; static final String XML_PREFIX = "notecardGPS"; private static final Logger logger = LoggerFactory.getLogger(notecardGPSSensor.class); From ab7748c19967f8711b95a998cfd2b327a9b7e770 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 23 Jul 2026 12:30:23 -0400 Subject: [PATCH 5/9] Updated URNS to be all lowercase and java classes to start with uppercase. --- .../impl/sensor/notecardGPS/Descriptor.java | 2 +- ...sI2C.java => NotecardGPSConstantsI2C.java} | 2 +- ...dGPSSensor.java => NotecardGPSSensor.java} | 36 +++++++++---------- ...SGControl.java => NotecardMSGControl.java} | 4 +-- .../sensor/notecardGPS/config/Config.java | 7 ++-- ...oteCardConfig.java => NoteCardConfig.java} | 2 +- .../outputs/notecardGPSOutput.java | 9 +++-- .../impl/sensor/notecardGPS/SensorTest.java | 2 +- .../impl/sensor/notecardGPS/TestBase.java | 4 +-- 9 files changed, 33 insertions(+), 35 deletions(-) rename sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/{notecardGPSConstantsI2C.java => NotecardGPSConstantsI2C.java} (98%) rename sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/{notecardGPSSensor.java => NotecardGPSSensor.java} (92%) rename sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/{notecardMSGControl.java => NotecardMSGControl.java} (94%) rename sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/{noteCardConfig.java => NoteCardConfig.java} (97%) diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/Descriptor.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/Descriptor.java index 24a189435..d078b4299 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/Descriptor.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/Descriptor.java @@ -28,7 +28,7 @@ public class Descriptor extends JarModuleProvider implements IModuleProvider { */ @Override public Class> getModuleClass() { - return notecardGPSSensor.class; + return NotecardGPSSensor.class; } /** diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSConstantsI2C.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSConstantsI2C.java similarity index 98% rename from sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSConstantsI2C.java rename to sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSConstantsI2C.java index e87ca5409..41901118d 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSConstantsI2C.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSConstantsI2C.java @@ -1,6 +1,6 @@ package org.sensorhub.impl.sensor.notecardGPS; -public class notecardGPSConstantsI2C { +public class NotecardGPSConstantsI2C { public final static String SENSOR_NAME = "notecardGPS"; public final static int I2C_BUS = 1; diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSSensor.java similarity index 92% rename from sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java rename to sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSSensor.java index 59999099b..21e00acef 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardGPSSensor.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardGPSSensor.java @@ -38,11 +38,11 @@ * This class is responsible for providing sensor information, managing output registration, * and performing initialization and shutdown for the driver and its outputs. */ -public class notecardGPSSensor extends AbstractSensorModule implements Runnable { - static final String UID_PREFIX = "urn:osh:sensor:georobotix:notecardGPS:"; - static final String XML_PREFIX = "notecardGPS"; +public class NotecardGPSSensor extends AbstractSensorModule implements Runnable { + static final String UID_PREFIX = "urn:osh:sensor:georobotix:notecardgps:"; + static final String XML_PREFIX = "notecardgps"; - private static final Logger logger = LoggerFactory.getLogger(notecardGPSSensor.class); + private static final Logger logger = LoggerFactory.getLogger(NotecardGPSSensor.class); /// REQUIRED VARIABLES FOR SENSOR OPERATION // I2C Initialization Variables from Pi4j @@ -52,7 +52,7 @@ public class notecardGPSSensor extends AbstractSensorModule implements R // Class Variables to handle output operations during the sensor's primary readSensor() method notecardGPSOutput notecardGPSOutput; - notecardMSGControl notecardMSGControl; + NotecardMSGControl notecardMSGControl; // Local variables private volatile boolean keepRunning = false; @@ -80,7 +80,7 @@ public void doInit() throws SensorHubException { notecardGPSOutput.doInit(); // Initialize Control - notecardMSGControl = new notecardMSGControl(this); + notecardMSGControl = new NotecardMSGControl(this); addControlInput(notecardMSGControl); notecardMSGControl.doInit(); @@ -101,10 +101,10 @@ public void doStart() throws SensorHubException { // CONFIGURE THE NOTECARD Transaction(HubSet); - Transaction(notecardGPSConstantsI2C.ENABLE_ACCELEROMETER); - Transaction(notecardGPSConstantsI2C.TURNON_TRIANGLULATION); - Transaction(notecardGPSConstantsI2C.DISABLE_GPS); - Transaction(notecardGPSConstantsI2C.SET_LOCATION_CONT); + Transaction(NotecardGPSConstantsI2C.ENABLE_ACCELEROMETER); + Transaction(NotecardGPSConstantsI2C.TURNON_TRIANGLULATION); + Transaction(NotecardGPSConstantsI2C.DISABLE_GPS); + Transaction(NotecardGPSConstantsI2C.SET_LOCATION_CONT); keepRunning = true; Thread readNoteCardworker = new Thread(this, "Notecard Worker"); @@ -115,7 +115,7 @@ public void doStart() throws SensorHubException { public void run() { while (keepRunning){ try { - Transaction(notecardGPSConstantsI2C.GET_LOC); + Transaction(NotecardGPSConstantsI2C.GET_LOC); Thread.sleep(config.NCconfig.gpsSampleRate * 1000L); } catch (InterruptedException e) { throw new RuntimeException(e); @@ -128,11 +128,11 @@ public void doStop() throws SensorHubException { super.doStop(); keepRunning = false; - Transaction(notecardGPSConstantsI2C.HUB_SYNC); - Transaction(notecardGPSConstantsI2C.HUBSET_OFF); - Transaction(notecardGPSConstantsI2C.DISABLE_ACCELEROMETER); - Transaction(notecardGPSConstantsI2C.TURNOFF_TRIANGLULATION); - Transaction(notecardGPSConstantsI2C.DISABLE_GPS); + Transaction(NotecardGPSConstantsI2C.HUB_SYNC); + Transaction(NotecardGPSConstantsI2C.HUBSET_OFF); + Transaction(NotecardGPSConstantsI2C.DISABLE_ACCELEROMETER); + Transaction(NotecardGPSConstantsI2C.TURNOFF_TRIANGLULATION); + Transaction(NotecardGPSConstantsI2C.DISABLE_GPS); } @Override @@ -207,7 +207,7 @@ public void readNotecard(String prevReq) { String json = convertSignedBytesToJson(jsonBytes); /// IF REQUEST IS CARD.LOCATION, THEN GATHER DATA FOR OUTPUT - if(notecardGPSConstantsI2C.GET_LOC.equals(prevReq)){ + if(NotecardGPSConstantsI2C.GET_LOC.equals(prevReq)){ // Convert JSON to Object and Send Output Gson gson = new Gson(); GPSmsg gpsmsg = gson.fromJson(json,GPSmsg.class); @@ -267,7 +267,7 @@ public void resetNotecard(){ if(viewInTerminal){ System.out.println("Resetting Sensor...preparing to temporarily lose I²C connection"); } - Transaction(notecardGPSConstantsI2C.RESTORE); + Transaction(NotecardGPSConstantsI2C.RESTORE); // When using RESTORE, Notecard will temporarily lose connection, poll I²C until connection is lost while(true){ try { diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardMSGControl.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardMSGControl.java similarity index 94% rename from sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardMSGControl.java rename to sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardMSGControl.java index 7122d9038..9bc0b33bd 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/notecardMSGControl.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/NotecardMSGControl.java @@ -8,12 +8,12 @@ import org.sensorhub.impl.sensor.AbstractSensorControl; import org.vast.swe.SWEHelper; -public class notecardMSGControl extends AbstractSensorControl { +public class NotecardMSGControl extends AbstractSensorControl { private DataRecord commandDataStruct; // CONSTRUCTOR - public notecardMSGControl( notecardGPSSensor notecardGPSSensor) { + public NotecardMSGControl(NotecardGPSSensor notecardGPSSensor) { super("Blues Notecard Message Control", notecardGPSSensor); } diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/Config.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/Config.java index acede1fff..23d689095 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/Config.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/Config.java @@ -11,13 +11,12 @@ ******************************* END LICENSE BLOCK ***************************/ package org.sensorhub.impl.sensor.notecardGPS.config; -import org.sensorhub.impl.sensor.notecardGPS.notecardGPSSensor; +import org.sensorhub.impl.sensor.notecardGPS.NotecardGPSSensor; import org.sensorhub.api.config.DisplayInfo; -import org.sensorhub.api.config.DisplayInfo.FieldType.Type; import org.sensorhub.api.sensor.SensorConfig; /** - * Configuration settings for the {@link notecardGPSSensor} driver exposed via the OpenSensorHub Admin panel. + * Configuration settings for the {@link NotecardGPSSensor} driver exposed via the OpenSensorHub Admin panel. *

* Public fields are exposed in the Admin panel for configuration by the user. * These fields can be annotated with the DisplayInfo annotation to provide additional information to the user @@ -39,7 +38,7 @@ public class Config extends SensorConfig { @DisplayInfo.Required @DisplayInfo(label = "Notecard Settings", desc = "Configuration options for the Notecard") - public noteCardConfig NCconfig = new noteCardConfig(); + public NoteCardConfig NCconfig = new NoteCardConfig(); @DisplayInfo.Required @DisplayInfo(label = "I²C Settings", desc = "Configuration options for the I2C Connection") diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/noteCardConfig.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/NoteCardConfig.java similarity index 97% rename from sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/noteCardConfig.java rename to sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/NoteCardConfig.java index 3de003c79..57f36b94f 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/noteCardConfig.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/config/NoteCardConfig.java @@ -9,7 +9,7 @@ @since June 9, 2025 */ -public class noteCardConfig { +public class NoteCardConfig { @DisplayInfo.Required @DisplayInfo(label="NoteHub Product UID", desc="Provide the Product UID associated with your NoteHub.io Project") public String NHproductUID = "com.botts-inc.bill.brown:gps"; diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/outputs/notecardGPSOutput.java b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/outputs/notecardGPSOutput.java index a01327980..e5de02efd 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/outputs/notecardGPSOutput.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/main/java/org/sensorhub/impl/sensor/notecardGPS/outputs/notecardGPSOutput.java @@ -11,7 +11,7 @@ ******************************* END LICENSE BLOCK ***************************/ package org.sensorhub.impl.sensor.notecardGPS.outputs; -import org.sensorhub.impl.sensor.notecardGPS.notecardGPSSensor; +import org.sensorhub.impl.sensor.notecardGPS.NotecardGPSSensor; import net.opengis.swe.v20.DataBlock; import net.opengis.swe.v20.DataComponent; import net.opengis.swe.v20.DataEncoding; @@ -21,7 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.vast.swe.SWEBuilders; -import org.vast.swe.SWEConstants; import org.vast.swe.SWEHelper; import org.vast.swe.helper.GeoPosHelper; @@ -31,9 +30,9 @@ /** - * Output specification and provider for {@link notecardGPSSensor}. + * Output specification and provider for {@link NotecardGPSSensor}. */ -public class notecardGPSOutput extends AbstractSensorOutput { +public class notecardGPSOutput extends AbstractSensorOutput { static final String SENSOR_OUTPUT_NAME = "NotecardGPS"; static final String SENSOR_OUTPUT_LABEL = "GPS"; static final String SENSOR_OUTPUT_DESCRIPTION = "This is the output for the GPS module on the Blues Notecard"; @@ -56,7 +55,7 @@ public class notecardGPSOutput extends AbstractSensorOutput { * * @param parentSensor Sensor driver providing this output. */ - public notecardGPSOutput(notecardGPSSensor parentSensor) { + public notecardGPSOutput(NotecardGPSSensor parentSensor) { super(SENSOR_OUTPUT_NAME, parentSensor); } diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/SensorTest.java b/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/SensorTest.java index 7a36f4f3a..a343fb994 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/SensorTest.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/SensorTest.java @@ -22,7 +22,7 @@ public void testSensor() { assertTrue(sensor.isStarted()); assertTrue(sensor.isConnected()); - assertEquals(notecardGPSSensor.UID_PREFIX + "123456789", sensor.getUniqueIdentifier()); + assertEquals(NotecardGPSSensor.UID_PREFIX + "123456789", sensor.getUniqueIdentifier()); assertEquals("Sensor Template", sensor.getName()); assertEquals("Description of the sensor", sensor.getDescription()); } diff --git a/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/TestBase.java b/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/TestBase.java index 5910c0f28..b7973fefc 100644 --- a/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/TestBase.java +++ b/sensors/positioning/sensorhub-driver-notecardgps/src/test/java/org/sensorhub/impl/sensor/notecardGPS/TestBase.java @@ -20,7 +20,7 @@ * Base class for unit tests which initializes the sensor before each test and cleans up after. */ public class TestBase { - notecardGPSSensor sensor; + NotecardGPSSensor sensor; AbstractSensorOutput output; @Before @@ -29,7 +29,7 @@ public void init() throws Exception { config.serialNumber = "123456789"; config.name = "Sensor Template"; config.description = "Description of the sensor"; - sensor = new notecardGPSSensor(); + sensor = new NotecardGPSSensor(); sensor.init(config); sensor.start(); // output = sensor.output; From 3e929454b5fe4911be5996460a54ec1f01e11164 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 23 Jul 2026 12:32:03 -0400 Subject: [PATCH 6/9] Change urn from system class to sensor class --- .../java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java b/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java index 27892237a..7c2571337 100644 --- a/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java +++ b/sensors/video/sensorhub-driver-foscam/src/main/java/org/sensorhub/impl/sensor/foscam/FoscamDriver.java @@ -38,7 +38,7 @@ Developer are Copyright (C) 2016 the Initial Developer. All Rights Reserved. */ public class FoscamDriver extends AbstractSensorModule { private static final Logger logger = LoggerFactory.getLogger(FoscamDriver.class); - static final String UID_PREFIX = "urn:osh:system:georobotix:foscam:"; + static final String UID_PREFIX = "urn:osh:sensor:georobotix:foscam:"; static final String XML_PREFIX = "foscam"; private FoscamPtzControl ptzControlInterface; From 67690eccf676981fd7a70e085b66e2cb386165b6 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 23 Jul 2026 12:45:32 -0400 Subject: [PATCH 7/9] Remove unused UID and change class of urns to data for STA objects --- .../main/java/org/sensorhub/impl/service/sta/STAService.java | 1 - .../java/org/sensorhub/impl/service/sta/STAServiceConfig.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java index f82dd0e52..88b34e859 100644 --- a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java +++ b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAService.java @@ -52,7 +52,6 @@ public class STAService extends AbstractHttpServiceModule impl { static final String SERVICE_INSTANCE_ID = "oshServiceId"; static final HashMap serviceInstances = new HashMap<>(); // static map needed to get access to service from persistence manager - static final String DEFAULT_GROUP_UID = "urn:osh:sensor:georobotix:sta:group"; static final long HUB_THING_ID = 1; IObsSystemDatabase readDatabase; diff --git a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java index 5d783b495..60aa28292 100644 --- a/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java +++ b/services/sensorhub-service-sensorthings/src/main/java/org/sensorhub/impl/service/sta/STAServiceConfig.java @@ -43,7 +43,7 @@ public static class HubThingInfo @DisplayInfo(label="UID Prefix", desc="Prefix to use for Things, Sensors and FOIs UIDs") - public String uidPrefix = "urn:osh:sensor:georobotix:sta:"; + public String uidPrefix = "urn:osh:data:georobotix:sta:"; @DisplayInfo(desc="Metadata of system group that will be created to contain all sensors " From 8c9ea53b4e03f4fbd6e5cb3dc436bb47233b4812 Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 23 Jul 2026 12:50:44 -0400 Subject: [PATCH 8/9] Reverted change as the URNs are not used as system or sensor identifiers --- .../java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java b/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java index 8b0f89060..9115f5a00 100644 --- a/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java +++ b/services/sensorhub-service-video/src/main/java/org/mp4parser/muxer/tracks/ttml/TtmlTrackImpl.java @@ -122,7 +122,7 @@ protected static List extractImages(Document ttml) throws XPathExpressio String internalName = internalNames2Original.get(uri); if (internalName == null) { - internalName = "urn:osh:sensor:georobotix:mp4parser:" + p++ + ext; + internalName = "urn:mp4parser:" + p++ + ext; internalNames2Original.put(internalName, uri); } bgImageNode.setNodeValue(internalName); From b8b98813ed9dc28f6cdaa5733128e61e67e7cedf Mon Sep 17 00:00:00 2001 From: Nick Garay Date: Thu, 20 Aug 2026 17:16:35 -0400 Subject: [PATCH 9/9] Fix import of STANAG Lib for OSGi Builds --- sensors/aviation/sensorhub-driver-misb-uas/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sensors/aviation/sensorhub-driver-misb-uas/build.gradle b/sensors/aviation/sensorhub-driver-misb-uas/build.gradle index d127e4875..273ca93c5 100644 --- a/sensors/aviation/sensorhub-driver-misb-uas/build.gradle +++ b/sensors/aviation/sensorhub-driver-misb-uas/build.gradle @@ -8,7 +8,9 @@ dependencies { implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion implementation project(':sensorhub-driver-videocam') implementation project(':sensorhub-process-ffmpeg') - implementation project(':sensorhub-lib-stanag4609') + embeddedImpl (project(':sensorhub-lib-stanag4609')) { + transitive = false + } testImplementation('junit:junit:4.13') testImplementation('org.jcodec:jcodec-javase:0.1.9') }