Merge master into develop and other changes for X-Plane 12 compatibility

.gitignore

@@ -94,3 +94,6 @@ out/
 #################
 Docs/~$Capability Matrix.xlsx
 *.xpl
+*.egg-info
+build
+dist

setup.py

@@ -0,0 +1,18 @@
+from setuptools import setup, find_packages
+
+
+setup(
+    name="xplaneconnect",
+    version="1.3rc6",
+    python_requires=">=3",
+    packages=find_packages("Python3/src"),
+    package_dir={"": "Python3/src"},
+    description="XPlaneConnect (XPC) facilitates communication to and from the XPCPlugin. Note: To use the XPC package, you must first install the XPCPlugin. See https://github.com/nasa/XPlaneConnect/wiki/Getting-Started for instructions on installing the XPCPlugin",
+    url="https://github.com/nasa/XPlaneConnect/",
+    project_urls={
+        "Bug Reports": "https://github.com/nasa/xplaneconnect/issues",
+        "Organization": "https://www.nasa.gov/content/diagnostics-prognostics",
+        "Source": "https://github.com/nasa/xplaneconnect",
+        "Documentation": "https://github.com/nasa/XPlaneConnect/wiki"
+    }
+)

xpcPlugin/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(SDK/CHeaders/XPLM)
 include_directories(../C/src)
 
-add_definitions(-DXPLM200 -DLIN=1)
+add_definitions(-DXPLM400 -DXPLM303 -DXPLM302 -DXPLM301 -DXPLM300 -DXPLM210 -DXPLM200 -DLIN=1)
 
 SET(CMAKE_C_COMPILER gcc)
 SET(CMAKE_CXX_COMPILER g++)
@@ -16,6 +16,7 @@ SET(XPC_OUTPUT_DIR "XPlaneConnect")
 SET(XPC_OUTPUT_NAME "lin")
 
 add_library(xpc64 SHARED XPCPlugin.cpp
+	CameraCallbacks.cpp
 	DataManager.cpp
 	Drawing.cpp
 	Log.cpp
@@ -29,6 +30,7 @@ set_target_properties(xpc64 PROPERTIES OUTPUT_NAME ${XPC_OUTPUT_NAME})
 set_target_properties(xpc64 PROPERTIES COMPILE_FLAGS "-m64 -fno-stack-protector" LINK_FLAGS "-shared -rdynamic -nodefaultlibs -undefined_warning -m64 -fno-stack-protector")
 
 add_library(xpc32 SHARED XPCPlugin.cpp
+	CameraCallbacks.cpp
 	DataManager.cpp
 	Drawing.cpp
 	Log.cpp

xpcPlugin/DataManager.cpp

@@ -99,7 +99,7 @@ namespace XPC
 		drefs.insert(make_pair(DREF_Pitch, XPLMFindDataRef("sim/flightmodel/position/theta")));
 		drefs.insert(make_pair(DREF_Roll, XPLMFindDataRef("sim/flightmodel/position/phi")));
 		drefs.insert(make_pair(DREF_HeadingTrue, XPLMFindDataRef("sim/flightmodel/position/psi")));
-		drefs.insert(make_pair(DREF_HeadingMag, XPLMFindDataRef("sim/flightmodel/position/magpsi")));
+		drefs.insert(make_pair(DREF_HeadingMag, XPLMFindDataRef("sim/flightmodel/position/mag_psi")));
 		drefs.insert(make_pair(DREF_Quaternion, XPLMFindDataRef("sim/flightmodel/position/q")));
 
 		drefs.insert(make_pair(DREF_AngleOfAttack, XPLMFindDataRef("sim/flightmodel/position/alpha")));
@@ -187,11 +187,11 @@ namespace XPC
 			sprintf(multi, "sim/multiplayer/position/plane%i_throttle", i);
 			mdrefs[i][DREF_ThrottleActual] = XPLMFindDataRef(multi);
 			mdrefs[i][DREF_ThrottleSet] = mdrefs[i][DREF_ThrottleActual]; // No throttle set for multiplayer planes.
-			sprintf(multi, "sim/multiplayer/position/plane%i_yolk_pitch", i);
+			sprintf(multi, "sim/multiplayer/controls/yolk_pitch_ratio[%i]", i);
 			mdrefs[i][DREF_YokePitch] = XPLMFindDataRef(multi);
-			sprintf(multi, "sim/multiplayer/position/plane%i_yolk_roll", i);
+			sprintf(multi, "sim/multiplayer/controls/yolk_roll_ratio[%i]", i);
 			mdrefs[i][DREF_YokeRoll] = XPLMFindDataRef(multi);
-			sprintf(multi, "sim/multiplayer/position/plane%i_yolk_yaw", i);
+			sprintf(multi, "sim/multiplayer/controls/yolk_heading_ratio[%i]", i);
 			mdrefs[i][DREF_YokeHeading] = XPLMFindDataRef(multi);
 		}
 

xpcPlugin/Drawing.cpp

@@ -236,7 +236,7 @@ namespace XPC
 		numWaypoints = 0;
 		if (routeEnabled)
 		{
-			XPLMUnregisterDrawCallback(RouteDrawCallback, xplm_Phase_Objects, 0, NULL);
+			XPLMUnregisterDrawCallback(RouteDrawCallback, xplm_Phase_Modern3D, 0, NULL);
 		}
 		return;
 	}
@@ -256,7 +256,7 @@ namespace XPC
 
 		if (!routeEnabled)
 		{
-			XPLMRegisterDrawCallback(RouteDrawCallback, xplm_Phase_Objects, 0, NULL);
+			XPLMRegisterDrawCallback(RouteDrawCallback, xplm_Phase_Modern3D, 0, NULL);
 		}
 		if (!planeXref)
 		{

xpcPlugin/MessageHandlers.cpp

@@ -887,9 +887,10 @@ namespace XPC
 		// get view type
 		int view_type;
 		memcpy(&view_type, buffer + 5, 4);
-
+
+		// Below command has been deprecated.  All view modes can be set by using the MessageHandlers::HandleComm command below.
 		// set view by calling the corresponding key stroke
-		XPLMCommandKeyStroke(view_type);
+		// XPLMCommandKeyStroke(view_type);
 
 
 		VIEW_TYPE viewRunway = VIEW_TYPE::XPC_VIEW_RUNWAY;