diff --git a/C/User Guide (C).txt b/C/User Guide (C).txt index 3b661e3..882905a 100644 --- a/C/User Guide (C).txt +++ b/C/User Guide (C).txt @@ -1,5 +1,4 @@ X-Plane Connect-C (XPC-C) Readme -XPC-C V0.22 May 21, 2014 DESCRIPTION XPC-C is a series of C functions that facilitate communication with X-Plane. @@ -187,11 +186,3 @@ PLANNED FUNCTIONS ----------------------------------- CONTACT Email Christopher Teubert (christopher.a.teubert@nasa.gov) with any questions. - ------------------------------------ -VERSION HISTORY - 2014.05.23 (V0.22): (CT) Combined request/readDREF - 2014.05.21 (V0.21): (CT) Initial Version - -CONTRIBUTORS - CT: Christopher Teubert (christopher.a.teubert@nasa.gov) diff --git a/C/src/xplaneConnect.c b/C/src/xplaneConnect.c index 466c530..c89f487 100644 --- a/C/src/xplaneConnect.c +++ b/C/src/xplaneConnect.c @@ -1,5 +1,5 @@ // -// xPlaneConnect.c Version 0.25 Beta +// xPlaneConnect.c Beta // // DESCRIPTION // XPLANECONNECT (XPC) Facilitates Communication to and from the XPCPlugin diff --git a/MATLAB/+XPlaneConnect/clearUDPBuffer.m b/MATLAB/+XPlaneConnect/clearUDPBuffer.m index 894f248..8237bd5 100644 --- a/MATLAB/+XPlaneConnect/clearUDPBuffer.m +++ b/MATLAB/+XPlaneConnect/clearUDPBuffer.m @@ -1,7 +1,6 @@ function socket = clearUDPBuffer(socket,varargin) % clearUDPBuffer Script that clears an UDP Socket Buffer by closing and % reopening the socket -% Version 0.25 % % Inputs % Socket: UDP Socket to be cleared @@ -14,12 +13,6 @@ function socket = clearUDPBuffer(socket,varargin) % 2. Socket = openUDP(49005); % 3. Socket = clearUDPBuffer(Socket); % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] Added Versioning -% 09/12/13: [CT] Add optional arguments -% 09/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/closeUDP.m b/MATLAB/+XPlaneConnect/closeUDP.m index 69a8128..404cef8 100644 --- a/MATLAB/+XPlaneConnect/closeUDP.m +++ b/MATLAB/+XPlaneConnect/closeUDP.m @@ -1,6 +1,5 @@ function [socket] = closeUDP(socket) % closeUDP Script that closes a UDP Socket -% Version 0.25 % % Inputs % Socket: UDP Socket to be closed @@ -13,11 +12,6 @@ function [socket] = closeUDP(socket) % 2. Socket = openUDP(49005); % 3. Status = closeUDP(Socket); % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Added Versioning -% 09/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/openUDP.m b/MATLAB/+XPlaneConnect/openUDP.m index 560f45a..fba3a71 100644 --- a/MATLAB/+XPlaneConnect/openUDP.m +++ b/MATLAB/+XPlaneConnect/openUDP.m @@ -1,6 +1,5 @@ function [socket] = openUDP(port, varargin) %openUDP Script that opens an UDP Socket -% Version 0.25 % %Inputs % port: UDP Port for socket @@ -14,12 +13,6 @@ function [socket] = openUDP(port, varargin) % or % 2. Socket = openUDP(49005); %Open socket at port 49005 with timeout=0.2 sec % -%Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] Added Versioning -% 09/12/13: [CT] Added optional timeout input argument -% 09/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/pauseSim.m b/MATLAB/+XPlaneConnect/pauseSim.m index 6230501..b6ce717 100644 --- a/MATLAB/+XPlaneConnect/pauseSim.m +++ b/MATLAB/+XPlaneConnect/pauseSim.m @@ -1,6 +1,5 @@ function status = pauseSim( pause, varargin ) %pauseSim pause Simulation -% Version 0.25 % %Inputs % Pause: binary value 0=run, 1=pause @@ -14,10 +13,6 @@ function status = pauseSim( pause, varargin ) % 1. import XPlaneConnect.*; % 2. status = pauseSim(1); % -%Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/19/14: [CT] V0.2: First Created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/readDATA.m b/MATLAB/+XPlaneConnect/readDATA.m index a7bb490..bede1ee 100644 --- a/MATLAB/+XPlaneConnect/readDATA.m +++ b/MATLAB/+XPlaneConnect/readDATA.m @@ -1,6 +1,5 @@ function [ sensor ] = readDATA( socket ) % readDATA Reads UDP Socket and interprets data -% Version 0.25 % % Inputs % location: Either an opened UDP Socket or integer port number @@ -29,13 +28,7 @@ function [ sensor ] = readDATA( socket ) % 2. data = readDATA(49005); % % NOTE: sending in a port number instead of an opened socket clears the UDP buffer. This only works if the data is being sent at a fast rate. Sending in a UDP Socket reads the first packet in the buffer. -% -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Updated to work with new Plugin -% 09/10/13: [CT] Updated to receive UDP socket or port number -% 06/10/13: [CT] Code created -% +% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/readUDP.m b/MATLAB/+XPlaneConnect/readUDP.m index 42c2204..cae4f2f 100644 --- a/MATLAB/+XPlaneConnect/readUDP.m +++ b/MATLAB/+XPlaneConnect/readUDP.m @@ -1,6 +1,5 @@ function [ data ] = readUDP( input ) %readUDP Read Array from UDP Socket -% Version 0.25 % % Inputs % input: Either an opened UDP Socket or integer port number @@ -23,12 +22,6 @@ function [ data ] = readUDP( input ) %UDP buffer. This only works if the data is being sent at a fast rate. %Sending in a UDP Socket reads the first packet in the buffer. % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Added Versioning -% 09/08/13: [CT] Added option for either UDP Socket or port number input -% 06/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/requestDREF.m b/MATLAB/+XPlaneConnect/requestDREF.m index 9ca11ab..1a0036f 100644 --- a/MATLAB/+XPlaneConnect/requestDREF.m +++ b/MATLAB/+XPlaneConnect/requestDREF.m @@ -1,6 +1,5 @@ function result = requestDREF( DREFArray, varargin ) %requestDREF request the value of a specific DataRef from X-Plane over UDP -% Version 0.25 % %Inputs % DREFArray: Cell Array of DataRefs to be requested diff --git a/MATLAB/+XPlaneConnect/selectDATA.m b/MATLAB/+XPlaneConnect/selectDATA.m index 5222b6a..49efca1 100644 --- a/MATLAB/+XPlaneConnect/selectDATA.m +++ b/MATLAB/+XPlaneConnect/selectDATA.m @@ -1,6 +1,5 @@ function [ status ] = selectDATA( index, varargin ) % selectDATA Choose specific X-Plane parameters to be send over UDP -% Version 0.25 % % Inputs % index: An array of the values that to be sent. Corresponds to the numbers on the XPlane Output screen @@ -14,11 +13,6 @@ function [ status ] = selectDATA( index, varargin ) % 1. import XPlaneConnect.*; % 2. values = [1, 2, 3, 27, 40]; % 3. status = selectDATA( values, '127.0.0.1', 49005 ); % send to localhose port 49005 -% -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Added Versioning -% 06/10/13: [CT] Code created % % Contributors % [CT] Christopher Teubert (SGT, Inc.) diff --git a/MATLAB/+XPlaneConnect/sendCTRL.m b/MATLAB/+XPlaneConnect/sendCTRL.m index 5e55667..15dfb10 100644 --- a/MATLAB/+XPlaneConnect/sendCTRL.m +++ b/MATLAB/+XPlaneConnect/sendCTRL.m @@ -1,6 +1,5 @@ function [ status ] = sendCTRL( ctrl, acft, IP, port ) % sendCTRL Send X-Plane Aircraft Control Commands over UDP -% Version 0.25 % % Inputs % ctrl: control array where the elements are as follows: @@ -24,10 +23,6 @@ function [ status ] = sendCTRL( ctrl, acft, IP, port ) % % Note: send the value -998 to not overwrite that parameter. That is, if -998 is sent, the parameter will stay at the current X-Plane value % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 09/26/14: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/sendDATA.m b/MATLAB/+XPlaneConnect/sendDATA.m index 931939e..f051fbe 100644 --- a/MATLAB/+XPlaneConnect/sendDATA.m +++ b/MATLAB/+XPlaneConnect/sendDATA.m @@ -1,6 +1,5 @@ function [ status ] = sendDATA(data, varargin) % sendDATA Send X-Plane formatted DATA over UDP -% Version 0.25 % % Inputs % data: X-Plane formatted data. Is a matlab structure with the following fields: @@ -20,11 +19,6 @@ function [ status ] = sendDATA(data, varargin) % % Note: send the value -998 to not overwrite that parameter. That is, if -998 is sent, the parameter will stay at the current X-Plane value % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Updated to work with new Plugin -% 06/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/sendDREF.m b/MATLAB/+XPlaneConnect/sendDREF.m index 94fc72a..4632d67 100644 --- a/MATLAB/+XPlaneConnect/sendDREF.m +++ b/MATLAB/+XPlaneConnect/sendDREF.m @@ -1,6 +1,5 @@ function status = sendDREF( dataRef, Value, varargin ) % sendDREF Send a command to change any DataRef in X-Plane over UDP. This requires the X-Plane Connect Plugin to be running -% Version 0.25 % % Inputs % dataRef: The X-Plane Dataref that will be chaged @@ -16,10 +15,6 @@ function status = sendDREF( dataRef, Value, varargin ) % 2. dataRef = 'sim/aircraft/parts/acf_gear_deploy'; // Landing Gear % 3. Value = 0; % 4. status = sendDREF(dataRef, Value); -% -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: First Version % % Contributors % [CT] Christopher Teubert (SGT, Inc.) diff --git a/MATLAB/+XPlaneConnect/sendPOSI.m b/MATLAB/+XPlaneConnect/sendPOSI.m index 28c1e09..4f85735 100644 --- a/MATLAB/+XPlaneConnect/sendPOSI.m +++ b/MATLAB/+XPlaneConnect/sendPOSI.m @@ -1,6 +1,5 @@ function [ status ] = sendPOSI( posi, varargin ) % sendPOSI Send X-Plane Aircraft Position over UDP -% Version 0.25 % % Inputs % posi: Position array where the elements are as follows: @@ -25,10 +24,6 @@ function [ status ] = sendPOSI( posi, varargin ) % % Note: send the value -998 to not overwrite that parameter. That is, if -998 is sent, the parameter will stay at the current X-Plane value % -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 09/25/14: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/sendSTRU.m b/MATLAB/+XPlaneConnect/sendSTRU.m index 105f36b..e00898a 100644 --- a/MATLAB/+XPlaneConnect/sendSTRU.m +++ b/MATLAB/+XPlaneConnect/sendSTRU.m @@ -1,6 +1,5 @@ function [ status ] = sendSTRU( STRU, varargin ) %sendSTRU Send a MATLAB structure over UDP -% Version 0.25 % %Inputs % stru: A MATLAB structure @@ -16,11 +15,6 @@ function [ status ] = sendSTRU( STRU, varargin ) % 3. #Send the data structure to port 49005 on the computer at IP address 172.0.100.54 % 4. status = sendUDP( data, '172.0.100.54', 49005 ); % -%Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/18/14: [CT] V0.2: Added Versioning -% 08/01/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/sendUDP.m b/MATLAB/+XPlaneConnect/sendUDP.m index 893b9d4..bdb1989 100644 --- a/MATLAB/+XPlaneConnect/sendUDP.m +++ b/MATLAB/+XPlaneConnect/sendUDP.m @@ -1,6 +1,5 @@ function [ status ] = sendUDP( data, IP, port ) %sendUDP Send an one dimensional array of type uint8 data over an UDP connection using a java DatagramSocket -% Version 0.25 % %Inputs % Data: 1-D array of type uint8 data to be sent @@ -16,12 +15,6 @@ function [ status ] = sendUDP( data, IP, port ) % 3. #Send the data array to port 49005 on the computer at IP address 172.0.100.54. % 4. status = sendUDP( data, '172.0.100.54', 49005 ); % -%Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 09/25/14: [CT] V0.24: Added persistant socket -% 04/21/14: [CT] V0.2:Added Versioning, support for DREF/SIMU/GETD/CONN -% 06/10/13: [CT] Code created -% % Contributors % [CT] Christopher Teubert (SGT, Inc.) % christopher.a.teubert@nasa.gov diff --git a/MATLAB/+XPlaneConnect/setConn.m b/MATLAB/+XPlaneConnect/setConn.m index 3086b82..5e4e081 100644 --- a/MATLAB/+XPlaneConnect/setConn.m +++ b/MATLAB/+XPlaneConnect/setConn.m @@ -1,7 +1,6 @@ function status = setConn( recvPort, IP, port ) % setConn Send a command to set up the port where you will receive data on % this computer. -% Version 0.25 % % Inputs % Receiving Port: Port that data will be sent to in the future for this connection @@ -14,10 +13,6 @@ function status = setConn( recvPort, IP, port ) % Use % 1. import XPlaneConnect.* % 2. status = setConn(49011); -% -% Change Log -% 10/02/14: [CT] V0.25: Updated to work with updated xpcPlugin -% 04/21/14: [CT] V0.2: First Version % % Contributors % [CT] Christopher Teubert (SGT, Inc.) diff --git a/MATLAB/Documentation (MATLAB).html b/MATLAB/Documentation (MATLAB).html index dd3a645..87ba7c9 100644 --- a/MATLAB/Documentation (MATLAB).html +++ b/MATLAB/Documentation (MATLAB).html @@ -9,7 +9,6 @@

XPC-MATLAB

-Version 0.25 September 29, 2014
Chris Teubert (Christopher.A.Teubert@nasa.gov)

Summary

@@ -112,11 +111,5 @@ Copyright (c) 2008, Sandy Barbour and Ben Supnik All rights reserved.

X-Plane API SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

Change Log

--October 16, 2014 (Chris Teubert): Added Notices and Disclaimers
--September 29, 2014 (Chris Teubert): Updated documentation to use new plugin
--September 11, 2013 (Chris Teubert): Updated for Version 0.7
--February 13, 2013 (Chris Teubert): Hello World! - diff --git a/Readme.txt b/Readme.txt index f7a1d6f..46ba105 100644 --- a/Readme.txt +++ b/Readme.txt @@ -58,10 +58,6 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of Laminar Research, respectively. X-Plane API SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Version History: - 10/16/2014: [CT] Added Notices and Disclaimers - 10/03/2014: [CT] First version Contributors: CT: Chris Teubert (christopher.a.teubert@nasa.gov) diff --git a/xpcPlugin/xpcPlugin.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate b/xpcPlugin/xpcPlugin.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate index 2d3d732..9fdae37 100644 Binary files a/xpcPlugin/xpcPlugin.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate and b/xpcPlugin/xpcPlugin.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/xpcPlugin/xpcPlugin.xcodeproj/xcuserdata/cteubert.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/xpcPlugin/xpcPlugin.xcodeproj/xcuserdata/cteubert.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 263e0db..886545e 100644 --- a/xpcPlugin/xpcPlugin.xcodeproj/xcuserdata/cteubert.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/xpcPlugin/xpcPlugin.xcodeproj/xcuserdata/cteubert.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -28,9 +28,7 @@ startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "890" - endingLineNumber = "890" - landmarkName = "handleGETD(char buf[])" - landmarkType = "7"> + endingLineNumber = "890"> diff --git a/xpcPlugin/xpcPluginTools.cpp b/xpcPlugin/xpcPluginTools.cpp index 0175079..7ec1fcb 100644 --- a/xpcPlugin/xpcPluginTools.cpp +++ b/xpcPlugin/xpcPluginTools.cpp @@ -1,5 +1,4 @@ // xpcPluginTools functions to support xpcPlugin -// Version 0.25 // // FUNCTIONS // buildXPLMDataRefs @@ -15,19 +14,6 @@ // CONTACT // For questions email Christopher Teubert (christopher.a.teubert@nasa.gov) // -// VERSION HISTORY -// 09.24.14 (V0.25): (CT) Changed testi() to test(int) -// - Added Landing Gear to Multiplayer -// - Changed readMessage to void-receiving socket reference and message reference -// - Changed one line conditional statements to have brackets- programming standard -// 08.21.14 (V0.23): (CT) Added multiplayer array, fixed multiplayer XPLMDataRefs -// 08.04.14 (V0.22): (CT) Added parseMessage and type XPCMessage -// 05.06.14 (V0.21): (CT) Added handleDREFSIM -// 04.29.14 (V0.2): (CT) Fixed printbuffertolog bug sometimes displaying numbers >255 -// - Added documentation/Versioning/comments -// - Added min function -// 04.14.14 (V0.1): (CT) First Version -// // CONTRIBUTORS // CT: Christopher Teubert (christopher.a.teubert@nasa.gov) //