Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: update to v0.2.1 #246

Merged
merged 3 commits into from
Nov 30, 2023
+32 −7
Merged

release: update to v0.2.1 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce7a03d
fix (uav): fix anchor angle if vehicle is a plane
asv-soft-u01 Nov 30, 2023
880dfe9
fix (sdr): fix update mode localization
asv-soft-u01 Nov 30, 2023
04a676a
fix (core): fix version number display
asv-soft-u01 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Asv.Drones.Gui.Core/CorePlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/";
Expand Down
2 changes: 1 addition & 1 deletion src/Asv.Drones.Gui.Custom.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions src/Asv.Drones.Gui.Sdr/RS.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/Asv.Drones.Gui.Sdr/RS.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 3 additions & 0 deletions src/Asv.Drones.Gui.Sdr/RS.ru.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 1 addition & 2 deletions src/Asv.Drones.Gui.Sdr/Shell/Pages/Flight/Widgets/Sdr/FlightSdrView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand Down
12 changes: 11 additions & 1 deletion src/Asv.Drones.Gui.Uav/Shell/Pages/Flight/Layers/Anchors/UavAnchor/FlightUavAnchor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/Asv.Drones.Gui/Asv.Drones.Gui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading