From ce7a03dffc6a0f4f1ec2a2db92c44912d1409e89 Mon Sep 17 00:00:00 2001
From: burlakov <u01@asv.me>
Date: Thu, 30 Nov 2023 10:16:29 +0300
Subject: [PATCH 1/3] fix (uav): fix anchor angle if vehicle is a plane

Asana: https://app.asana.com/0/1203851531040615/1206062814171957/f
---
 .../Layers/Anchors/UavAnchor/FlightUavAnchor.cs      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Asv.Drones.Gui.Uav/Shell/Pages/Flight/Layers/Anchors/UavAnchor/FlightUavAnchor.cs b/src/Asv.Drones.Gui.Uav/Shell/Pages/Flight/Layers/Anchors/UavAnchor/FlightUavAnchor.cs
index 8d6e0c02..7f6af9d5 100644
--- a/src/Asv.Drones.Gui.Uav/Shell/Pages/Flight/Layers/Anchors/UavAnchor/FlightUavAnchor.cs
+++ b/src/Asv.Drones.Gui.Uav/Shell/Pages/Flight/Layers/Anchors/UavAnchor/FlightUavAnchor.cs
@@ -34,7 +34,17 @@ public FlightUavAnchor(IVehicleClient vehicle,ILocalizationService loc,IEnumerab
             IsVisible = true;
             Icon = MavlinkHelper.GetIcon(vehicle.Class);
             vehicle.Position.Current.Subscribe(_ => Location = _).DisposeItWith(Disposable);
-            vehicle.Position.Yaw.Select(_ => Math.Round(_, 0)).DistinctUntilChanged().Subscribe(_ => RotateAngle = _).DisposeItWith(Disposable);
+            vehicle.Position.Yaw.Select(_ => Math.Round(_, 0)).DistinctUntilChanged().Subscribe(v =>
+            {
+                if (vehicle.Class == DeviceClass.Plane)
+                {
+                    RotateAngle = v - 45;
+                }
+                else
+                {
+                    RotateAngle = v;
+                }
+            }).DisposeItWith(Disposable);
             Title = vehicle.Name.Value;
             vehicle.Name.Subscribe(_ => Title = _).DisposeItWith(Disposable);
             vehicle.Position.Current.Subscribe(_ => UpdateDescription()).DisposeItWith(Disposable);

From 880dfe9aaef2972b21cfe54e0fed863bded96ccb Mon Sep 17 00:00:00 2001
From: burlakov <u01@asv.me>
Date: Thu, 30 Nov 2023 10:23:01 +0300
Subject: [PATCH 2/3] fix (sdr): fix update mode localization

Asana: https://app.asana.com/0/1203851531040615/1206062814171959/f
---
 src/Asv.Drones.Gui.Sdr/RS.Designer.cs                    | 9 +++++++++
 src/Asv.Drones.Gui.Sdr/RS.resx                           | 3 +++
 src/Asv.Drones.Gui.Sdr/RS.ru.resx                        | 3 +++
 .../Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml   | 3 +--
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Asv.Drones.Gui.Sdr/RS.Designer.cs b/src/Asv.Drones.Gui.Sdr/RS.Designer.cs
index 5e6fce11..0e05c1e9 100644
--- a/src/Asv.Drones.Gui.Sdr/RS.Designer.cs
+++ b/src/Asv.Drones.Gui.Sdr/RS.Designer.cs
@@ -104,6 +104,15 @@ public static string FlightSdrView_SystemControlAction_Shutdown_Title {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Update mode.
+        /// </summary>
+        public static string FlightSdrView_UpdateMode_Title {
+            get {
+                return ResourceManager.GetString("FlightSdrView_UpdateMode_Title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Value must be greater than 0.
         /// </summary>
diff --git a/src/Asv.Drones.Gui.Sdr/RS.resx b/src/Asv.Drones.Gui.Sdr/RS.resx
index f82811d8..33212303 100644
--- a/src/Asv.Drones.Gui.Sdr/RS.resx
+++ b/src/Asv.Drones.Gui.Sdr/RS.resx
@@ -327,4 +327,7 @@
     <data name="FlightSdrView_SetMode_Title" xml:space="preserve">
         <value>Set mode</value>
     </data>
+    <data name="FlightSdrView_UpdateMode_Title" xml:space="preserve">
+        <value>Update mode</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/src/Asv.Drones.Gui.Sdr/RS.ru.resx b/src/Asv.Drones.Gui.Sdr/RS.ru.resx
index 82d9a540..df589dff 100644
--- a/src/Asv.Drones.Gui.Sdr/RS.ru.resx
+++ b/src/Asv.Drones.Gui.Sdr/RS.ru.resx
@@ -320,4 +320,7 @@
     <data name="FlightSdrView_SetMode_Title" xml:space="preserve">
         <value>Установить режим</value>
     </data>
+    <data name="FlightSdrView_UpdateMode_Title" xml:space="preserve">
+        <value>Обновить режим</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/src/Asv.Drones.Gui.Sdr/Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml b/src/Asv.Drones.Gui.Sdr/Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml
index 3e01ad47..37ebd24d 100644
--- a/src/Asv.Drones.Gui.Sdr/Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml
+++ b/src/Asv.Drones.Gui.Sdr/Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml
@@ -109,9 +109,8 @@
             <Button Command="{Binding UpdateMode}" HorizontalAlignment="Stretch">
                 <StackPanel Spacing="8" Orientation="Horizontal">
                     <avalonia:MaterialIcon Kind="Check"/>
-                    <TextBlock Text="{x:Static sdr:RS.FlightSdrView_StartMission_Title}"/>
+                    <TextBlock Text="{x:Static sdr:RS.FlightSdrView_UpdateMode_Title}"/>
                 </StackPanel>
-                
             </Button>
             <StackPanel Spacing="3">
                 <Button HorizontalAlignment="Stretch" IsVisible="{Binding !IsMissionStarted}" Command="{Binding StartMission}">

From 04a676af26c7a15b3b93f2e4234f410cb50239be Mon Sep 17 00:00:00 2001
From: burlakov <u01@asv.me>
Date: Thu, 30 Nov 2023 10:41:07 +0300
Subject: [PATCH 3/3] fix (core): fix version number display

Asana: https://app.asana.com/0/1203851531040615/1205906196019654/f
---
 src/Asv.Drones.Gui.Core/CorePlugin.cs    | 2 +-
 src/Asv.Drones.Gui.Custom.props          | 2 +-
 src/Asv.Drones.Gui/Asv.Drones.Gui.csproj | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Asv.Drones.Gui.Core/CorePlugin.cs b/src/Asv.Drones.Gui.Core/CorePlugin.cs
index f01cd6d9..f3748f65 100644
--- a/src/Asv.Drones.Gui.Core/CorePlugin.cs
+++ b/src/Asv.Drones.Gui.Core/CorePlugin.cs
@@ -63,7 +63,7 @@ private IAppPathInfo GetAppPathInfo()
     private IAppInfo GetAppInfo()
     {
         var assm = _applicationDataTemplateHost.GetType().Assembly.GetName(); // hack - to get application assembly
-        var version = assm.Version?.ToString() ?? "0.0.0";
+        var version = assm.Version != null ? $"{assm.Version.Major}.{assm.Version.Minor}.{assm.Version.Build}" : "0.0.0";
         var name = assm.Name ?? "Asv.Drones";
         const string author = "https://asv.me/";
         const string appUrl = "https://docs.asv.me/";
diff --git a/src/Asv.Drones.Gui.Custom.props b/src/Asv.Drones.Gui.Custom.props
index 7512df13..f46a7d29 100644
--- a/src/Asv.Drones.Gui.Custom.props
+++ b/src/Asv.Drones.Gui.Custom.props
@@ -4,7 +4,7 @@
   </ItemGroup>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <ProductVersion>0.1.0</ProductVersion>
+    <ProductVersion>0.2.1</ProductVersion>
     <AvaloniaVersion>11.0.0</AvaloniaVersion>
     <AsvCommonVersion>1.13.1</AsvCommonVersion>
     <AsvMavlinkVersion>3.6.0-alpha08</AsvMavlinkVersion>
diff --git a/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj b/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
index 410f628e..642c0a55 100644
--- a/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
+++ b/src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
@@ -5,10 +5,11 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <AssemblyVersion>$(ProductStrongVersion)</AssemblyVersion>
-        <FileVersion>$(ProductExtendedVersion)</FileVersion>
+        <AssemblyVersion>$(ProductVersion)</AssemblyVersion>
+        <FileVersion>$(ProductVersion)</FileVersion>
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
+        <Version>$(ProductVersion)</Version>
     </PropertyGroup>
 
     <ItemGroup>