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.

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

Merge develop into main #272

Merged
merged 52 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
531e5b6
fix: refactored AnchorsEditorView.axaml for code cleanliness
Nov 30, 2023
e0de781
fix: second click on ruler wil off it. Next click on map will not pla…
GEBENGAG Dec 1, 2023
a03940d
Merge pull request #248 from asv-soft/hotfix/anchor-editor
asv-soft-u01 Dec 1, 2023
bfa1238
Revert "fix: second click on ruler wil off it. Next click on map will…
asv-soft-u01 Dec 2, 2023
5f0668b
fix: add ruler cancellation token
GEBENGAG Dec 4, 2023
d5c2200
fix: added notification to ShowTargetDialog that attracts while ruler…
GEBENGAG Dec 4, 2023
afe4e23
fix: change implementation of ShowTargetDialog allows to cancel task …
Dec 4, 2023
45e1db7
Update MapRulerActionViewModel.cs
asv-soft-u03 Dec 4, 2023
cdef19a
Update Asv.Drones.Gui.Core.csproj
asv-soft-u03 Dec 4, 2023
ef12cfd
Update MapRulerActionViewModel.cs
asv-soft-u03 Dec 4, 2023
e171bc5
Update MapPageViewModel.cs
asv-soft-u03 Dec 4, 2023
0f06fb4
fix: simplify HierarchicalStoreEntryTagViewModel implementation
Dec 4, 2023
26ed1cf
Merge pull request #251 from asv-soft/hotfix/hierarchical-tag-width
asv-soft-u01 Dec 6, 2023
7259d10
Merge branch 'develop' into hotfix/ruler-cancel-fix
asv-soft-u01 Dec 6, 2023
278d04b
fix (core): Refactor readability of MapPageViewModel and MapRulerActi…
asv-soft-u01 Dec 6, 2023
5374b9b
Merge pull request #250 from asv-soft/hotfix/ruler-cancel-fix
asv-soft-u01 Dec 6, 2023
242937e
feat (sdr): update Asv.Mavlink version and add restart SDR option
asv-soft-u01 Dec 6, 2023
9094b08
feat: update Asv.Mavlink package version reference
asv-soft-u01 Dec 6, 2023
3d5a809
feat(nuget): update Mavlink and Common packages
asvol Dec 7, 2023
b09bfb6
feat (asv-drones-gui): cancel button for params download
Dec 7, 2023
37f8d25
feat: update avalonia to 11.0.5
Dec 7, 2023
fef254b
Merge pull request #252 from asv-soft/feature/add-new-system-action-t…
asv-soft-u01 Dec 7, 2023
2c0723a
Merge pull request #254 from asv-soft/feature/update-avalonia-package
asv-soft-u01 Dec 8, 2023
24a488e
feat: change ui in measure units settings define with better place use
Dec 11, 2023
8524877
feat: settings of measure units better size optimization
Dec 11, 2023
b05336f
feat: optimize height value for all controls in measure units define
Dec 11, 2023
7065fb7
fix: update AsvMavlinkVersion and validate azimuth values
Dec 12, 2023
f2c18aa
Merge pull request #256 from asv-soft/hotfix/props-versions
asv-soft-u01 Dec 13, 2023
60fa905
feat: add close button under progress bar in drone parameters view
Dec 14, 2023
877fdaa
Merge pull request #255 from asv-soft/feature/new-measure-units-ui
asv-soft-u01 Dec 18, 2023
f92855d
Update ParamPageViewModel.cs
asv-soft-u03 Dec 18, 2023
d3f2bf2
Update ParamPageViewModel.cs
asv-soft-u03 Dec 18, 2023
044b6e3
Update ParamItemViewModel.cs
asv-soft-u03 Dec 18, 2023
6d12364
Merge pull request #257 from asv-soft/feat-param-load-cancel
asv-soft-u01 Dec 18, 2023
10e1ed0
hotfix: fix custom props typo
asv-soft-u01 Dec 18, 2023
329fa54
hotfix (sdr): fixed incorrect amplitude conversion in VorSdrRttViewModel
asv-soft-u01 Dec 18, 2023
f71966e
feat (planning): add task parameters to set vehicle speed before miss…
asv-soft-u01 Dec 20, 2023
03921d5
Merge pull request #258 from asv-soft/hotfix/fix-vor-sdr-rtt-item-values
asvol Dec 25, 2023
1edd789
feat: HierarchicalStoreView buttons now have tooltips
Jan 11, 2024
65388c3
feat: HierarchicalStoreView tooltips add and localize
Jan 11, 2024
95dec7c
Merge pull request #263 from asv-soft/feature/hierarchical-store-view…
asv-soft-u01 Jan 15, 2024
50ea5b9
fix (asv-drones-gui-sdr): change Phi90StringValue
flurps1 Jan 16, 2024
43b89e2
Merge pull request #265 from asv-soft/fix-asv-drones-gui-PHI90-value
asv-soft-u01 Jan 16, 2024
dec2452
Merge remote-tracking branch 'origin/develop' into develop
asv-soft-u01 Jan 16, 2024
7ae688e
fix: update RS.Designer.cs in Asv.Drones.Gui.Core
Jan 16, 2024
80e598a
Merge pull request #268 from asv-soft/hotfix/fix-resource-public-name…
asv-soft-u01 Jan 16, 2024
6861a06
Merge remote-tracking branch 'origin/develop' into develop
asv-soft-u01 Jan 17, 2024
c995f9f
feat(asv-drones-gui-uav): Added message about LastKnownPosition
flurps1 Jan 22, 2024
be5a978
Merge pull request #269 from asv-soft/feat-Asv-drones-gui-added-LastK…
asv-soft-u01 Jan 22, 2024
60d7aa3
feat(asv-drones): add multi-platform desktop publishing script and .d…
Jan 25, 2024
2824795
feat(asv-drones): enhance application publishing configurations and s…
Jan 26, 2024
20cd806
Merge pull request #271 from asv-soft/feature/publish-scripts
asv-soft-u01 Jan 26, 2024
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
29 changes: 0 additions & 29 deletions build.bat

This file was deleted.

81 changes: 81 additions & 0 deletions linux_packages.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
#!/bin/bash

export PublishDir="$(pwd)"
export Version=$(grep 'ProductVersion' $PublishDir/../src/Asv.Drones.Gui.Custom.props | sed -e 's/^.*ProductVersion>\([^<]*\)<.*$/\1/')

check_and_install_package() {
package_name=$1
if ! dpkg -l | grep -qw $package_name; then
echo "Package $package_name is not installed. Installing..."
sudo apt-get update
sudo apt-get install -y $package_name
else
echo "Package $package_name already installed."
fi
}

build_deb_package() {
platform=$1
architecture="all"

case "$platform" in
"linux-arm")
architecture="armhf"
;;
"linux-arm64")
architecture="arm64"
;;
"linux-musl-x64" | "linux-x64")
architecture="amd64"
;;
esac

mkdir -p asv-drones/DEBIAN asv-drones/usr/bin asv-drones/usr/share/applications asv-drones/usr/share/icons

cp $PublishDir/../src/Asv.Drones.Gui/Assets/icon.png asv-drones/usr/share/icons/asv-drones.png

cat > asv-drones/usr/share/applications/asv-drones.desktop << EOF
[Desktop Entry]
Name=Asv.Drones
Icon=/usr/share/icons/asv-drones.png
Exec=asv-drones-$platform %u
Type=Application
Terminal=false
Categories=Utility;
EOF
chmod 755 asv-drones/usr/share/applications/asv-drones.desktop

cat > asv-drones/DEBIAN/control << EOF
Package: asv-drones
Version: $Version
Section: utils
Priority: optional
Architecture: $architecture
Maintainer: Asv.Soft <me@asv.me>
Description: Open source implementation of ground control station application for ArduPilot and PX4 autopilot.
EOF
chmod 755 asv-drones/DEBIAN/control

cp $PublishDir/$platform/app/asv-drones-$platform asv-drones/usr/bin

chmod 777 asv-drones/usr/bin/asv-drones-$platform

dpkg-deb --build asv-drones
sudo -S alien -r asv-drones.deb

cp asv-drones.deb $PublishDir/$platform/asv-drones-$platform.deb
cp *.rpm $PublishDir/$platform

rm -r asv-drones
rm -f *.deb
rm -f *.rpm
}

check_and_install_package alien

cd ~

build_deb_package linux-arm
build_deb_package linux-arm64
build_deb_package linux-musl-x64
build_deb_package linux-x64
46 changes: 46 additions & 0 deletions osx_packages.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

export PublishDir="$(pwd)"
export Version=$(grep 'ProductVersion' $PublishDir/../src/Asv.Drones.Gui.Custom.props | sed -e 's/^.*ProductVersion>\([^<]*\)<.*$/\1/')

build_app_package() {
platform=$1

mkdir -p asv-drones.app/Contents/MacOS asv-drones.app/Contents/Resources asv-drones.app/Contents/Frameworks

cp $PublishDir/../src/Asv.Drones.Gui/Assets/icon.icns asv-drones.app/Contents/Resources
cp -a $PublishDir/$platform/app/. asv-drones.app/Contents/MacOS

chmod 777 asv-drones.app/Contents/MacOS/asv-drones-$platform

cat > asv-drones.app/Contents/Info.plist << EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>asv-drones-$platform</string>
<key>CFBundleIconFile</key>
<string>icon.icns</string>
<key>CFBundleIdentifier</key>
<string>com.asv.drones</string>
<key>CFBundleName</key>
<string>Asv.Drones</string>
<key>CFBundleVersion</key>
<string>$Version</string>
<key>CFBundleShortVersionString</key>
<string>$Version</string>
</dict>
</plist>
EOF

tar -czvf asv-drones-$platform.tar.gz asv-drones.app
cp asv-drones-$platform.tar.gz $PublishDir/$platform
rm -r asv-drones.app
rm -r asv-drones-$platform.tar.gz
}

cd ~

build_app_package osx-arm64
build_app_package osx-x64
140 changes: 140 additions & 0 deletions publish.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
cd publish

for /d %%i in (".\*") do (
rmdir /s /q "%%i"
)

cd ../src/Asv.Drones.Gui.Desktop

dotnet publish -c Release -r win-arm --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-arm/app
dotnet publish -c Release -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-arm64/app
dotnet publish -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-x64/app
dotnet publish -c Release -r win-x86 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-x86/app

dotnet publish -c Release -r linux-arm --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-arm/app
dotnet publish -c Release -r linux-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-arm64/app
dotnet publish -c Release -r linux-musl-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-musl-x64/app
dotnet publish -c Release -r linux-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-x64/app

dotnet publish -c Release -r osx-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/osx-arm64/app
dotnet publish -c Release -r osx-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/osx-x64/app

cd ../../publish
del /S *.pdb

cd win-arm/app
move Asv.Drones.Gui.Desktop.exe asv-drones-win-arm.exe
cd ../../win-arm64/app
move Asv.Drones.Gui.Desktop.exe asv-drones-win-arm64.exe
cd ../../win-x64/app
move Asv.Drones.Gui.Desktop.exe asv-drones-win-x64.exe
cd ../../win-x86/app
move Asv.Drones.Gui.Desktop.exe asv-drones-win-x86.exe

cd ../../linux-arm/app
move Asv.Drones.Gui.Desktop asv-drones-linux-arm
cd ../../linux-arm64/app
move Asv.Drones.Gui.Desktop asv-drones-linux-arm64
cd ../../linux-musl-x64/app
move Asv.Drones.Gui.Desktop asv-drones-linux-musl-x64
cd ../../linux-x64/app
move Asv.Drones.Gui.Desktop asv-drones-linux-x64

cd ../../osx-arm64/app
move Asv.Drones.Gui.Desktop asv-drones-osx-arm64
cd ../../osx-x64/app
move Asv.Drones.Gui.Desktop asv-drones-osx-x64
cd ../../..

setlocal enabledelayedexpansion

set "xmlFile=src\Asv.Drones.Gui.Custom.props"

for /f "tokens=2 delims=<> " %%a in ('findstr /i "<ProductVersion>" "%xmlFile%"') do (
set "productVersion=%%a"
)

set "issFile=win-arm-install.iss"

set "tempFile=%temp%\temp.iss"

for /f "tokens=*" %%a in ('type "%issFile%"') do (
set "line=%%a"

echo !line! | findstr /C:"#define MyAppVersion" > nul

if !errorlevel! == 0 (
echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
) else (
echo !line! >> "%tempFile%"
)
)

move /y "%tempFile%" "%issFile%" > nul

set "issFile=win-arm64-install.iss"

set "tempFile=%temp%\temp.iss"

for /f "tokens=*" %%a in ('type "%issFile%"') do (
set "line=%%a"

echo !line! | findstr /C:"#define MyAppVersion" > nul

if !errorlevel! == 0 (
echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
) else (
echo !line! >> "%tempFile%"
)
)

move /y "%tempFile%" "%issFile%" > nul

set "issFile=win-x64-install.iss"

set "tempFile=%temp%\temp.iss"

for /f "tokens=*" %%a in ('type "%issFile%"') do (
set "line=%%a"

echo !line! | findstr /C:"#define MyAppVersion" > nul

if !errorlevel! == 0 (
echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
) else (
echo !line! >> "%tempFile%"
)
)

move /y "%tempFile%" "%issFile%" > nul

set "issFile=win-x86-install.iss"

set "tempFile=%temp%\temp.iss"

for /f "tokens=*" %%a in ('type "%issFile%"') do (
set "line=%%a"

echo !line! | findstr /C:"#define MyAppVersion" > nul

if !errorlevel! == 0 (
echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
) else (
echo !line! >> "%tempFile%"
)
)

move /y "%tempFile%" "%issFile%" > nul

endlocal

cd publish

iscc ../win-arm-install.iss
iscc ../win-arm64-install.iss
iscc ../win-x86-install.iss
iscc ../win-x64-install.iss

wsl ../linux_packages.sh

wsl ../osx_packages.sh
6 changes: 6 additions & 0 deletions src/.run/Linux-arm.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Linux-arm" 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-arm" self_contained="true" target_folder="$PROJECT_DIR$/../publish/linux-arm/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Linux-arm64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +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" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Linux-musl-x64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Linux-musl-x64" 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-musl-x64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/linux-musl-x64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Linux-x64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Linux-x64" 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-x64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/linux-x64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Osx-arm64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Osx-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="osx-arm64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/osx-arm64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Osx-x64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Osx-x64" 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="osx-x64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/osx-x64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
16 changes: 16 additions & 0 deletions src/.run/Win-arm.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Win-arm" 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="win-arm"
self_contained="true"
target_folder="$PROJECT_DIR$/../publish/win-arm/app"
target_framework="net7.0"
uuid_high="-6069974389149972757"
uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Win-arm64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Win-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="win-arm64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/win-arm64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Win-x64.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Win-x64" 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="win-x64" self_contained="true" target_folder="$PROJECT_DIR$/../publish/win-x64/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
6 changes: 6 additions & 0 deletions src/.run/Win-x86.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Win-x86" 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="win-x86" self_contained="true" target_folder="$PROJECT_DIR$/../publish/win-x86/app" target_framework="net7.0" uuid_high="-6069974389149972757" uuid_low="-5498245974063364756" />
<method v="2" />
</configuration>
</component>
Loading