Commit Graph

72 Commits

Author SHA1 Message Date
Chris Teubert
87c66cafdf Fixed data structure, display, and control bug 2015-03-30 14:45:49 -07:00
Jason Watkins
85fdcbe3dc Several small fixes
- Added Visual Studio solution for C client example.
 - Fixed inconsistent indentation in C client example.
 - Changed default behavior in MATLAB client's sendCTRL function to leave unchanged instead of setting default values.
 - Fixed sendPOSI and sendDATA sections of the MATLAB example.
 - Fixed port number in the C and C++ setCONN tests.
2015-03-30 13:38:51 -07:00
Christopher Teubert
d199bd0089 Merge pull request #32 from jason-watkins/feature/examples
Basic MATLAB example script mirroring the current C example.
2015-03-28 18:21:05 -07:00
Christopher Teubert
ff7d5fe491 Merge pull request #29 from jason-watkins/feature/cleanup
.gitignore cleanup and file restructuring
2015-03-28 17:50:15 -07:00
Chris Teubert
250c98a78c Fixed minor bug in setConn.m
Should be single quote around strings
2015-03-28 15:54:06 -07:00
Christopher Teubert
ea2ae58c76 Merge pull request #28 from jason-watkins/feature/test-scripts
C++ and MATLAB testing improvements
2015-03-28 15:44:47 -07:00
Jason Watkins
ba9cc91b47 Basic MATLAB example script mirroring the current C example. 2015-03-27 15:36:57 -07:00
Jason Watkins
9791283578 Expanded MATLAB tests 2015-03-27 08:43:20 -07:00
Jason Watkins
8dace8b2ab Added VS project for CPP Tests and fixed some CPP Tests bugs,
- Added a Visual Studio project for C++ test scripts.
 - Increased message buffer size in sendReadTest to account for assumptions made by sendUDP.
 - Fixed a bug in sendCTRLTest where not all DREF sizes were being set.
 - Fixed a bug in sendCTRLTest where not all DREFs were being requested.
 - All C++ tests are now passing on Windows for XP9, XP10-32 and XP10-64
2015-03-27 08:43:20 -07:00
Jason Watkins
011558abfa Restructured plugin files to conform to "fat plugin" structure.
- Deleted platform specific folders from xpcPlugin folder.
 - Added new XPlaneConnect folder under xpcPlugin folder.
 - Moved and renamed windows binaries into architecture specific folders
 - Moved and renamed mac binary to XPlaneConnect root (single mac binary supports 32 & 64 bit)
 - Updated installation instructions in Readme
 - Cleaned up plugin Visual Studio project architecture
2015-03-25 15:46:25 -07:00
Jason Watkins
b91776e687 Removed files that were previously in version control that should be ignored. 2015-03-25 11:32:40 -07:00
Jason Watkins
535b8164af Updated .gitignore.
- New rules should automatically exclude nearly all files that shouldn't be in source control.
 - Works well on Windows. Hasn't been tested on Mac
2015-03-25 11:16:54 -07:00
Christopher Teubert
fd028e5d5b Merge pull request #27 from jason-watkins/master
Changed runtime linking settings on Windows
2015-03-25 10:26:34 -07:00
Jason Watkins
78bcd96f0c Changed runtime linking settings on Windows
- The MSVC runtime is now statically linked for the 32bit and 64bit Windows plugins. This is done to avoid potentially requiring users to install an additional package from Microsoft to use the plugin.
 - The "Release" build configuration has also been removed, since it was not configured correctly. It will be re-added at a later date.
2015-03-25 10:09:00 -07:00
Chris Teubert
1c27374647 Updated Mac Plugin 2015-03-24 16:52:14 -07:00
Christopher Teubert
aac59dccf1 Merge pull request #26 from jason-watkins/master
CTest Fixes
2015-03-24 16:49:44 -07:00
Jason Watkins
66b074d89b Tweaks to fix setCONNTest on Windows 8
- Temporarily disabled the sending of a CONF message from the plugin in response to setCONN. The CONF message causes crashes on Windows 8 when setCONN is called multiple times.
 -  Removed code that attempted to free result slots in parseRequest before overwritting them with new allocations. The CTests suite currently calls parseRequest with a multidimensional array allocated on the stack, resulting in an attempt to free stack memory. A better solution may be to simply check whether the existing result slots are long enough.
 - As of this commit, all tests in the CTests suite are passing on Windows 8 for X-Plane 9, X-Plane 10 23bit and X-Plane 10 64bit.
2015-03-24 16:11:37 -07:00
Jason Watkins
fbeb297717 Fixed CTests bugs, minor plugin enhancements, and removed old files
- Fixed incorrect message buffer size in sendCTRL function.
 - Fixed a bug in sendCTRLTest where not all DREF sizes were being set.
 - Increased message buffer size in sendReadTest to account for assumptions made by sendUDP.
 - Fixed a bug in updateLog where the log message would sometimes start with several null characters, causing the log message to be effectively ignored by fprintf.

 - The xpcPlugin Visual Studio solution now supports 32 bit and 64 bit builds.
 - Logging performed by the plugin now works correctly on Windows.
 - Long log messages are now truncated to 500 characters. Previously, messages over 500 characters would be omitted, and an error message logged in their place.

 - Several files which were incorrectly added to source control have been deleted.
2015-03-24 14:29:39 -07:00
Chris Teubert
59d3bba414 Added handling of no response for MATLAB requestDREF 2015-03-24 09:37:38 -07:00
Chris Teubert
6236ffc69d Fixed closeUDP bug in CPP Tests 2015-03-24 09:37:38 -07:00
Chris Teubert
7fa3fae689 Updated Plugin
Removed xpcPlugin.xpl from windows directory (32 and 64 bit versions
are already there). Also, changed the plugin outDesc and outSig
2015-03-24 09:37:38 -07:00
Christopher Teubert
88e659d62c Merge pull request #25 from jason-watkins/feature/ctest
Added Visual Studio solution for C test scripts and fixed test bug
2015-03-24 08:37:46 -07:00
jason-watkins
f902303b20 Added Visual Studio solution for C test scripts and fixed test bug
- Added a Visual Studio solution that builds the C test scripts on Windows.
 - Updated .gitignore to ignore user specific Visual Studio files
 - Updated .gitignore to ignore Windows build folders
 - Fixed a bug in closeTest. It now properly closes the UDP port a second time after reopening the port to verify that it closed successfully.
2015-03-23 16:10:50 -07:00
Christopher Teubert
ef6c80d7a4 Added 64-bit windows support
Added separate .xpl plugin files for win 32/64.
Updated Readme to explain.
2015-02-10 11:57:14 -08:00
Christopher Teubert
54c4363fe4 Merge pull request #24 from edowson/user/edowson
CMake Files Added and xpcExample moved into src sub-folder
2015-01-15 09:50:13 -08:00
Elvis Dowson
5853062402 C/xpcExample: Update XCode project to reference new source file location.
This commit:
- updates the XCode project to 6.1.1
- updates the reference to the xpcExample source file
- modifies the project so that some of the files that are copied across during the build phase are
  only done during deployment.

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:45:36 +04:00
Elvis Dowson
b3fada3c64 C/xpcExample: Add CMake support for building xpcExample that uses the xplaneconnect library.
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:24:34 +04:00
Elvis Dowson
6709765a48 C/xpcExample: Move sources to src sub-folder.
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:23:02 +04:00
Elvis Dowson
b91bdf6d35 .gitignore: Ignore build folder.
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:20:33 +04:00
Elvis Dowson
ba0600ee68 xplaneconnect: Add CMake support for building xplaneconnect shared and static library.
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:20:00 +04:00
Elvis Dowson
0b7ad8809d User Guide(C).txt: Remove trailing whitespaces.
Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
2015-01-02 14:19:07 +04:00
Christopher Teubert
520adb2d7d Merge pull request #23 from jwatkins42/bug/parseRequest
Fixed memory leak and incorrect copy bugs.
2014-12-09 09:11:59 -08:00
jwatkins42
97b9c9a682 Fixed memory leak and incorrect copy bugs.
- The result of a call to realloc was erroneously thrown away, creating a potential memory leak.
 - Values were being copied to an array on the stack, then memcpy'ed into an array on the heap. Since the heap array is freshly allocated, it should be completely safe to memcpy the data directly into it.
 - The inner loop was copying the same value several times, rather than copying several values in series.
2014-12-08 22:17:55 -08:00
Chris Teubert
dd7f4cc83e Updated .gitignore to ignore mac xcuserstate files 2014-12-04 10:37:47 -08:00
Chris Teubert
a396088ed8 Removed unnecessary use of pointer in parseDATA 2014-12-04 10:35:24 -08:00
Chris Teubert
dcce37573f Quick fix- msTimeOut to usTimeOut 2014-12-03 10:26:01 -08:00
Christopher Teubert
044b613e32 Merge pull request #20 from jwatkins42/master
Removed duplicate socket initialization and clarified socket timeout.
2014-12-03 10:24:56 -08:00
jwatkins42
d70148b98d Reverted timeout changes and added clarifying comment. 2014-12-02 21:32:45 -08:00
jwatkins42
f582d7fec0 Removed duplicate socket initialization and corrected timeout values. 2014-12-02 21:01:52 -08:00
Chris Teubert
a5c75f4a64 Update to fix Windows test script bug (C) 2014-12-02 13:42:57 -08:00
Christopher Teubert
1786f4e248 Merge pull request #19 from nasa/Testing-Scripts
Updated Function Names for CPP Test
2014-12-02 12:25:30 -08:00
Chris Teubert
b8822d4ad9 Updated Function Names for CPP Test 2014-12-02 12:08:47 -08:00
Christopher Teubert
84be530e81 Merge pull request #18 from nasa/Testing-Scripts
Fix to sendPosTest (C++), Fixes to run on Windows
2014-12-02 10:42:06 -08:00
Chris Teubert
26995ddfbc Testing Updates to work with Windows 2014-12-02 10:30:31 -08:00
Chris Teubert
2f6bc72825 Fixed Buffer overrun in sendCTRL 2014-12-02 10:07:41 -08:00
Christopher Teubert
4c1a7bab86 Merge pull request #17 from nasa/Testing-Scripts
Testing improvements- C/C++
2014-12-01 15:50:52 -08:00
Chris Teubert
6ec1aceac7 Fix
Merge branch 'master' into Testing-Scripts

Conflicts:
	TestScripts/C Tests.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate
	TestScripts/Cpp Tests.xcodeproj/project.xcworkspace/xcuserdata/cteubert.xcuserdatad/UserInterfaceState.xcuserstate
2014-12-01 15:50:09 -08:00
Chris Teubert
fce3b5a5a8 Resolved Conflicts 2014-12-01 15:42:40 -08:00
Chris Teubert
851cebeea0 Testing improvements- C/C++ 2014-12-01 15:36:37 -08:00
Christopher Teubert
9d94be5b57 Merge pull request #16 from nasa/Testing-Scripts
Fixed bug in xplaneConnect.c
2014-12-01 15:10:11 -08:00