Mission Planner 1.3.68

ArduPilot · Jun 15, 2019 · 34c040d · 34c040d
1 parent ed2bad4
commit 34c040d
Show file tree

Hide file tree

Showing 21 changed files with 128 additions and 497 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,4 +1,13 @@
-*Mission Planner 1.3.67 - 11-6-2019
+*Mission Planner 1.3.68 - 15-6-2019
+ConfigFirmware: fix copter fw upload
+Drivers: add nxp
+LogBrowse: add ironpython graph processing with fallback
+LogBrowse: add more mavgraphs and parser
+mavcmd: add do_gripper for rover #2157
+7zip: add
+httpserver: fix mavlink
+
+*Mission Planner 1.3.67 - 11-6-2019
 ThemeManager: more html
 ConfigMotorTest: allow negative % #1911
 FlightData: fix units on QV and speedup prompt

diff --git a/ExtLibs/Xamarin/Xamarin.Android/Properties/AndroidManifest.xml b/ExtLibs/Xamarin/Xamarin.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.michaeloborne.Xamarin" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
 	<application android:label="Xamarin.Android"></application>
 </manifest>
diff --git a/ExtLibs/Xamarin/Xamarin/Controls/MySKGLView.cs b/ExtLibs/Xamarin/Xamarin/Controls/MySKGLView.cs
@@ -323,10 +323,13 @@ private void MySKGLView_SizeChanged(object sender, EventArgs e)
         {
             try
             {
-                OnSizeChanged(null);
+                if (GRContext == null)
+                    return;
 
                 if (CanvasSize != null)
                     OnResize(null);
+
+                OnSizeChanged(null); 
             }
             catch (Exception ex)
             {

diff --git a/ExtLibs/Xamarin/Xamarin/MainPage_old.xaml → ExtLibs/Xamarin/Xamarin/FlightData.xaml b/ExtLibs/Xamarin/Xamarin/MainPage_old.xaml → ExtLibs/Xamarin/Xamarin/FlightData.xaml
diff --git a/ExtLibs/Xamarin/Xamarin/MainPage_old.xaml.cs → ExtLibs/Xamarin/Xamarin/FlightData.xaml.cs b/ExtLibs/Xamarin/Xamarin/MainPage_old.xaml.cs → ExtLibs/Xamarin/Xamarin/FlightData.xaml.cs
diff --git a/ExtLibs/Xamarin/Xamarin/MainPage.xaml b/ExtLibs/Xamarin/Xamarin/MainPage.xaml
@@ -9,7 +9,7 @@
   <MasterDetailPage.Detail>
     <NavigationPage>
       <x:Arguments>
-        <pages:MasterDetailPage1Detail />
+        <pages:MainPage_old />
       </x:Arguments>
     </NavigationPage>
   </MasterDetailPage.Detail>

diff --git a/ExtLibs/Xamarin/Xamarin/MasterDetailPage1Master.xaml b/ExtLibs/Xamarin/Xamarin/MasterDetailPage1Master.xaml
@@ -5,7 +5,7 @@
              Title="Master">
   <StackLayout>
     <ListView x:Name="MenuItemsListView"
-              SeparatorVisibility="None"
+              SeparatorVisibility="Default"
               HasUnevenRows="true"
               ItemsSource="{Binding MenuItems}">
       <ListView.Header>
@@ -16,22 +16,23 @@
             <ColumnDefinition Width="10"/>
           </Grid.ColumnDefinitions>
           <Grid.RowDefinitions>
+            <RowDefinition Height="0"/>
             <RowDefinition Height="30"/>
-            <RowDefinition Height="80"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="10"/>
           </Grid.RowDefinitions>
           <Label
               Grid.Column="1"
               Grid.Row="2"
               Text="Mission Planner"
+              FontSize="24"
               Style="{DynamicResource SubtitleStyle}"/>
         </Grid>
       </ListView.Header>
       <ListView.ItemTemplate>
         <DataTemplate>
           <ViewCell>
-            <StackLayout Padding="15,10" HorizontalOptions="FillAndExpand">
+            <StackLayout Padding="10,5" HorizontalOptions="FillAndExpand">
               <Label VerticalOptions="FillAndExpand" 
                     VerticalTextAlignment="Center" 
                     Text="{Binding Title}" 

diff --git a/ExtLibs/Xamarin/Xamarin/Xamarin.csproj b/ExtLibs/Xamarin/Xamarin/Xamarin.csproj
@@ -39,15 +39,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Controls\AGauge.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="GMap.NET.WindowsForms\GMapControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Update="Controls\HUD.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Update="Controls\AGauge.cs" />
+    <Compile Update="GMap.NET.WindowsForms\GMapControl.cs" />
+    <Compile Update="Controls\HUD.cs" />
     <Compile Update="Controls\HUDT.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -59,9 +53,7 @@
     <Compile Update="MainPage.xaml.cs">
       <DependentUpon>MainPage</DependentUpon>
     </Compile>
-    <Compile Update="MasterDetailPage1MenuItem.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Update="MasterDetailPage1MenuItem.cs" />
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>