UE5.3

AirLib/AirLib.vcxproj

@@ -304,8 +304,8 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 /w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -329,8 +329,8 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 /w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4100;4505;4820;4464;4514;4710;4571;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -357,8 +357,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 /w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
@@ -386,8 +386,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 /w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
@@ -464,8 +464,14 @@
     <Lib>
       <AdditionalLibraryDirectories>deps\rpclib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
     </Lib>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

AirSim.props

@@ -1,6 +1,18 @@
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <AirSimTargetPlatformVersion>$([System.String]::Copy('$(WindowsSDKVersion)').Replace('\',''))</AirSimTargetPlatformVersion>
+    <AirSimTargetPlatformVersion>$([System.String]::Copy('$(WindowsSDKVersion)').Replace('\\',''))</AirSimTargetPlatformVersion>
     <WindowsTargetPlatformVersion>$(AirSimTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
-</Project>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/utf-8 /wd4819 /wd4828 /wd4127 /WX- %(AdditionalOptions)</AdditionalOptions>
+      <TreatWarningAsError>false</TreatWarningAsError>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>

DroneServer/DroneServer.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)\AirSim.props" />
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AirSim.props))\AirSim.props" />
   <PropertyGroup>
     <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
@@ -277,4 +277,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

HelloSpawnedDrones/HelloSpawnedDrones.vcxproj

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AirSim.props))\AirSim.props" />
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -253,4 +257,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

MavLinkCom/src/impl/AdHocConnectionImpl.cpp

@@ -1,7 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "AdHocConnectionImpl.hpp"
+#include "AdHocConnectionImpl.hpp"
+#if defined(_WIN32)
+#include <Windows.h>
+#define AIRSIM_SLEEP_MS(ms) ::Sleep((DWORD)(ms))
+#else
+#include <thread>
+#include <chrono>
+#define AIRSIM_SLEEP_MS(ms) std::this_thread::sleep_for(std::chrono::milliseconds(ms))
+#endif
 #include "Utils.hpp"
 #include "ThreadUtils.hpp"
 #include "../serial_com/Port.h"
@@ -184,14 +192,14 @@ void AdHocConnectionImpl::readPackets()
         int read = 0;
         if (safePort->isClosed()) {
             // hmmm, wait till it is opened?
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            AIRSIM_SLEEP_MS(10);
             continue;
         }
 
         int count = safePort->read(buffer, MAXBUFFER);
         if (count <= 0) {
             // error? well let's try again, but we should be careful not to spin too fast and kill the CPU
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            AIRSIM_SLEEP_MS(1);
             continue;
         }
 
@@ -200,7 +208,7 @@ void AdHocConnectionImpl::readPackets()
             std::cerr << "GAH KM911 message size (" << std::to_string(count) << ") is bigger than max buffer size! Time to support frame breaks, Moffitt" << std::endl;
 
             // error? well let's try again, but we should be careful not to spin too fast and kill the CPU
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            AIRSIM_SLEEP_MS(1);
             continue;
         }
 

MavLinkCom/src/impl/MavLinkConnectionImpl.cpp

@@ -1,7 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "MavLinkMessages.hpp"
+#include "MavLinkMessages.hpp"
+#if defined(_WIN32)
+#include <Windows.h>
+#define AIRSIM_SLEEP_MS(ms) ::Sleep((DWORD)(ms))
+#else
+#include <thread>
+#include <chrono>
+#define AIRSIM_SLEEP_MS(ms) std::this_thread::sleep_for(std::chrono::milliseconds(ms))
+#endif
 #include "MavLinkConnectionImpl.hpp"
 #include "Utils.hpp"
 #include "ThreadUtils.hpp"
@@ -417,14 +425,14 @@ void MavLinkConnectionImpl::readPackets()
         int read = 0;
         if (safePort->isClosed()) {
             // hmmm, wait till it is opened?
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+            AIRSIM_SLEEP_MS(10);
             continue;
         }
 
         int count = safePort->read(buffer, MAXBUFFER);
         if (count <= 0) {
             // error? well let's try again, but we should be careful not to spin too fast and kill the CPU
-            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            AIRSIM_SLEEP_MS(1);
             continue;
         }
         for (int i = 0; i < count; i++) {

MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp

@@ -1,7 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "MavLinkFtpClientImpl.hpp"
+#include "MavLinkFtpClientImpl.hpp"
+#if defined(_WIN32)
+#include <Windows.h>
+#define AIRSIM_SLEEP_MS(ms) ::Sleep((DWORD)(ms))
+#else
+#include <thread>
+#include <chrono>
+#define AIRSIM_SLEEP_MS(ms) std::this_thread::sleep_for(std::chrono::milliseconds(ms))
+#endif
 #include <mutex>
 #include "Utils.hpp"
 #include "FileSystem.hpp"

MavLinkCom/src/impl/MavLinkNodeImpl.cpp

@@ -1,7 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "MavLinkNodeImpl.hpp"
+#include "MavLinkNodeImpl.hpp"
+#if defined(_WIN32)
+#include <Windows.h>
+#define AIRSIM_SLEEP_MS(ms) ::Sleep((DWORD)(ms))
+#else
+#include <thread>
+#include <chrono>
+#define AIRSIM_SLEEP_MS(ms) std::this_thread::sleep_for(std::chrono::milliseconds(ms))
+#endif
 #include "Utils.hpp"
 #include "MavLinkMessages.hpp"
 #include "Semaphore.hpp"
@@ -50,7 +58,7 @@ void MavLinkNodeImpl::sendHeartbeat()
     CurrentThread::setThreadName("MavLinkThread");
     while (heartbeat_running_) {
         sendOneHeartbeat();
-        std::this_thread::sleep_for(std::chrono::milliseconds(heartbeatMilliseconds));
+        AIRSIM_SLEEP_MS(heartbeatMilliseconds);
     }
 }
 

Unreal/Environments/Blocks/.vsconfig

@@ -0,0 +1,13 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.Net.Component.4.6.2.TargetingPack",
+    "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22000",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Workload.NativeDesktop",
+    "Microsoft.VisualStudio.Workload.NativeGame"
+  ]
+}

Unreal/Environments/Blocks/Blocks.uproject

@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.27",
+	"EngineAssociation": "5.3",
 	"Category": "",
 	"Description": "",
 	"Modules": [

Unreal/Environments/Blocks/Config/DefaultEngine.ini

@@ -68,4 +68,17 @@ AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
 PhysXTreeRebuildRate=10
 
+[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
+bEnablePlugin=True
+bAllowNetworkConnection=True
+SecurityToken=8FCD42D14CD8D84835C46FB037E7C701
+bIncludeInShipping=False
+bAllowExternalStartInShipping=False
+bCompileAFSProject=False
+bUseCompression=False
+bLogFiles=False
+bReportStats=False
+ConnectionType=USBOnly
+bUseManualIPAddress=False
+ManualIPAddress=