Merge branch 'master' into develop

Conflicts:
	MATLAB/+XPlaneConnect/XPlaneConnect.jar
	MATLAB/Example/Example.m
This commit is contained in:
Jason Watkins
2015-08-17 09:24:45 -07:00
4 changed files with 23 additions and 15 deletions

View File

@@ -26,6 +26,7 @@ p = inputParser;
addOptional(p,'xpHost','127.0.0.1',@ischar);
addOptional(p,'xpPort',49009,@isnumeric);
addOptional(p,'port',0,@isnumeric);
addOptional(p,'timeout',0,@isnumeric);
parse(p,varargin{:});
%% Create client
@@ -33,7 +34,7 @@ if ~exist('gov.nasa.xpc.XPlaneConnect', 'class')
[folder, ~, ~] = fileparts(which('XPlaneConnect.openUDP'));
javaaddpath(fullfile(folder, 'XPlaneConnect.jar'));
end
socket = gov.nasa.xpc.XPlaneConnect(p.Results.xpHost, p.Results.xpPort, p.Results.port);
socket = gov.nasa.xpc.XPlaneConnect(p.Results.xpHost, p.Results.xpPort, p.Results.port, p.Results.timeout);
%% Track open clients
global clients;