Skip to content

Commit

Permalink
Xamarin resource name fix
Browse files Browse the repository at this point in the history
  • Loading branch information
meee1 committed Sep 9, 2019
1 parent 55d6923 commit e357c9c
Show file tree
Hide file tree
Showing 16 changed files with 235 additions and 1,787 deletions.
63 changes: 9 additions & 54 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,65 +3,20 @@
*.user
bin/
obj/
/CustomImages
/APMPlannerXplanes/APMPlannerXplanes/Debug
/APMPlannerXplanes/Debug
/Driver/makecert.exe
/Drivers/gencert.bat
/Drivers/int2cat.bat
/Drivers/makecert.exe
/Drivers/signing.url
.vs/
/Msi
/packages
packages/
*.psess
/copy.bat
/macos.bat
/logo.png
*.vsp
/sitl
/cov-int
*.pyc
*.ncrunchproject
*.crunchsolution.cache
*.ncrunchsolution
/Plugins/AltitudeAngelWings/AltitudeAngelWings/Keys.config
/ExtLibs/Mavlink/Mavlink.cs
/ExtLibs/Mavlink/mavlink
/LogAnalyzer/LogAnalyzer.zip
/LogAnalyzer/py2exe/dist
/LogAnalyzer/py2exe/build
/LogAnalyzer/LogAnalyzer64.zip
/gstream
/MissionPlanner.appx
/AltitudeAngelWings.sln
/appxkey.cer
/ExtLibs/Portable/Portable
/ExtLibs/AltitudeAngelWings/Keys.config
/MissionPlannerBeta.zip
/LogAnalyzer/py2exe/
*.vspx
/ExtLibs/Android
/ExtLibs/w3w
/ExtLibs/java
/ExtLibs/netcore
/.vs
*.appx
*.zip
/Drivers/gencert.bat
/Drivers/makecert.exe
/Drivers/signing.url
/ExtLibs/Zeroconf
/ExtLibs/GMap.NET.Core/GMap.NET.Core2.csproj
/ExtLibs/GDAL/GDAL2.csproj
/ExtLibs/Core/Core2.csproj
/ExtLibs/Comms/MissionPlanner.Comms2.csproj
/ExtLibs/BaseClasses/BaseClasses2.csproj
/ExtLibs/AviFile/AviFile2.csproj
/ExtLibs/Arduino/Arduino2.csproj
/ExtLibs/GeoUtility/GeoUtility2.csproj
/MissionPlanner2.csproj
/ExtLibs/Mavlink/MAVLink2.csproj
/ExtLibs/Utilities/MissionPlanner.Utilities2.csproj
/Plugins/Shortcuts
/test
/ExtLibs/GDAL/Native/gdal
/ExtLibs/SimpleExample/packages
/ExtLibs/SimpleExample/.vs
/ExtLibs/wasm/wwwroot/2018-09-09 18-15-17.txt
/ExtLibs/Mobile
/ExtLibs/Test
*.appxsym
/ExtLibs/AltitudeAngelWings/Keys.config
2 changes: 1 addition & 1 deletion ExtLibs/Maps/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1677,7 +1677,7 @@ Control-S - save grid file\par
<value>..\..\Resources\wizardicon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="apm2.5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Resources\apm2.5.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>..\..\Resources\apm2_5.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="apm1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\Resources\apm1.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
Expand Down
3 changes: 3 additions & 0 deletions ExtLibs/Xamarin/Xamarin.UWP/Xamarin.UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,8 @@
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public Core Core
#else
internal readonly Font MissingDataFont = new Font(FontFamily.GenericSansSerif, 8, FontStyle.Regular);
#endif
Font ScaleFont = new Font(FontFamily.GenericSansSerif, 5, FontStyle.Italic);
public Font ScaleFont = new Font(FontFamily.GenericSansSerif, 5, FontStyle.Italic);
internal readonly StringFormat CenterFormat = new StringFormat();
internal readonly StringFormat BottomFormat = new StringFormat();
#if !PocketPC
Expand Down
4 changes: 2 additions & 2 deletions ExtLibs/Xamarin/Xamarin/GMap.NET.WindowsForms/GMapOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public bool IsVisibile
/// </summary>
public readonly ObservableCollectionThreadSafe<GMapPolygon> Polygons = new ObservableCollectionThreadSafe<GMapPolygon>();

GMapControl control;
public GMapControl Control
IControl control;
public IControl Control
{
get
{
Expand Down
3 changes: 3 additions & 0 deletions ExtLibs/Xamarin/Xamarin/GMap.NET.WindowsForms/GMapPolygon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ public void UpdateGraphicsPath()
}

{
if (LocalPoints.Count == 0)
return;

List<Point> pnts = new List<Point>();
var last = Point.Empty;
for (int i = 0; i < LocalPoints.Count; i++)
Expand Down
1,713 changes: 0 additions & 1,713 deletions ExtLibs/Xamarin/Xamarin/Maps/Resources.resx

This file was deleted.

28 changes: 28 additions & 0 deletions ExtLibs/Xamarin/Xamarin/Maps/WPOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,34 @@ public void CreateOverlay(MAVLink.MAV_FRAME altmode, PointLatLngAlt home, List<L

fullpointlist.AddRange(list);
}
else if (command >= (ushort)MAVLink.MAV_CMD.FENCE_POLYGON_VERTEX_INCLUSION && command <= (ushort)MAVLink.MAV_CMD.FENCE_POLYGON_VERTEX_EXCLUSION) // fence
{
PointLatLng point = new PointLatLng(item.lat, item.lng);
var m = new GMarkerGoogle(point, GMarkerGoogleType.blue_dot);
m.ToolTipMode = MarkerTooltipMode.OnMouseOver;
m.Tag = (a + 1).ToString();
overlay.Markers.Add(m);
}
else if (command >= (ushort)MAVLink.MAV_CMD.FENCE_CIRCLE_INCLUSION && command <= (ushort)MAVLink.MAV_CMD.FENCE_CIRCLE_EXCLUSION) // fence
{
PointLatLng point = new PointLatLng(item.lat, item.lng);
var m = new GMarkerGoogle(point, GMarkerGoogleType.blue_dot);
m.ToolTipMode = MarkerTooltipMode.OnMouseOver;
m.Tag = (a + 1).ToString();
overlay.Markers.Add(m);
}
else if (command == (ushort)MAVLink.MAV_CMD.FENCE_RETURN_POINT) // fence
{
PointLatLng point = new PointLatLng(item.lat, item.lng);
var m = new GMarkerGoogle(point, GMarkerGoogleType.orange_dot);
overlay.Markers.Add(m);
}
else if (command >= (ushort)MAVLink.MAV_CMD.RALLY_POINT) // rally
{
PointLatLng point = new PointLatLng(item.lat, item.lng);
var m = new GMarkerGoogle(point, GMarkerGoogleType.purple_dot);
overlay.Markers.Add(m);
}
else
{
pointlist.Add(null);
Expand Down
3 changes: 0 additions & 3 deletions ExtLibs/Xamarin/Xamarin/Xamarin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@
<EmbeddedResource Update="GCSViews\Firmware.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Maps\Resources.resx">
<Generator></Generator>
</EmbeddedResource>
<EmbeddedResource Update="MasterDetailPage1Detail.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
Expand Down
3 changes: 1 addition & 2 deletions GCSViews/FlightPlanner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1375,8 +1375,7 @@ public void writeKML()
overlay.CreateOverlay((MAVLink.MAV_FRAME) (altmode) CMB_altmode.SelectedValue, home,
commandlist,
double.Parse(TXT_WPRad.Text) / CurrentState.multiplieralt,
double.Parse(TXT_loiterrad.Text) / CurrentState.multiplieralt,
(MAVLink.MAV_MISSION_TYPE) cmb_missiontype.SelectedValue);
double.Parse(TXT_loiterrad.Text) / CurrentState.multiplieralt);
}
catch (FormatException ex)
{
Expand Down
53 changes: 52 additions & 1 deletion MissionPlanner.sln
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GMap.NET.Drawing", "ExtLibs
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UAVCANFlasher", "ExtLibs\UAVCANFlasher\UAVCANFlasher.csproj", "{EECDFE74-6CDC-45E0-AA39-34FF55FFB49F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "ExtLibs\test\test.csproj", "{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "ExtLibs\test\test.csproj", "{9BA6FC55-148D-4481-B9E6-B31A1D4BCD0F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MavlinkMessagePlugin", "ExtLibs\MavlinkMessagePlugin\MavlinkMessagePlugin.csproj", "{DFCB0240-50CF-4F56-92C7-05941569231D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mock", "ExtLibs\Mock\Mock.csproj", "{183631BD-EC15-47AD-9ABE-CD8DB748C066}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "7zip", "ExtLibs\7zip\7zip.csproj", "{1117EFD6-3A46-47F7-9BEB-02792D213B8D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shortcuts", "Plugins\Shortcuts\Shortcuts.csproj", "{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Expand Down Expand Up @@ -3326,6 +3328,54 @@ Global
{1117EFD6-3A46-47F7-9BEB-02792D213B8D}.Release|x64.Build.0 = Release|Any CPU
{1117EFD6-3A46-47F7-9BEB-02792D213B8D}.Release|x86.ActiveCfg = Release|Any CPU
{1117EFD6-3A46-47F7-9BEB-02792D213B8D}.Release|x86.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|ARM.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|x64.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|x64.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|x86.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.AppStore|x86.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|ARM.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|ARM.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|iPhone.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|x64.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|x64.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|x86.ActiveCfg = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Debug|x86.Build.0 = Debug|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|Any CPU.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|ARM.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|ARM.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|iPhone.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|iPhone.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|x64.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|x64.Build.0 = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|x86.ActiveCfg = Release|Any CPU
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -3390,6 +3440,7 @@ Global
{DFCB0240-50CF-4F56-92C7-05941569231D} = {9B3AC501-5FCB-4A2A-A628-BE0985DB2BD4}
{183631BD-EC15-47AD-9ABE-CD8DB748C066} = {7E264F12-9EC3-4CDC-A187-6879C2B2BFCF}
{1117EFD6-3A46-47F7-9BEB-02792D213B8D} = {7E264F12-9EC3-4CDC-A187-6879C2B2BFCF}
{E634EFE6-FEA0-4BB9-A7B9-D8809C33BCC8} = {9B3AC501-5FCB-4A2A-A628-BE0985DB2BD4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F7AF94B5-83B0-46CD-B258-67F2404F82FC}
Expand Down
109 changes: 109 additions & 0 deletions Plugins/Shortcuts/Plugin.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using MissionPlanner.Utilities;
using System.IO;
using System.Windows.Forms;
using System.Diagnostics;
using MissionPlanner;

namespace Shortcuts
{
public class Plugin : MissionPlanner.Plugin.Plugin
{

public override string Name
{
get { return "Shortcuts"; }
}

public override string Version
{
get { return "0.1"; }
}

public override string Author
{
get { return "Michael Oborne"; }
}

//[DebuggerHidden]
public override bool Init()
{
MainV2.instance.ProcessCmdKeyCallback += this.Instance_ProcessCmdKeyCallback;

return true;
}

private bool Instance_ProcessCmdKeyCallback(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
{
if (keyData == (Keys.Alt | Keys.A))
{
MainV2.comPort.setMode("Auto");
return true;
}
if (keyData == (Keys.Alt | Keys.G))
{
MainV2.comPort.setMode("Loiter");
return true;
}
if (keyData == (Keys.Alt | Keys.U))
{
MainV2.comPort.setMode("AltHold");
return true;
}
if (keyData == (Keys.Alt | Keys.S))
{
MainV2.comPort.setMode("Stabalize");
return true;
}
if (keyData == (Keys.Alt | Keys.H))
{
MainV2.comPort.setMode("RTL");
return true;
}

if (keyData == (Keys.Alt | Keys.T))
{
MainV2.comPort.doCommand(MAVLink.MAV_CMD.TAKEOFF, 0, 0, 0, 0, 0, 0, 2);
return true;
}
if (keyData == (Keys.Alt | Keys.L))
{
MainV2.comPort.doCommand(MAVLink.MAV_CMD.LAND, 0, 0, 0, 0, 0, 0, 0);
return true;
}

if (keyData == (Keys.Alt | Keys.D0))
{
MainV2.comPort.SendRCOverride(MainV2.comPort.MAV.sysid, MainV2.comPort.MAV.compid, 0, 0, 1000, 0, 0, 0,
0, 0);
return true;
}

if (keyData == (Keys.Alt | Keys.F1))
{
//MainV2.comPort.doCommand(MAVLink.MAV_CMD.DO_SET_SERVO, 1, MainV2.comPort.MAV., 0, 0, 0, 0, 0, true);
return true;
}

return false;
}

public override bool Loaded()
{
return true;
}

public override bool Loop()
{
return true;
}

public override bool Exit()
{
return true;
}
}
}
16 changes: 16 additions & 0 deletions Plugins/Shortcuts/Shortcuts.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net461</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ExtLibs\Utilities\MissionPlanner.Utilities.csproj" />
<ProjectReference Include="..\..\MissionPlanner.csproj" />
</ItemGroup>

<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>

</Project>
Loading

0 comments on commit e357c9c

Please sign in to comment.