Merge branch 'master' into fixfloat

ArduPilot · Mar 4, 2024 · 0421442 · 0421442
2 parents 80bd868 + 7fc177c
commit 0421442
Show file tree

Hide file tree

Showing 83 changed files with 14,614 additions and 8,680 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -27,6 +27,7 @@ jobs:
             !**.apk
             !**.so
             !**.aab
+            !**.dll
           key: ${{ runner.os }}-buildAAB
 
       - name: Build
@@ -46,7 +47,7 @@ jobs:
           
           $manifest.Save($current.Path + "\ExtLibs\Xamarin\Xamarin.Android\Properties\AndroidManifest.xml")
 
-          choco install microsoft-openjdk
+          choco install microsoft-openjdk --version=11.0.11.9
 
           msbuild -v:m -restore -t:SignAndroidPackage -p:Configuration=Release "ExtLibs\Xamarin\Xamarin.Android\Xamarin.Android.csproj"
           
@@ -102,6 +103,7 @@ jobs:
             !**.apk
             !**.so
             !**.aab
+            !**.dll
           key: ${{ runner.os }}-buildAPK
       - name: Build
         shell: pwsh
@@ -124,7 +126,7 @@ jobs:
 
           Set-Content -Path ExtLibs\Xamarin\Xamarin.Android\Xamarin.Android.csproj -Value (Get-Content -Path ExtLibs\Xamarin\Xamarin.Android\Xamarin.Android.csproj -Raw).Replace("<AotAssemblies>true</AotAssemblies>","<AotAssemblies>false</AotAssemblies>")
 
-          choco install microsoft-openjdk
+          choco install microsoft-openjdk --version=11.0.11.9
           
           msbuild -v:m -restore -t:SignAndroidPackage -p:Configuration=Release "ExtLibs\Xamarin\Xamarin.Android\Xamarin.Android.csproj"
           
@@ -135,7 +137,7 @@ jobs:
           ForEach($i in $apks) {
             echo $i.FullName
             Move-Item -path $i.FullName temp.apk
-            C:\Android\android-sdk\build-tools\29.0.3\zipalign.exe -p -f -v 4 temp.apk $i.FullName
+            C:\Android\android-sdk\build-tools\31.0.0\zipalign.exe -p -f -v 4 temp.apk $i.FullName
             Remove-Item temp.apk
           }
 
@@ -149,6 +151,8 @@ jobs:
           alias: ${{ secrets.ALIAS }}
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
+        env:
+          BUILD_TOOLS_VERSION: "31.0.0"
 
       - uses: actions/upload-artifact@v2
         with:

diff --git a/Common.cs b/Common.cs
@@ -42,7 +42,7 @@ public static GMapMarker getMAVMarker(MAVState MAV, GMapOverlay overlay = null)
                         itemp.Cog = MAV.cs.groundcourse;
                         itemp.Target = MAV.cs.target_bearing;
                         itemp.Nav_bearing = MAV.cs.nav_bearing;
-                        itemp.Radius = MAV.cs.radius * CurrentState.multiplierdist;
+                        itemp.Radius = (float)CurrentState.fromDistDisplayUnit(MAV.cs.radius);
                         return null;
                     }
                     else if (item is GMapMarkerQuad)
@@ -76,7 +76,7 @@ public static GMapMarker getMAVMarker(MAVState MAV, GMapOverlay overlay = null)
             {
                 return (new GMapMarkerPlane(MAV.sysid - 1, portlocation, MAV.cs.yaw,
                     MAV.cs.groundcourse, MAV.cs.nav_bearing, MAV.cs.target_bearing,
-                    MAV.cs.radius * CurrentState.multiplierdist)
+                    (float)CurrentState.toDistDisplayUnit(MAV.cs.radius))
                 {
                     ToolTipText = ArduPilot.Common.speechConversion(MAV, "" + Settings.Instance["mapicondesc"]),
                     ToolTipMode = String.IsNullOrEmpty(Settings.Instance["mapicondesc"]) ? MarkerTooltipMode.Never : MarkerTooltipMode.Always,

diff --git a/ExtLibs/AltitudeAngelWings/AltitudeAngelWings.csproj b/ExtLibs/AltitudeAngelWings/AltitudeAngelWings.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Flurl.Http" Version="3.2.0" />
     <PackageReference Include="GeoJSON.Net" Version="1.1.64" />
     <PackageReference Include="Polly" Version="7.2.4" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.31.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
     <PackageReference Include="System.Reactive" Version="4.0.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/ExtLibs/AltitudeAngelWings/Clients/Auth/Model/TokenResponseExtensions.cs b/ExtLibs/AltitudeAngelWings/Clients/Auth/Model/TokenResponseExtensions.cs
@@ -1,3 +1,4 @@
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
@@ -43,7 +44,7 @@ public static string[] AccessTokenScopes(this TokenResponse tokenResponse)
                     scopes.AddRange(values.Select(item => item.ToString()));
                     break;
                 default:
-                    scopes.Add(JsonExtensions.SerializeToJson(value));
+                    scopes.Add(JsonConvert.SerializeObject(value));
                     break;
             }