diff --git a/Makefile b/Makefile index d0583f425..396f18b05 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ yaml: ${TOOLSDIR}/vspec2yaml.py -I ./spec -o overlays/DIMO/dimo.vspec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$(VSS_VERSION).yaml csv: - ${TOOLSDIR}/vspec2csv.py -I ./spec -o overlays/DIMO/dimo.vspec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$(VSS_VERSION).csv + ${TOOLSDIR}/vspec2csv.py -I ./spec -vt overlays/DIMO/types.vspec -o overlays/DIMO/dimo.vspec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$(VSS_VERSION).csv ddsidl: ${TOOLSDIR}/vspec2ddsidl.py -I ./spec -o overlays/DIMO/dimo.vspec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$(VSS_VERSION).idl diff --git a/overlays/DIMO/dimo.vspec b/overlays/DIMO/dimo.vspec index 7e1ec618e..7df1b4e29 100644 --- a/overlays/DIMO/dimo.vspec +++ b/overlays/DIMO/dimo.vspec @@ -15,6 +15,10 @@ Vehicle.DIMO.Aftermarket: description: holds information about the aftermarket dimo device #include aftermarket.vspec Vehicle.DIMO.Aftermarket +Vehicle.CurrentLocation.Coordinates: + type: sensor + datatype: Types.DIMO.Coordinates + description: Current location of the vehicle in WGS 84 coordinates. Vehicle.DIMO.Subject: type: sensor diff --git a/overlays/DIMO/types.vspec b/overlays/DIMO/types.vspec new file mode 100644 index 000000000..f84add234 --- /dev/null +++ b/overlays/DIMO/types.vspec @@ -0,0 +1,34 @@ +Types: + type: branch + description: Type definitions + +Types.DIMO: + type: branch + description: DIMO-specific types + +Types.DIMO.Coordinates: + type: struct + description: A struct datatype representing GNSS position. + +Types.DIMO.Coordinates.Latitude: + datatype: double + type: property + min: -90 + max: 90 + unit: degrees + description: Latitude in WGS 84 coordinates. + +Types.DIMO.Coordinates.Longitude: + datatype: double + type: property + min: -180 + max: 180 + unit: degrees + description: Longitude in WGS 84 coordinates. + +Types.DIMO.Coordinates.HDOP: + datatype: double + type: property + min: 0 + unit: ratio + description: Horizontal dilution of position. May be zero if this was not measured.