Merge branch 'master' into develop

Author: NPrincen

.gitignore

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

Python3/src/xpc.py Python3/src/xpc/__init__.pyPython3/src/xpc.py renamed to Python3/src/xpc/__init__.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"
+    }
+)

setup.py

@@ -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