feat: add support for Rsga devices

Added functionality for Rsga devices in the Mavlink helper and devices service. This includes methods to get Rsga device by ID and observe changes on Rsga devices. Also updated the project to use the upgraded Mavlink version 3.10.0 and target framework net8.0.
asv-soft · Jul 3, 2024 · bfe867a · bfe867a
1 parent 4a7a259
commit bfe867a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/src/.run/Linux-arm64.run.xml b/src/.run/Linux-arm64.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Linux-arm64" type="DotNetFolderPublish" factoryName="Publish to folder">
-    <riderPublish configuration="Release" delete_existing_files="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="linux-arm64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/linux-arm64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
+    <riderPublish configuration="Release" delete_existing_files="true" include_native_libs_for_self_extract="true" platform="Any CPU" produce_single_file="true" runtime="linux-arm64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/linux-arm64/app" target_framework="net8.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
     <method v="2" />
   </configuration>
 </component>
diff --git a/src/Asv.Drones.Gui.Api/CompatibilitySuppressions.xml b/src/Asv.Drones.Gui.Api/CompatibilitySuppressions.xml
@@ -2,15 +2,15 @@
 <!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
 <Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Suppression>
-    <DiagnosticId>CP0002</DiagnosticId>
-    <Target>M:Asv.Drones.Gui.Api.IMavlinkDevicesService.GetRfsaByFullId(System.UInt16)</Target>
+    <DiagnosticId>CP0006</DiagnosticId>
+    <Target>M:Asv.Drones.Gui.Api.IMavlinkDevicesService.GetRsgaByFullId(System.UInt16)</Target>
     <Left>lib/net8.0/Asv.Drones.Gui.Api.dll</Left>
     <Right>lib/net8.0/Asv.Drones.Gui.Api.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
   <Suppression>
     <DiagnosticId>CP0006</DiagnosticId>
-    <Target>M:Asv.Drones.Gui.Api.IMavlinkDevicesService.GetRfsaByFullId(System.UInt16)</Target>
+    <Target>P:Asv.Drones.Gui.Api.IMavlinkDevicesService.RsgaDevices</Target>
     <Left>lib/net8.0/Asv.Drones.Gui.Api.dll</Left>
     <Right>lib/net8.0/Asv.Drones.Gui.Api.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>

diff --git a/src/Asv.Drones.Gui.Api/Services/Mavlink/IMavlinkDevicesService.cs b/src/Asv.Drones.Gui.Api/Services/Mavlink/IMavlinkDevicesService.cs
@@ -62,5 +62,8 @@ public interface IMavlinkDevicesService
         IAdsbClientDevice? GetAdsbVehicleByFullId(ushort id);
         IObservable<IChangeSet<IRfsaClientDevice, ushort>> RfsaDevices { get; }
         IRfsaClientDevice? GetRfsaByFullId(ushort id);
+        IObservable<IChangeSet<IRsgaClientDevice, ushort>> RsgaDevices { get; }
+        IRsgaClientDevice? GetRsgaByFullId(ushort id);
+
     }
 }
diff --git a/src/Asv.Drones.Gui.Api/Services/Mavlink/MavlinkHelper.cs b/src/Asv.Drones.Gui.Api/Services/Mavlink/MavlinkHelper.cs
@@ -55,6 +55,7 @@ public static MaterialIconKind GetIcon(DeviceClass type)
                 DeviceClass.GbsRtk => MaterialIconKind.RouterWireless,
                 DeviceClass.Adsb => MaterialIconKind.Radar,
                 DeviceClass.Rfsa => MaterialIconKind.Waveform,
+                DeviceClass.Rsga => MaterialIconKind.CellphoneWireless,
                 _ => MaterialIconKind.HelpNetworkOutline,
             };
         }

diff --git a/src/Asv.Drones.Gui/Services/Mavlink/MavlinkDevicesService.cs b/src/Asv.Drones.Gui/Services/Mavlink/MavlinkDevicesService.cs
@@ -34,6 +34,7 @@ public class MavlinkDeviceServiceConfig
         public AdsbClientDeviceConfig Adsb { get; set; } = new();
         public bool WrapToV2ExtensionEnabled { get; set; } = true;
         public RfsaClientDeviceConfig Rfsa { get; set; } = new();
+        public RfsaClientDeviceConfig Rsga { get; set; } = new();
     }
 
     [Export(typeof(IMavlinkDevicesService))]
@@ -163,11 +164,17 @@ public MavlinkDevicesService(IConfiguration config, IPacketSequenceCalculator se
                 .Transform(CreateRfsaDevice)
                 .DisposeMany()
                 .RefCount();
+            RsgaDevices = Devices
+                .Filter(d => d.Type == (MavType)Mavlink.V2.AsvRsga.MavType.MavTypeAsvRsga)
+                .Transform(CreateRsgaDevice)
+                .DisposeMany()
+                .RefCount();
 
             AllDevices = Vehicles.Transform(x => (IClientDevice)x)
                 .MergeChangeSets(BaseStations.Transform(x => (IClientDevice)x))
                 .MergeChangeSets(Payloads.Transform(x => (IClientDevice)x))
                 .MergeChangeSets(RfsaDevices.Transform(x => (IClientDevice)x))
+                .MergeChangeSets(RsgaDevices.Transform(x => (IClientDevice)x))
                 .MergeChangeSets(AdsbDevices.Transform(x => (IClientDevice)x));
 
             #endregion
@@ -191,6 +198,18 @@ public MavlinkDevicesService(IConfiguration config, IPacketSequenceCalculator se
             #endregion
         }
 
+
+
+        private IRsgaClientDevice CreateRsgaDevice(IMavlinkDevice device)
+        {
+            return new RsgaClientDevice(Router, new MavlinkClientIdentity
+            {
+                TargetSystemId = device.SystemId,
+                TargetComponentId = device.ComponentId,
+                SystemId = _systemId.Value,
+                ComponentId = _componentId.Value,
+            }, InternalGetConfig(c => c.Rsga), _sequenceCalculator, RxApp.MainThreadScheduler);
+        }
         private IRfsaClientDevice CreateRfsaDevice(IMavlinkDevice device)
         {
             return new RfsaClientDevice(Router, new MavlinkClientIdentity
@@ -323,7 +342,14 @@ private string TryGetName(StatustextPacket pkt)
             using var autoDispose = RfsaDevices.BindToObservableList(out var list).Subscribe();
             return list.Items.FirstOrDefault(d => d.FullId == id);
         }
-
+
+        public IObservable<IChangeSet<IRsgaClientDevice, ushort>> RsgaDevices { get; }
+        public IRsgaClientDevice? GetRsgaByFullId(ushort id)
+        {
+            using var autoDispose = RsgaDevices.BindToObservableList(out var list).Subscribe();
+            return list.Items.FirstOrDefault(d => ((IClientDevice)d).FullId == id);
+        }
+
         private IVehicleClient? CreateVehicle(IMavlinkDevice device)
         {
             //if (device.Autopilot == MavAutopilot.MavAutopilotArdupilotmega)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project>
     <PropertyGroup>
-        <ProductVersion>1.0.0</ProductVersion>
-        <ApiVersion>1.0.0</ApiVersion>
-        <ApiPrevVersion>0.3.6</ApiPrevVersion>
+        <ProductVersion>1.0.1</ProductVersion>
+        <ApiVersion>1.0.1</ApiVersion>
+        <ApiPrevVersion>1.0.0</ApiPrevVersion>
         <AvaloniaVersion>11.0.6</AvaloniaVersion>
         <AsvCommonVersion>2.0.2</AsvCommonVersion>
         <AsvAvaloniaToolkitVersion>1.0.1</AsvAvaloniaToolkitVersion>
         <AsvAvaloniaMapVersion>2.0.5</AsvAvaloniaMapVersion>
-        <AsvMavlinkVersion>3.9.2</AsvMavlinkVersion>
+        <AsvMavlinkVersion>3.10.0</AsvMavlinkVersion>
         <FluentAvaloniaUIVersion>2.0.5</FluentAvaloniaUIVersion>
         <ReactiveUIVersion>19.5.41</ReactiveUIVersion>
         <SystemReactiveVersion>6.0.0</SystemReactiveVersion>