Added C client support for multiplayer sendCTRL commands.
This commit is contained in:
@@ -373,7 +373,12 @@ short sendPOSI(struct xpcSocket recfd, short ACNum, short numArgs, float valueAr
|
|||||||
|
|
||||||
short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[])
|
short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[])
|
||||||
{
|
{
|
||||||
char message[26] = {0};
|
return sendpCTRL(recfd, numArgs, valueArray, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
short sendpCTRL(struct xpcSocket recfd, short numArgs, float valueArray[], char acNum)
|
||||||
|
{
|
||||||
|
char message[27] = { 0 };
|
||||||
int i;
|
int i;
|
||||||
short position = 5;
|
short position = 5;
|
||||||
|
|
||||||
@@ -407,10 +412,10 @@ short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[])
|
|||||||
memcpy(&message[position],&val,sizeof(float));
|
memcpy(&message[position],&val,sizeof(float));
|
||||||
position += sizeof(float);
|
position += sizeof(float);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
message[position] = acNum;
|
||||||
|
|
||||||
sendUDP(recfd, message, 26);
|
sendUDP(recfd, message, 27);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -72,6 +72,7 @@
|
|||||||
xpcCtrl parseCTRL(const char data[]);
|
xpcCtrl parseCTRL(const char data[]);
|
||||||
xpcCtrl readCTRL(struct xpcSocket recfd);
|
xpcCtrl readCTRL(struct xpcSocket recfd);
|
||||||
short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[]);
|
short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[]);
|
||||||
|
short sendpCTRL(struct xpcSocket recfd, short numArgs, float valueArray[], char acNum);
|
||||||
|
|
||||||
// DREF Manipulation
|
// DREF Manipulation
|
||||||
short readDREF(struct xpcSocket recfd, float *resultArray[], short arraySizes[]);
|
short readDREF(struct xpcSocket recfd, float *resultArray[], short arraySizes[]);
|
||||||
|
|||||||
@@ -289,6 +289,65 @@ short sendCTRLTest() // sendCTRL test
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
short sendpCTRLTest()
|
||||||
|
{
|
||||||
|
printf("sendNonPlayerCTRL - ");
|
||||||
|
|
||||||
|
// Initialize
|
||||||
|
int i; // Iterator
|
||||||
|
char DREFArray[100][100];
|
||||||
|
float CTRL[6] = { 0.0 };
|
||||||
|
float *recDATA[100];
|
||||||
|
short DREFSizes[100];
|
||||||
|
struct xpcSocket sendPort, recvPort;
|
||||||
|
short result;
|
||||||
|
|
||||||
|
// Setup
|
||||||
|
for (i = 0; i < 100; i++)
|
||||||
|
{
|
||||||
|
recDATA[i] = (float *)malloc(40 * sizeof(float));
|
||||||
|
memset(DREFArray[i], 0, 100);
|
||||||
|
}
|
||||||
|
sendPort = openUDP(49066, "127.0.0.1", 49009);
|
||||||
|
recvPort = openUDP(49008, "127.0.0.1", 49009);
|
||||||
|
strcpy(DREFArray[0], "sim/multiplayer/position/plane1_yolk_pitch");
|
||||||
|
strcpy(DREFArray[1], "sim/multiplayer/position/plane1_yolk_roll");
|
||||||
|
strcpy(DREFArray[2], "sim/multiplayer/position/plane1_yolk_yaw");
|
||||||
|
strcpy(DREFArray[3], "sim/multiplayer/position/plane1_throttle");
|
||||||
|
strcpy(DREFArray[4], "sim/multiplayer/position/plane1_gear_deploy");
|
||||||
|
strcpy(DREFArray[5], "sim/multiplayer/position/plane1_flap_ratio");
|
||||||
|
for (i = 0; i < 100; i++)
|
||||||
|
{
|
||||||
|
DREFSizes[i] = (int)strlen(DREFArray[i]);
|
||||||
|
}
|
||||||
|
CTRL[3] = 0.8; // Throttle
|
||||||
|
CTRL[4] = 1; // Gear
|
||||||
|
CTRL[5] = 0.5; // Flaps
|
||||||
|
|
||||||
|
// Execute
|
||||||
|
sendpCTRL(sendPort, 6, CTRL, 1);
|
||||||
|
result = requestDREF(sendPort, recvPort, DREFArray, DREFSizes, 9, recDATA, DREFSizes); // Test
|
||||||
|
|
||||||
|
// Close
|
||||||
|
closeUDP(sendPort);
|
||||||
|
closeUDP(recvPort);
|
||||||
|
|
||||||
|
// Tests
|
||||||
|
if (result < 0)// Request 1 value
|
||||||
|
{
|
||||||
|
return -6;
|
||||||
|
}
|
||||||
|
for (i = 0; i<6; i++)
|
||||||
|
{
|
||||||
|
if (fabs(recDATA[i][0] - CTRL[i])>1e-4)
|
||||||
|
{
|
||||||
|
return -i - 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
short sendPOSITest() // sendPOSI test
|
short sendPOSITest() // sendPOSI test
|
||||||
{
|
{
|
||||||
printf("sendPOSI - ");
|
printf("sendPOSI - ");
|
||||||
@@ -488,6 +547,7 @@ int main(int argc, const char * argv[])
|
|||||||
runTest(sendDREFTest);
|
runTest(sendDREFTest);
|
||||||
runTest(sendDATATest);
|
runTest(sendDATATest);
|
||||||
runTest(sendCTRLTest);
|
runTest(sendCTRLTest);
|
||||||
|
runTest(sendpCTRLTest);
|
||||||
runTest(sendPOSITest);
|
runTest(sendPOSITest);
|
||||||
runTest(pauseTest);
|
runTest(pauseTest);
|
||||||
runTest(connTest);
|
runTest(connTest);
|
||||||
|
|||||||
Reference in New Issue
Block a user