From fdc405e9dda1633910891976eedd1926a45a9fc6 Mon Sep 17 00:00:00 2001 From: Adam Erickson Date: Mon, 10 Jun 2024 15:11:14 -0700 Subject: [PATCH] update versions, paths --- AutonomySim.sln | 26 +- MavLinkCom/MavLinkCom.vcxproj | 1172 ++++++++--------- MavLinkCom/MavLinkCom.vcxproj.filters | 498 ++++--- MavLinkCom/README.md | 2 +- MavLinkCom/runsdvui.cmd | 4 +- MavLinkCom/src/MavLinkMessageBase.cpp | 4 +- MavLinkCom/src/Semaphore.cpp | 2 +- MavLinkCom/src/impl/AdHocConnectionImpl.cpp | 4 +- MavLinkCom/src/impl/AdHocConnectionImpl.hpp | 2 +- MavLinkCom/src/impl/MavLinkConnectionImpl.cpp | 4 +- MavLinkCom/src/impl/MavLinkConnectionImpl.hpp | 2 +- MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp | 4 +- MavLinkCom/src/impl/MavLinkNodeImpl.cpp | 4 +- MavLinkCom/src/impl/MavLinkVehicleImpl.cpp | 2 +- MavLinkCom/src/impl/MavLinkVehicleImpl.hpp | 2 +- .../src/impl/MavLinkVideoStreamImpl.cpp | 2 +- MavLinkCom/src/impl/UdpSocketImpl.hpp | 2 +- .../src/impl/linux/MavLinkFindSerialPorts.cpp | 2 +- MavLinkCom/src/serial_com/SerialPort.cpp | 2 +- MavLinkCom/src/serial_com/SerialPort.hpp | 2 +- MavLinkCom/src/serial_com/SocketInit.cpp | 2 +- MavLinkCom/src/serial_com/TcpClientPort.cpp | 2 +- MavLinkCom/src/serial_com/UdpClientPort.cpp | 2 +- MavLinkCom/src/serial_com/wifi.cpp | 2 +- scripts/mod_cmake.psm1 | 2 +- scripts/mod_eigen.psm1 | 2 +- scripts/mod_unreal.psm1 | 2 +- scripts/mod_unreal_env.psm1 | 2 +- 28 files changed, 851 insertions(+), 907 deletions(-) diff --git a/AutonomySim.sln b/AutonomySim.sln index a0df6971..85f334ad 100644 --- a/AutonomySim.sln +++ b/AutonomySim.sln @@ -8,18 +8,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore .gitmodules = .gitmodules .travis.yml = .travis.yml - LICENSE = LICENSE - README.md = README.md scripts\build.ps1 = scripts\build.ps1 scripts\build.sh = scripts\build.sh + scripts\build_docs.ps1 = scripts\build_docs.ps1 scripts\clean.ps1 = scripts\clean.ps1 scripts\clean.sh = scripts\clean.sh + scripts\clean_rebuild.ps1 = scripts\clean_rebuild.ps1 + scripts\format_cpp.ps1 = scripts\format_cpp.ps1 + scripts\format_powershell.ps1 = scripts\format_powershell.ps1 + scripts\git_commit_all.ps1 = scripts\git_commit_all.ps1 + LICENSE = LICENSE + scripts\mod_cmake.psm1 = scripts\mod_cmake.psm1 + scripts\mod_docs.psm1 = scripts\mod_docs.psm1 + scripts\mod_eigen.psm1 = scripts\mod_eigen.psm1 + scripts\mod_format.psm1 = scripts\mod_format.psm1 + scripts\mod_rpclib.psm1 = scripts\mod_rpclib.psm1 + scripts\mod_unreal.psm1 = scripts\mod_unreal.psm1 + scripts\mod_unreal_env.psm1 = scripts\mod_unreal_env.psm1 + scripts\mod_utils.psm1 = scripts\mod_utils.psm1 + scripts\mod_visualstudio.psm1 = scripts\mod_visualstudio.psm1 + README.md = README.md + scripts\rename_recursive.ps1 = scripts\rename_recursive.ps1 scripts\setup.sh = scripts\setup.sh - scripts\test_cmake.psm1 = scripts\test_cmake.psm1 - scripts\test_eigen.psm1 = scripts\test_eigen.psm1 - scripts\test_rpclib.psm1 = scripts\test_rpclib.psm1 - scripts\test_unrealasset.psm1 = scripts\test_unrealasset.psm1 - scripts\test_visualstudio.psm1 = scripts\test_visualstudio.psm1 + scripts\update_python_package.cmd = scripts\update_python_package.cmd + scripts\update_python_package.ps1 = scripts\update_python_package.ps1 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutonomyLib", "AutonomyLib\AutonomyLib.vcxproj", "{4BFB7231-077A-4671-BD21-D3ADE3EA36E7}" diff --git a/MavLinkCom/MavLinkCom.vcxproj b/MavLinkCom/MavLinkCom.vcxproj index 57a9b485..1ae46a34 100644 --- a/MavLinkCom/MavLinkCom.vcxproj +++ b/MavLinkCom/MavLinkCom.vcxproj @@ -1,607 +1,569 @@  - - - - true - v143 - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - RelWithDebInfo - ARM - - - RelWithDebInfo - Win32 - - - RelWithDebInfo - x64 - - - - {8510C7A4-BF63-41D2-94F6-D8731D137A5A} - Win32Proj - PX4_P - MavLinkCom - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - false - Unicode - - - StaticLibrary - false - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - true - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - true - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - false - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - false - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - $(ProjectDir)lib\$(Platform)\$(Configuration)\ - false - $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ - - - - - Level3 - Disabled - _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - common\utils;include - true - true - stdcpp17 - - - Console - true - %(AdditionalDependencies) - - - - - - - true - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - - Level3 - Disabled - ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - common\utils;include - true - true - - - Console - true - %(AdditionalDependencies) - - - - - - - true - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - - Level3 - Disabled - _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - common\utils;include - true - true - stdcpp17 - - - Console - true - %(AdditionalDependencies) - - - - - - - $(BOOST_ROOT)\stage\lib - - %(AdditionalOptions) /machine:x64 - - - true - - - false - - - - - Level3 - - MaxSpeed - true - true - _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - stdcpp17 - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - Level3 - - Disabled - true - true - _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - stdcpp17 - false - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - Level3 - - MaxSpeed - true - true - ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - Level3 - - Disabled - true - true - ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - false - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - $(BOOST_ROOT)\stage\lib - - - - false - - - - - Level3 - - MaxSpeed - true - true - _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - true - stdcpp17 - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - true - - - $(BOOST_ROOT)\stage\lib - - false - %(AdditionalOptions) /machine:x64 - - - false - - - - - Level3 - - Disabled - true - true - _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - MultiThreadedDLL - common\utils;include - true - true - stdcpp17 - - - Console - true - true - true - %(AdditionalDependencies) - - - - - - - true - - - $(BOOST_ROOT)\stage\lib - - false - %(AdditionalOptions) /machine:x64 - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + true + v143 + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + RelWithDebInfo + ARM + + + RelWithDebInfo + Win32 + + + RelWithDebInfo + x64 + + + + {8510C7A4-BF63-41D2-94F6-D8731D137A5A} + Win32Proj + PX4_P + MavLinkCom + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + false + Unicode + + + StaticLibrary + false + false + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + true + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + false + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + $(ProjectDir)lib\$(Platform)\$(Configuration)\ + false + $(ProjectDir)temp\$(ProjectName)\$(Platform)\$(Configuration)\ + + + + + Level3 + Disabled + _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + common\utils;include + true + true + stdcpp17 + + + Console + true + %(AdditionalDependencies) + + + + + + + true + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + + Level3 + Disabled + ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + common\utils;include + true + true + + + Console + true + %(AdditionalDependencies) + + + + + + + true + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + + Level3 + Disabled + _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + common\utils;include;%(AdditionalIncludeDirectories) + true + true + stdcpp17 + + + Console + true + %(AdditionalDependencies) + + + + + + + $(BOOST_ROOT)\stage\lib + + %(AdditionalOptions) /machine:x64 + + + true + + + false + + + + + Level3 + + MaxSpeed + true + true + _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + stdcpp17 + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + Level3 + + Disabled + true + true + _WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + stdcpp17 + false + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + Level3 + + MaxSpeed + true + true + ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + Level3 + + Disabled + true + true + ONECORE;_WIN32_WINNT=0x0600;_WIN32;WIN32;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + false + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + $(BOOST_ROOT)\stage\lib + + + + false + + + + + Level3 + + MaxSpeed + true + true + _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + true + stdcpp17 + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + true + + + $(BOOST_ROOT)\stage\lib + + false + %(AdditionalOptions) /machine:x64 + + + false + + + + + Level3 + + Disabled + true + true + _WIN32;_WIN32_WINNT=0x0600;NOMINMAX;VC_EXTRALEAN;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + common\utils;include + true + true + stdcpp17 + + + Console + true + true + true + %(AdditionalDependencies) + + + + + + + true + + + $(BOOST_ROOT)\stage\lib + + false + %(AdditionalOptions) /machine:x64 + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MavLinkCom/MavLinkCom.vcxproj.filters b/MavLinkCom/MavLinkCom.vcxproj.filters index e722162a..10f8a80f 100644 --- a/MavLinkCom/MavLinkCom.vcxproj.filters +++ b/MavLinkCom/MavLinkCom.vcxproj.filters @@ -1,266 +1,236 @@  - - - - src - - - src\impl - - - src\impl - - - src\impl - - - src\impl - - - src\impl - - - src\impl - - - serial_com - - - serial_com - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - common\utils - - - common\utils - - - serial_com - - - serial_com - - - src - - - serial_com - - - src\impl\onecore - - - src\impl\windows - - - - - - - - - Mavlink - - - Mavlink - - - Mavlink - - - Mavlink - - - Mavlink - - - Mavlink - - - common\utils - - - common\utils - - - common\utils - - - Mavlink - - - common\utils - - - common\utils - - - common\utils - - - Mavlink - - - common\utils - - - Mavlink - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - src\impl - - - src\impl - - - src\impl - - - src\impl - - - src\impl - - - serial_com - - - serial_com - - - serial_com - - - common\utils - - - common\utils - - - common\utils - - - serial_com - - - serial_com - - - include - - - serial_com - - - common\utils - - - src\impl - - - - - - - - - - {0d3293cf-400d-4a27-87ee-13f7d3f9f0b7} - mavlink/* - - - {be5b8d3a-d06c-43f0-8b55-f2bcd5661cf6} - - - {341c5925-dfe2-4c6a-8fa7-143feff52361} - - - {44faf97a-bf1d-413d-8f0f-4e75f882cfd9} - Design/* - - - {1dd05faf-854a-4a9e-abc5-e6b6106ac108} - - - {2f07994d-eaf6-4ebb-b8ef-9732814ea0bb} - - - {8390030e-8792-43bf-80ed-69b4530b61fb} - - - {4ee25053-206a-4174-99cb-5fb278fc5079} - - - {7b6dab75-eedb-4b36-a3a3-ea8c30b4a412} - - - - - Design - - - Design - - - Design - - + + + + src + + + src\impl + + + src\impl + + + src\impl + + + src\impl + + + src\impl + + + src\impl + + + serial_com + + + serial_com + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + serial_com + + + serial_com + + + src + + + serial_com + + + src\impl\onecore + + + src\impl\windows + + + + + + + + + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + Mavlink + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + src\impl + + + src\impl + + + src\impl + + + src\impl + + + src\impl + + + serial_com + + + serial_com + + + serial_com + + + serial_com + + + serial_com + + + include + + + serial_com + + + src\impl + + + + + + + + + + + + + + + + + + + + + {0d3293cf-400d-4a27-87ee-13f7d3f9f0b7} + mavlink/* + + + {341c5925-dfe2-4c6a-8fa7-143feff52361} + + + {44faf97a-bf1d-413d-8f0f-4e75f882cfd9} + Design/* + + + {1dd05faf-854a-4a9e-abc5-e6b6106ac108} + + + {2f07994d-eaf6-4ebb-b8ef-9732814ea0bb} + + + {8390030e-8792-43bf-80ed-69b4530b61fb} + + + {4ee25053-206a-4174-99cb-5fb278fc5079} + + + {7b6dab75-eedb-4b36-a3a3-ea8c30b4a412} + + + + + Design + + + Design + + + Design + + \ No newline at end of file diff --git a/MavLinkCom/README.md b/MavLinkCom/README.md index a73eaa8b..204d5e73 100644 --- a/MavLinkCom/README.md +++ b/MavLinkCom/README.md @@ -1,3 +1,3 @@ # Welcome to MavLinkCom -This page has moved [here](https://github.com/nervosys/AutonomySim/blob/master/docs/mavlink_comm.md). \ No newline at end of file +This page has moved [here](https://github.com/nervosys/AutonomySim/blob/master/docs/mavlink_comm.md). diff --git a/MavLinkCom/runsdvui.cmd b/MavLinkCom/runsdvui.cmd index 8068d1ec..6f85c68d 100644 --- a/MavLinkCom/runsdvui.cmd +++ b/MavLinkCom/runsdvui.cmd @@ -1,2 +1,2 @@ -cd /d "D:\git\theseus\catkin_ws\src\AutonomySim\MavLinkCom" &msbuild "MavLinkCom.vcxproj" /t:sdvViewer /p:configuration="Debug" /p:platform=x64 -exit %errorlevel% \ No newline at end of file +cd /d "C:\catkin_ws\src\AutonomySim\MavLinkCom" &msbuild "MavLinkCom.vcxproj" /t:sdvViewer /p:configuration="Debug" /p:platform=x64 +exit %errorlevel% \ No newline at end of file diff --git a/MavLinkCom/src/MavLinkMessageBase.cpp b/MavLinkCom/src/MavLinkMessageBase.cpp index f513161f..b489f1f7 100644 --- a/MavLinkCom/src/MavLinkMessageBase.cpp +++ b/MavLinkCom/src/MavLinkMessageBase.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. -#include "common/utils/StrictMode.hpp" +#include "../common/utils/StrictMode.hpp" STRICT_MODE_OFF #define MAVLINK_PACKED @@ -12,7 +12,7 @@ STRICT_MODE_ON #include "MavLinkConnection.hpp" #include "MavLinkMessageBase.hpp" -#include "common/utils/Utils.hpp" +#include "../common/utils/Utils.hpp" #include #include diff --git a/MavLinkCom/src/Semaphore.cpp b/MavLinkCom/src/Semaphore.cpp index 251dfadd..85693b2e 100644 --- a/MavLinkCom/src/Semaphore.cpp +++ b/MavLinkCom/src/Semaphore.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "Semaphore.hpp" -#include "common/utils/Utils.hpp" +#include "../common/utils/Utils.hpp" using namespace mavlink_utils; diff --git a/MavLinkCom/src/impl/AdHocConnectionImpl.cpp b/MavLinkCom/src/impl/AdHocConnectionImpl.cpp index 6da19883..55f4e343 100644 --- a/MavLinkCom/src/impl/AdHocConnectionImpl.cpp +++ b/MavLinkCom/src/impl/AdHocConnectionImpl.cpp @@ -6,8 +6,8 @@ #include "../serial_com/SerialPort.hpp" #include "../serial_com/TcpClientPort.hpp" #include "../serial_com/UdpClientPort.hpp" -#include "common/utils/ThreadUtils.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/ThreadUtils.hpp" +#include "../../common/utils/Utils.hpp" using namespace mavlink_utils; using namespace mavlinkcom_impl; diff --git a/MavLinkCom/src/impl/AdHocConnectionImpl.hpp b/MavLinkCom/src/impl/AdHocConnectionImpl.hpp index 58383dd3..9e0c9d4f 100644 --- a/MavLinkCom/src/impl/AdHocConnectionImpl.hpp +++ b/MavLinkCom/src/impl/AdHocConnectionImpl.hpp @@ -14,7 +14,7 @@ // #include "MavLinkMessageBase.hpp" #include "../serial_com/TcpClientPort.hpp" #include "Semaphore.hpp" -#include "common/utils/StrictMode.hpp" +#include "../../common/utils/StrictMode.hpp" #define MAVLINK_PACKED STRICT_MODE_OFF diff --git a/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp b/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp index 55b85a8c..9acf33fd 100644 --- a/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp +++ b/MavLinkCom/src/impl/MavLinkConnectionImpl.cpp @@ -7,8 +7,8 @@ #include "../serial_com/TcpClientPort.hpp" #include "../serial_com/UdpClientPort.hpp" #include "MavLinkMessages.hpp" -#include "common/utils/ThreadUtils.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/ThreadUtils.hpp" +#include "../../common/utils/Utils.hpp" using namespace mavlink_utils; using namespace mavlinkcom_impl; diff --git a/MavLinkCom/src/impl/MavLinkConnectionImpl.hpp b/MavLinkCom/src/impl/MavLinkConnectionImpl.hpp index e94c41db..9f510eaa 100644 --- a/MavLinkCom/src/impl/MavLinkConnectionImpl.hpp +++ b/MavLinkCom/src/impl/MavLinkConnectionImpl.hpp @@ -8,7 +8,7 @@ #include "MavLinkConnection.hpp" #include "MavLinkMessageBase.hpp" #include "Semaphore.hpp" -#include "common/utils/StrictMode.hpp" +#include "../../common/utils/StrictMode.hpp" #include #include #include diff --git a/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp b/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp index 63cd72a5..88ac1cc7 100644 --- a/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp +++ b/MavLinkCom/src/impl/MavLinkFtpClientImpl.cpp @@ -2,8 +2,8 @@ // Licensed under the MIT License. #include "MavLinkFtpClientImpl.hpp" -#include "common/utils/FileSystem.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/FileSystem.hpp" +#include "../../common/utils/Utils.hpp" #include #include diff --git a/MavLinkCom/src/impl/MavLinkNodeImpl.cpp b/MavLinkCom/src/impl/MavLinkNodeImpl.cpp index 7af0dcd3..e0a0c40e 100644 --- a/MavLinkCom/src/impl/MavLinkNodeImpl.cpp +++ b/MavLinkCom/src/impl/MavLinkNodeImpl.cpp @@ -4,8 +4,8 @@ #include "MavLinkNodeImpl.hpp" #include "MavLinkMessages.hpp" #include "Semaphore.hpp" -#include "common/utils/ThreadUtils.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/ThreadUtils.hpp" +#include "../../common/utils/Utils.hpp" using namespace mavlink_utils; using namespace mavlinkcom_impl; diff --git a/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp b/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp index 5ea8286d..50becef4 100644 --- a/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp +++ b/MavLinkCom/src/impl/MavLinkVehicleImpl.cpp @@ -5,7 +5,7 @@ #include "../serial_com/SerialPort.hpp" #include "../serial_com/UdpClientPort.hpp" #include "MavLinkConnection.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #include diff --git a/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp b/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp index d33b4770..c605c11c 100644 --- a/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp +++ b/MavLinkCom/src/impl/MavLinkVehicleImpl.hpp @@ -9,7 +9,7 @@ #include "MavLinkMessages.hpp" #include "MavLinkNodeImpl.hpp" #include "VehicleState.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include "../serial_com/Port.h" #include "AsyncResult.hpp" diff --git a/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp b/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp index 13fa3481..09c3c749 100644 --- a/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp +++ b/MavLinkCom/src/impl/MavLinkVideoStreamImpl.cpp @@ -3,7 +3,7 @@ #include "MavLinkVideoStreamImpl.hpp" #include "MavLinkMessages.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #define PACKET_PAYLOAD 253 // hard coded in MavLink code - do not change diff --git a/MavLinkCom/src/impl/UdpSocketImpl.hpp b/MavLinkCom/src/impl/UdpSocketImpl.hpp index 1566897f..b0d01255 100644 --- a/MavLinkCom/src/impl/UdpSocketImpl.hpp +++ b/MavLinkCom/src/impl/UdpSocketImpl.hpp @@ -2,7 +2,7 @@ #define MavLinkCom_UdpSocketImpl_hpp #include "UdpSocket.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" // common/utils/Utils.hpp #ifdef _WIN32 // windows #ifndef WIN32_LEAN_AND_MEAN diff --git a/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp b/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp index af65751a..cf86bbb9 100644 --- a/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp +++ b/MavLinkCom/src/impl/linux/MavLinkFindSerialPorts.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "MavLinkConnection.hpp" -#include "common/utils/Utils.hpp" +#include "../../../common/utils/Utils.hpp" #include #include diff --git a/MavLinkCom/src/serial_com/SerialPort.cpp b/MavLinkCom/src/serial_com/SerialPort.cpp index 876eb104..b888be53 100644 --- a/MavLinkCom/src/serial_com/SerialPort.cpp +++ b/MavLinkCom/src/serial_com/SerialPort.cpp @@ -5,7 +5,7 @@ #ifdef _WIN32 #include "Windows.h" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #include #include diff --git a/MavLinkCom/src/serial_com/SerialPort.hpp b/MavLinkCom/src/serial_com/SerialPort.hpp index 8826c07b..48724333 100644 --- a/MavLinkCom/src/serial_com/SerialPort.hpp +++ b/MavLinkCom/src/serial_com/SerialPort.hpp @@ -5,7 +5,7 @@ #define SERIAL_COM_SERIALPORT_HPP #include "Port.h" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #include diff --git a/MavLinkCom/src/serial_com/SocketInit.cpp b/MavLinkCom/src/serial_com/SocketInit.cpp index 54a704fc..ce84d926 100644 --- a/MavLinkCom/src/serial_com/SocketInit.cpp +++ b/MavLinkCom/src/serial_com/SocketInit.cpp @@ -2,7 +2,7 @@ // Licensed under the MIT License. #include "SocketInit.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #ifdef _WIN32 diff --git a/MavLinkCom/src/serial_com/TcpClientPort.cpp b/MavLinkCom/src/serial_com/TcpClientPort.cpp index f34ed0b2..ce78c005 100644 --- a/MavLinkCom/src/serial_com/TcpClientPort.cpp +++ b/MavLinkCom/src/serial_com/TcpClientPort.cpp @@ -3,7 +3,7 @@ #include "TcpClientPort.hpp" #include "SocketInit.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include "wifi.h" #include #include diff --git a/MavLinkCom/src/serial_com/UdpClientPort.cpp b/MavLinkCom/src/serial_com/UdpClientPort.cpp index 30321ecb..fb1c5e7d 100644 --- a/MavLinkCom/src/serial_com/UdpClientPort.cpp +++ b/MavLinkCom/src/serial_com/UdpClientPort.cpp @@ -3,7 +3,7 @@ #include "UdpClientPort.hpp" #include "SocketInit.hpp" -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include "wifi.h" #include #include diff --git a/MavLinkCom/src/serial_com/wifi.cpp b/MavLinkCom/src/serial_com/wifi.cpp index 94082216..259bcf84 100644 --- a/MavLinkCom/src/serial_com/wifi.cpp +++ b/MavLinkCom/src/serial_com/wifi.cpp @@ -3,7 +3,7 @@ #if defined(linux) | defined(__linux) -#include "common/utils/Utils.hpp" +#include "../../common/utils/Utils.hpp" #include #include #include diff --git a/scripts/mod_cmake.psm1 b/scripts/mod_cmake.psm1 index 31a2f5e8..c4b7658b 100644 --- a/scripts/mod_cmake.psm1 +++ b/scripts/mod_cmake.psm1 @@ -27,7 +27,7 @@ Import-Module "${SCRIPT_DIR}\mod_utils.psm1" ### Variables ### -[Version]$CMAKE_VERSION = '3.29.2' +[Version]$CMAKE_VERSION = '3.29.5' [Version]$CMAKE_VERSION_MINIMUM = '3.14' ### diff --git a/scripts/mod_eigen.psm1 b/scripts/mod_eigen.psm1 index a3a2eaae..651838b5 100644 --- a/scripts/mod_eigen.psm1 +++ b/scripts/mod_eigen.psm1 @@ -27,7 +27,7 @@ Import-Module "${SCRIPT_DIR}\mod_utils.psm1" ### Variables ### -[String]$EIGEN_VERSION = '3.3.7' +[String]$EIGEN_VERSION = '3.4.0' [String]$EIGEN_DIR = '.\AutonomyLib\deps\eigen3' [String]$EIGEN_URL = "https://gitlab.com/libeigen/eigen/-/archive/${EIGEN_VERSION}/eigen-${EIGEN_VERSION}.zip" diff --git a/scripts/mod_unreal.psm1 b/scripts/mod_unreal.psm1 index adbe950a..5ff3d0a0 100644 --- a/scripts/mod_unreal.psm1 +++ b/scripts/mod_unreal.psm1 @@ -30,7 +30,7 @@ Import-Module "${SCRIPT_DIR}\mod_unreal_env.psm1" ### Variables ### -[Version]$UNREAL_VERSION = '5.3' +[Version]$UNREAL_VERSION = '5.4' [Version]$UNREAL_ASSET_VERSION = '1.2.0' [String]$UNREAL_ASSET_VERSION_STRING = Get-VersionMajorMinorBuild -Version $UNREAL_ASSET_VERSION diff --git a/scripts/mod_unreal_env.psm1 b/scripts/mod_unreal_env.psm1 index bb32f4b8..dc1763b0 100644 --- a/scripts/mod_unreal_env.psm1 +++ b/scripts/mod_unreal_env.psm1 @@ -31,7 +31,7 @@ Import-Module "${SCRIPT_DIR}\mod_utils.psm1" ### Variables ### -[Version]$UNREAL_VERSION = '5.3' +[Version]$UNREAL_VERSION = '5.4' ### ### Functions