From a6196dece9070d307da8a68fabd9e122c64e1b58 Mon Sep 17 00:00:00 2001 From: Jason Watkins Date: Wed, 15 Apr 2015 14:41:23 -0700 Subject: [PATCH] C client style tweaks. - Standardized C client to use tabs. - Improved consistency of indentation. - Updated copyright and description headers. --- C/src/xplaneConnect.c | 984 +++++++++--------- C/src/xplaneConnect.h | 215 ++-- TestScripts/C Tests.win/CTests.vcxproj | 3 + .../C Tests.win/CTests.vcxproj.filters | 5 + 4 files changed, 613 insertions(+), 594 deletions(-) diff --git a/C/src/xplaneConnect.c b/C/src/xplaneConnect.c index 7dae28b..b85e73d 100755 --- a/C/src/xplaneConnect.c +++ b/C/src/xplaneConnect.c @@ -1,80 +1,72 @@ +//Copyright (c) 2013-2015 United States Government as represented by the Administrator of the +//National Aeronautics and Space Administration. All Rights Reserved. // -// xPlaneConnect.c Beta +//DISCLAIMERS +// No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, +// EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT +// THE SUBJECT SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY +// THAT THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, +// WILL CONFORM TO THE SUBJECT SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN +// ENDORSEMENT BY GOVERNMENT AGENCY OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, +// HARDWARE, SOFTWARE PRODUCTS OR ANY OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT +// SOFTWARE. FURTHER, GOVERNMENT AGENCY DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING +// THIRD-PARTY SOFTWARE, IF PRESENT IN THE ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS." +// +// Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES +// GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF +// RECIPIENT'S USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES +// OR LOSSES ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING +// FROM, RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE +// UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, +// TO THE EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE +// IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT. + +// X-Plane Connect Client // // DESCRIPTION -// XPLANECONNECT (XPC) Facilitates Communication to and from the XPCPlugin -// -// REQUIREMENTS -// 1. X-Plane Version 9.0 or newer (untested on previous versions) -// 2. XPCPlugin.xpl-must be placed in [X-Plane Directory]/Resources/plugins -// 3. OS X 10.8 or newer (untested on previous versions) +// Communicates with the XPC plugin to facilitate controling and gathering data from X-Plane. // // INSTRUCTIONS -// 1. Include the header "xplaneConnect.h" -// EXAMPLE: #include "xplaneConnect.h" -// 2. Open UDP Socket using openUDP -// EXAMPLE: struct xpcSocket theSocket = openUDP(port_number); -// NOTE: Do not send/receive on the same socket -// 3. Use functions described below -// 4. Close UDP Socket using closeUDP -// -// NOTICES: -// Copyright ã 2013-2014 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved. -// -// DISCLAIMERS -// No Warranty: THE SUBJECT SOFTWARE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY OF ANY KIND, EITHER EXPRESSED, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL CONFORM TO SPECIFICATIONS, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR FREEDOM FROM INFRINGEMENT, ANY WARRANTY THAT THE SUBJECT SOFTWARE WILL BE ERROR FREE, OR ANY WARRANTY THAT DOCUMENTATION, IF PROVIDED, WILL CONFORM TO THE SUBJECT SOFTWARE. THIS AGREEMENT DOES NOT, IN ANY MANNER, CONSTITUTE AN ENDORSEMENT BY GOVERNMENT AGENCY OR ANY PRIOR RECIPIENT OF ANY RESULTS, RESULTING DESIGNS, HARDWARE, SOFTWARE PRODUCTS OR ANY OTHER APPLICATIONS RESULTING FROM USE OF THE SUBJECT SOFTWARE. FURTHER, GOVERNMENT AGENCY DISCLAIMS ALL WARRANTIES AND LIABILITIES REGARDING THIRD-PARTY SOFTWARE, IF PRESENT IN THE ORIGINAL SOFTWARE, AND DISTRIBUTES IT "AS IS." -// -// Waiver and Indemnity: RECIPIENT AGREES TO WAIVE ANY AND ALL CLAIMS AGAINST THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT. IF RECIPIENT'S USE OF THE SUBJECT SOFTWARE RESULTS IN ANY LIABILITIES, DEMANDS, DAMAGES, EXPENSES OR LOSSES ARISING FROM SUCH USE, INCLUDING ANY DAMAGES FROM PRODUCTS BASED ON, OR RESULTING FROM, RECIPIENT'S USE OF THE SUBJECT SOFTWARE, RECIPIENT SHALL INDEMNIFY AND HOLD HARMLESS THE UNITED STATES GOVERNMENT, ITS CONTRACTORS AND SUBCONTRACTORS, AS WELL AS ANY PRIOR RECIPIENT, TO THE EXTENT PERMITTED BY LAW. RECIPIENT'S SOLE REMEDY FOR ANY SUCH MATTER SHALL BE THE IMMEDIATE, UNILATERAL TERMINATION OF THIS AGREEMENT. -// -// X-Plane API -// Copyright (c) 2008, Sandy Barbour and Ben Supnik All rights reserved. -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -// * Neither the names of the authors nor that of X-Plane or Laminar Research may be used to endorse or promote products derived from this software without specific prior written permission from the authors or 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. +// See Readme.md in the root of this repository or the wiki hosted on GitHub at +// https://github.com/nasa/XPlaneConnect/wiki for requirements, installation instructions, +// and detailed documentation. // // CONTACT // For questions email Christopher Teubert (christopher.a.teubert@nasa.gov) // -// TO DO -// 1. Update SelectData -// 2. RequestDREF: look into removing DREFSizes -// -// BEGIN CODE +// CONTRIBUTORS +// CT: Christopher Teubert (christopher.a.teubert@nasa.gov) +// JW: Jason Watkins (jason.w.watkins@nasa.gov) +#include "xplaneConnect.h" +#include +#include #include #include -#include #include #include #include -#include -#include "xplaneConnect.h" #ifdef _WIN32 /* WIN32 SYSTEM */ - #include - #define strcasecmp _stricmp - #define strncasecmp _strnicmp - #define snprintf sprintf_s - #define socklen_t int +#include - void usleep(__int64 usec) - { // From http://www.c-plusplus.de/forum/109539-full - HANDLE timer; - LARGE_INTEGER ft; - - ft.QuadPart = -(10*usec); // Convert to 100 nanosecond interval, negative value indicates relative time - - timer = CreateWaitableTimer(NULL, TRUE, NULL); - SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0); - WaitForSingleObject(timer, INFINITE); - CloseHandle(timer); - } +void usleep(__int64 usec) +{ // From http://www.c-plusplus.de/forum/109539-full + HANDLE timer; + LARGE_INTEGER ft; + + ft.QuadPart = -(10*usec); // Convert to 100 nanosecond interval, negative value indicates relative time + + timer = CreateWaitableTimer(NULL, TRUE, NULL); + SetWaitableTimer(timer, &ft, 0, NULL, NULL, 0); + WaitForSingleObject(timer, INFINITE); + CloseHandle(timer); +} #endif short errorReport(char *functionName, char *errorMessage); -short sendRequest(struct xpcSocket recfd, char DREFArray[][100], short DREFSizes[], short listLength); +short sendRequest(XPCSocket recfd, char DREFArray[][100], short DREFSizes[], short listLength); short errorReport(char *functionName, char *errorMessage) { @@ -82,83 +74,83 @@ short errorReport(char *functionName, char *errorMessage) return -1; } -struct xpcSocket openUDP(unsigned short port_number, const char *xpIP, unsigned short xpPort) +XPCSocket openUDP(unsigned short port_number, const char *xpIP, unsigned short xpPort) { - struct xpcSocket theSocket; - struct sockaddr_in server; + XPCSocket theSocket; + struct sockaddr_in server; #if (__APPLE__ || __linux) - struct timeval tv; - int optval = 1; + struct timeval tv; + int optval = 1; #endif - - // Setup Port - server.sin_family = AF_INET; - server.sin_addr.s_addr = INADDR_ANY; - server.sin_port = htons(port_number); - - // Set X-Plane Port and IP - if (strcasecmp(xpIP,"localhost") == 0) // IP - { - strncpy(theSocket.xpIP,"127.0.0.1",9); // Default - } - else - { - memcpy(theSocket.xpIP,xpIP,(size_t) fminl(strlen(xpIP),16)); - } - - if (xpPort <= 0) // Default Port - { - theSocket.xpPort = 49009; // Default - } - else - { - theSocket.xpPort = xpPort; - } - + + // Setup Port + server.sin_family = AF_INET; + server.sin_addr.s_addr = INADDR_ANY; + server.sin_port = htons(port_number); + + // Set X-Plane Port and IP + if (strcasecmp(xpIP,"localhost") == 0) // IP + { + strncpy(theSocket.xpIP,"127.0.0.1",9); // Default + } + else + { + memcpy(theSocket.xpIP,xpIP,(size_t) fminl(strlen(xpIP),16)); + } + + if (xpPort <= 0) // Default Port + { + theSocket.xpPort = 49009; // Default + } + else + { + theSocket.xpPort = xpPort; + } + #ifdef _WIN32 - WSADATA wsa; - if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) - { - perror("ERROR: openUDP- "); - return theSocket; - //ERROR IN Socket Message - } - - if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) - { - perror("ERROR: openUDP- "); - return theSocket; - //ERROR IN Socket Message - } - - if (bind(theSocket.sock, (struct sockaddr *)&server, sizeof(server)) == SOCKET_ERROR) - { - perror("ERROR: openUDP- "); - return theSocket; - //ERROR IN Socket Message - } + WSADATA wsa; + if (WSAStartup(MAKEWORD(2,2),&wsa) != 0) + { + perror("ERROR: openUDP- "); + return theSocket; + //ERROR IN Socket Message + } + + if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) + { + perror("ERROR: openUDP- "); + return theSocket; + //ERROR IN Socket Message + } + + if (bind(theSocket.sock, (struct sockaddr *)&server, sizeof(server)) == SOCKET_ERROR) + { + perror("ERROR: openUDP- "); + return theSocket; + //ERROR IN Socket Message + } #elif (__APPLE__ || __linux) - // Create a SOCKET - if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) - { - perror((char*) "ERROR: openUDP- "); - return theSocket; - } - - // Options - setsockopt(theSocket.sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)); - setsockopt(theSocket.sock, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval)); - - //Bind - if ( bind(theSocket.sock, (struct sockaddr *) &server, sizeof(server)) == -1) - { - perror( (char*) "ERROR: openUDP- "); - return theSocket; - } + // Create a SOCKET + if ((theSocket.sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) + { + perror((char*) "ERROR: openUDP- "); + return theSocket; + } + + // Options + setsockopt(theSocket.sock, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)); + setsockopt(theSocket.sock, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval)); + + //Bind + if ( bind(theSocket.sock, (struct sockaddr *) &server, sizeof(server)) == -1) + { + perror( (char*) "ERROR: openUDP- "); + return theSocket; + } #endif - - //Set Timout + + //Set Timout int usTimeOut = 500; #ifdef _WIN32 @@ -167,259 +159,259 @@ struct xpcSocket openUDP(unsigned short port_number, const char *xpIP, unsigned #else tv.tv_sec = 0; /* Sec Timeout */ tv.tv_usec = usTimeOut; // Microsec Timeout - setsockopt(theSocket.sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, sizeof(struct timeval)); + setsockopt(theSocket.sock, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, sizeof(struct timeval)); #endif - - return theSocket; + + return theSocket; } -void closeUDP(struct xpcSocket socketNumber) +void closeUDP(XPCSocket socketNumber) { #ifdef _WIN32 closesocket(socketNumber.sock); #elif (__APPLE__ || __linux) - close(socketNumber.sock); + close(socketNumber.sock); #endif } -short sendUDP(struct xpcSocket recfd, char my_message[], short messageLength) +short sendUDP(XPCSocket recfd, char my_message[], short messageLength) { - struct sockaddr_in servaddr; - - my_message[4] = (char) messageLength; - - // Preconditions + struct sockaddr_in servaddr; + + my_message[4] = (char) messageLength; + + // Preconditions if (messageLength <= 0)// Positive Message Length { return errorReport("sendUDP", "message length must be positive >0"); } - - // Code - servaddr.sin_family = AF_INET; - servaddr.sin_port = htons(recfd.xpPort); - servaddr.sin_addr.s_addr = inet_addr(recfd.xpIP); + + // Code + servaddr.sin_family = AF_INET; + servaddr.sin_port = htons(recfd.xpPort); + servaddr.sin_addr.s_addr = inet_addr(recfd.xpIP); #ifdef _WIN32 const char on = 1; #else - int on=1; + int on=1; #endif - setsockopt(recfd.sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)); - - if (sendto(recfd.sock, my_message, (int) messageLength, 0, (const struct sockaddr *) &servaddr, sizeof(servaddr))<0) - { - perror("ERROR: sendUDP-"); - exit(EXIT_FAILURE); - } - - return 0; + setsockopt(recfd.sock, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)); + + if (sendto(recfd.sock, my_message, (int) messageLength, 0, (const struct sockaddr *) &servaddr, sizeof(servaddr))<0) + { + perror("ERROR: sendUDP-"); + exit(EXIT_FAILURE); + } + + return 0; } -short sendDATA(struct xpcSocket recfd, float dataRef[][9], unsigned short rows) +short sendDATA(XPCSocket recfd, float dataRef[][9], unsigned short rows) { - int i; - unsigned short length = rows*9*sizeof(float) + 5; - char message[5000]; - unsigned short step = 9*sizeof(float); - - strncpy(message,"DATA",4); - - for (i=0;i - #include - #pragma comment(lib,"ws2_32.lib") //Winsock Library - #elif (__APPLE__ || __linux) - #include - #include - #include - #include - #endif +#include "stdlib.h" +#ifdef _WIN32 /* WIN32 SYSTEM */ +#include +#include +#pragma comment(lib,"ws2_32.lib") //Winsock Library +#elif (__APPLE__ || __linux) +#include +#include +#include +#include +#endif - struct xpcSocket { - short open; - unsigned short port; +typedef struct +{ + char open; + unsigned short port; + + // X-Plane IP and Port + char xpIP[16]; + unsigned short xpPort; + + #ifdef _WIN32 + SOCKET sock; + #else + int sock; + #endif +} XPCSocket; + +typedef struct +{ + float pitch; + float roll; + float yaw; + float throttle; + char gear; + float flaps; + char aircraft; +} xpcCtrl; + +typedef struct +{ + double latitude; + double longitude; + double altitude; +} Waypoint; + +typedef enum +{ + xpc_WYPT_ADD = 1, + xpc_WYPT_DEL = 2, + xpc_WYPT_CLR = 3 +} WYPT_OP; + +typedef struct +{ + WYPT_OP op; + Waypoint points[20]; + size_t numPoints; +} xpcWypt; - // X-Plane IP and Port - char xpIP[16]; - unsigned short xpPort; - - #ifdef _WIN32 /* WIN32 SYSTEM */ - SOCKET sock; - #elif (__APPLE__ || __linux) //OS X/Linux - int sock; - #endif - }; - - typedef struct - { - float pitch; - float roll; - float yaw; - float throttle; - char gear; - float flaps; - char aircraft; - } xpcCtrl; - - typedef struct - { - double latitude; - double longitude; - double altitude; - } Waypoint; - - typedef enum - { - xpc_WYPT_ADD = 1, - xpc_WYPT_DEL = 2, - xpc_WYPT_CLR = 3 - } WYPT_OP; - - typedef struct - { - WYPT_OP op; - Waypoint points[20]; - size_t numPoints; - } xpcWypt; - - // Basic Functions - struct xpcSocket openUDP(unsigned short port, const char *xpIP, unsigned short xpPort); - void closeUDP(struct xpcSocket); - short sendUDP(struct xpcSocket recfd, char my_message[], short messageLength); - short readUDP(struct xpcSocket recfd, char *dataRef, struct sockaddr *recvaddr); +// Basic Functions +XPCSocket openUDP(unsigned short port, const char *xpIP, unsigned short xpPort); +void closeUDP(XPCSocket sock); +int sendUDP(XPCSocket sock, char buffer[], int len); +int readUDP(XPCSocket sock, char buffer[], int len, struct sockaddr* recvaddr); - // Configuration - short setCONN(struct xpcSocket recfd, unsigned short recPort); - short pauseSim(struct xpcSocket recfd, short); +// Configuration +short setCONN(XPCSocket recfd, unsigned short recPort); +short pauseSim(XPCSocket recfd, short); - // UDP DATA - short parseDATA(const char my_message[], short messageLength, float dataRef[][9]); - short readDATA(struct xpcSocket recfd, float dataRef[][9]); - short sendDATA(struct xpcSocket recfd, float dataRef[][9], unsigned short rows); +// UDP DATA +short parseDATA(const char my_message[], short messageLength, float dataRef[][9]); +short readDATA(XPCSocket recfd, float dataRef[][9]); +short sendDATA(XPCSocket recfd, float dataRef[][9], unsigned short rows); - // Position - short parsePOSI(const char my_message[], float resultArray[], int arraySize, float *gear); - short readPOSI(struct xpcSocket recfd, float resultArray[], int arraySize, float *gear); - short sendPOSI(struct xpcSocket recfd, short ACNum, short numArgs, float valueArray[]); +// Position +short parsePOSI(const char my_message[], float resultArray[], int arraySize, float *gear); +short readPOSI(XPCSocket recfd, float resultArray[], int arraySize, float *gear); +short sendPOSI(XPCSocket recfd, short ACNum, short numArgs, float valueArray[]); - // Controls - xpcCtrl parseCTRL(const char data[]); - xpcCtrl readCTRL(struct xpcSocket recfd); - short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[]); - short sendpCTRL(struct xpcSocket recfd, short numArgs, float valueArray[], char acNum); +// Controls +xpcCtrl parseCTRL(const char data[]); +xpcCtrl readCTRL(XPCSocket recfd); +short sendCTRL(XPCSocket recfd, short numArgs, float valueArray[]); +short sendpCTRL(XPCSocket recfd, short numArgs, float valueArray[], char acNum); - // DREF Manipulation - short readDREF(struct xpcSocket recfd, float *resultArray[], short arraySizes[]); - short parseDREF(const char my_message[], char *dataRef, unsigned short *length_of_DREF, float *values, unsigned short *number_of_values); - short sendDREF(struct xpcSocket recfd, const char *dataRef, unsigned short length_of_DREF, float *values, unsigned short number_of_values); - short requestDREF(struct xpcSocket sendfd, struct xpcSocket recfd, char DREFArray[][100], short DREFSizes[], short listLength, float *resultArray[], short arraySizes[]); - int parseGETD(const char my_message[], char *DREFArray[], int DREFSizes[]); - short parseRequest(const char my_message[], float *resultArray[], short arraySizes[]); - short readRequest(struct xpcSocket recfd, float *dataRef[], short arraySizes[], struct sockaddr *recvaddr); +// DREF Manipulation +short readDREF(XPCSocket recfd, float *resultArray[], short arraySizes[]); +short parseDREF(const char my_message[], char *dataRef, unsigned short *length_of_DREF, float *values, unsigned short *number_of_values); +short sendDREF(XPCSocket recfd, const char *dataRef, unsigned short length_of_DREF, float *values, unsigned short number_of_values); +short requestDREF(XPCSocket sendfd, XPCSocket recfd, char DREFArray[][100], short DREFSizes[], short listLength, float *resultArray[], short arraySizes[]); +int parseGETD(const char my_message[], char *DREFArray[], int DREFSizes[]); +short parseRequest(const char my_message[], float *resultArray[], short arraySizes[]); +short readRequest(XPCSocket recfd, float *dataRef[], short arraySizes[], struct sockaddr *recvaddr); - // Waypoints - xpcWypt parseWYPT(const char data[]); - short sendWYPT(struct xpcSocket sendfd, WYPT_OP op, float points[], int numPoints); +// Waypoints +xpcWypt parseWYPT(const char data[]); +short sendWYPT(XPCSocket sendfd, WYPT_OP op, float points[], int numPoints); - // Screen Text - short sendTEXT(struct xpcSocket sendfd, char* msg, int x, int y); +// Screen Text +short sendTEXT(XPCSocket sendfd, char* msg, int x, int y); - #endif //ifdef _h #ifdef __cplusplus } #endif +#endif //ifdef _h diff --git a/TestScripts/C Tests.win/CTests.vcxproj b/TestScripts/C Tests.win/CTests.vcxproj index 9ba4d07..c057e7d 100644 --- a/TestScripts/C Tests.win/CTests.vcxproj +++ b/TestScripts/C Tests.win/CTests.vcxproj @@ -22,6 +22,9 @@ + + + {BC701AF4-552C-4C9D-82A1-B352542783A4} CTests diff --git a/TestScripts/C Tests.win/CTests.vcxproj.filters b/TestScripts/C Tests.win/CTests.vcxproj.filters index fae10d4..cd3ca2c 100644 --- a/TestScripts/C Tests.win/CTests.vcxproj.filters +++ b/TestScripts/C Tests.win/CTests.vcxproj.filters @@ -22,4 +22,9 @@ Source Files + + + Header Files + + \ No newline at end of file