Mono fixs/tweaks

magicrub · May 27, 2017 · 454fb85 · 454fb85
1 parent 9a5879c
commit 454fb85
Show file tree

Hide file tree

Showing 33 changed files with 2,119 additions and 3,380 deletions.
diff --git a/CurrentState.cs b/CurrentState.cs
@@ -1084,7 +1084,7 @@ public float DistRSSIRemain
         public float servovoltage { get; set; }
 
         [DisplayText("Voltage Flags")]
-        public MAVLink.MAV_POWER_STATUS voltageflag { get; set; }
+        public uint voltageflag {get;set;}
 
         public ushort i2cerrors { get; set; }
 
@@ -1253,7 +1253,7 @@ public int KIndex
 
         public float rpm2 { get; set; }
 
-        public MAVLink.MAV_PROTOCOL_CAPABILITY capabilities { get; set; }
+        public uint capabilities { get; set; }
 
         public float speedup { get; set; }
 
@@ -1328,8 +1328,8 @@ public void ResetInternals()
                 distTraveled = 0;
                 timeInAir = 0;
                 version = new Version();
-                voltageflag = MAVLink.MAV_POWER_STATUS.USB_CONNECTED;
-                capabilities = MAVLink.MAV_PROTOCOL_CAPABILITY.MISSION_FLOAT;
+                voltageflag = (uint)MAVLink.MAV_POWER_STATUS.USB_CONNECTED;
+                capabilities = (uint)MAVLink.MAV_PROTOCOL_CAPABILITY.MISSION_FLOAT;
             }
         }
 
@@ -1545,7 +1545,7 @@ public void UpdateCurrentSettings(System.Windows.Forms.BindingSource bs, bool up
 
                         try
                         {
-                            capabilities = (MAVLink.MAV_PROTOCOL_CAPABILITY)version.capabilities;
+                            capabilities = (uint)(MAVLink.MAV_PROTOCOL_CAPABILITY)version.capabilities;
                         }
                         catch
                         {
@@ -1759,11 +1759,10 @@ public void UpdateCurrentSettings(System.Windows.Forms.BindingSource bs, bool up
 
                         try
                         {
-                            voltageflag = (MAVLink.MAV_POWER_STATUS) power.flags;
+                            voltageflag = (uint)((MAVLink.MAV_POWER_STATUS) power.flags);
                         }
                         catch
                         {
-
                         }
                     }
 

diff --git a/ExtLibs/BSE.Windows.Forms/BSE.Windows.Forms.csproj b/ExtLibs/BSE.Windows.Forms/BSE.Windows.Forms.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -36,9 +36,10 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>