Merge branch 'master' of https://github.com/Microsoft/AirSim

modi0012 · Apr 27, 2018 · edd6557 · edd6557
2 parents 4fc9aaa + f96fb66
commit edd6557
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/AirLib/include/api/RpcLibServerBase.hpp b/AirLib/include/api/RpcLibServerBase.hpp
@@ -6,7 +6,7 @@
 
 #include "common/Common.hpp"
 #include "api/ApiServerBase.hpp"
-#include "api/SimModeAPiBase.hpp"
+#include "api/SimModeApiBase.hpp"
 
 
 namespace msr { namespace airlib {

diff --git a/Unreal/Plugins/AirSim/Source/SimHUD/SimHUD.cpp b/Unreal/Plugins/AirSim/Source/SimHUD/SimHUD.cpp
@@ -84,7 +84,7 @@ void ASimHUD::startApiServer()
 #ifdef AIRLIB_NO_RPC
         api_server_.reset(new msr::airlib::DebugApiServer());
 #else
-        api_server_ = std::move(simmode_->createApiServer());
+        api_server_ = simmode_->createApiServer();
 #endif
 
         try {

diff --git a/Unreal/Plugins/AirSim/Source/SimJoyStick/SimJoyStick.cpp b/Unreal/Plugins/AirSim/Source/SimJoyStick/SimJoyStick.cpp
@@ -317,6 +317,19 @@ struct SimJoyStick::impl {
             state.is_valid = false;
     }
 
+
+	void setAutoCenter(unsigned int index, double strength) {
+        unused(index);
+        unused(strength);
+		//TODO: implement this for linux
+	}
+
+	void setWheelRumble(unsigned int index, double strength) {
+        unused(index);
+        unused(strength);
+		//TODO: implement this for linux
+	}
+
     // bool getJoystickInfo(int index, std::string& manufacturerID, std::string& productID, std::string& message)
     // {
     //     manufacturerID = productID = "";

diff --git a/docs/build_linux.md b/docs/build_linux.md
@@ -39,6 +39,17 @@ Finally, you will need an Unreal project that hosts the environment for your veh
 
 ## FAQ
 
+#### I'm getting error "<MyProject> could not be compiled. Try rebuilding from source manually".
+
+This could either happen because of compile error or the fact that your gch files are outdated. Look in to your console window. Do you see something like below?
+```
+fatal errorfatal error: : file  '/usr/include/linux/version.h''/usr/include/linux/version.h'  has  been  modified  since  the  precompiled  header
+```
+
+If this is the case then look for *.gch file(s) that follows after that message, delete them and try again. Here's [relevant thread](https://answers.unrealengine.com/questions/412349/linux-ue4-build-precompiled-header-fatal-error.html) on Unreal Engine forums.
+
+If you see other compile errors in console then open up those source files and see if it is due to changes you made. If not, then report it as issue on GitHub.
+
 #### What are the known issues with Unreal 4.16?
 
 * One of the major issues is [this bug in Unreal](https://answers.unrealengine.com/questions/664905/unreal-crashes-on-two-lines-of-extremely-simple-st.html). We have a workaround for some parts of the code but we haven't tested if everything is covered.