dev-api-v1.0.1 commit

asv-soft · Jul 4, 2024 · a00bd8c · a00bd8c
1 parent f8c7776
commit a00bd8c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 31 deletions.
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>CP0006</DiagnosticId>
-    <Target>M:Asv.Drones.Gui.Api.IMavlinkDevicesService.GetRsgaByFullId(System.UInt16)</Target>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Asv.Drones.Gui.Api.HierarchicalStoreEntryViewModel</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>P:Asv.Drones.Gui.Api.IMavlinkDevicesService.RsgaDevices</Target>
+    <DiagnosticId>CP0007</DiagnosticId>
+    <Target>T:Asv.Drones.Gui.Api.HierarchicalStoreViewModel</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,8 +62,6 @@ 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,7 +55,6 @@ 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
@@ -164,17 +164,11 @@ 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
@@ -200,16 +194,6 @@ public MavlinkDevicesService(IConfiguration config, IPacketSequenceCalculator se
 
 
 
-        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
@@ -343,12 +327,6 @@ private string TryGetName(StatustextPacket pkt)
             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)
         {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project>
     <PropertyGroup>
         <ProductVersion>1.0.1</ProductVersion>
-        <ApiVersion>1.0.1</ApiVersion>
+        <ApiVersion>1.0.0-dev</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.10.0</AsvMavlinkVersion>
+        <AsvMavlinkVersion>3.9.3-dev</AsvMavlinkVersion>
         <FluentAvaloniaUIVersion>2.0.5</FluentAvaloniaUIVersion>
         <ReactiveUIVersion>19.5.41</ReactiveUIVersion>
         <SystemReactiveVersion>6.0.0</SystemReactiveVersion>