FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26 from jason-watkins/master

Browse Source 
CTest Fixes
This commit is contained in:
Christopher Teubert
2015-03-24 16:49:44 -07:00
parent 59d3bba414 66b074d89b
commit aac59dccf1
17 changed files with 33 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
C/src/xplaneConnect.c
View File

@@ -373,7 +373,7 @@ short sendPOSI(struct xpcSocket recfd, short ACNum, short numArgs, float valueAr
short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[])
{
char message[22] = {0};
char message[29] = {0};
int i;
short position = 5;
@@ -401,7 +401,7 @@ short sendCTRL(struct xpcSocket recfd, short numArgs, float valueArray[])
position += sizeof(float);
}
sendUDP(recfd, message, 22);
sendUDP(recfd, message, 29);
return 0;
}
@@ -571,10 +571,10 @@ short parseRequest(const char my_message[], float *resultArray[], short arraySiz
for (i=0; i<count; i++)
{
arraySizes[i] = my_message[place];
if (resultArray[i] != NULL)
{
free(resultArray[i]);
}
//if (resultArray[i] != NULL)
//{
// free(resultArray[i]);
//}
resultArray[i] = malloc(arraySizes[i]*sizeof(float));
memcpy(resultArray[i],&my_message[place + 1],arraySizes[i]*sizeof(float));

8
TestScripts/C Tests/main.c
View File

@@ -55,7 +55,7 @@ short sendReadTest() // send/read Test
// Initialization
int i; // Iterator
char test[] = {0, 1, 2, 3};
char test[] = {0, 1, 2, 3, 5};
char buf[5] = {0};
struct xpcSocket sendPort, recvPort;
@@ -257,9 +257,9 @@ short sendCTRLTest() // sendCTRL test
strcpy(DREFArray[3],"sim/flightmodel/engine/ENGN_thro");
strcpy(DREFArray[4],"sim/cockpit/switches/gear_handle_status");
strcpy(DREFArray[5],"sim/flightmodel/controls/flaprqsts");
for (i=0;i<5;i++) {
DREFSizes[i] = (int) strlen(DREFArray[i]);
}
for (i = 0; i < 100; i++) {
DREFSizes[i] = (int)strlen(DREFArray[i]);
}
CTRL[3] = 0.8; // Throttle
// Execute

BIN
xpcPlugin/Win/xpcPlugin32.xpl
View File

Binary file not shown.

BIN
xpcPlugin/Win/xpcPlugin64.xpl
View File

Binary file not shown.

7
xpcPlugin/XPCPlugin.cpp
View File

@@ -457,9 +457,10 @@ int handleCONN(char buf[])
updateLog(logmsg,strlen(logmsg));
// SEND CONFIRMATION
memcpy(sendSocket.xpIP,connectionList[current_connection].IP, sizeof(connectionList[current_connection].IP));
sendSocket.xpPort = connectionList[current_connection].recPort;
sendUDP(sendSocket, the_message, 5);
// TODO: Ivestigate why sending confirmation causes crashes on Windows 8
//memcpy(sendSocket.xpIP,connectionList[current_connection].IP, sizeof(connectionList[current_connection].IP));
//sendSocket.xpPort = connectionList[current_connection].recPort;
//sendUDP(sendSocket, the_message, 5);
return 0;
}

BIN
xpcPlugin/xpcPlugin/xpcPlugin.opensdf
View File

Binary file not shown.

BIN
xpcPlugin/xpcPlugin/xpcPlugin.sdf
View File

Binary file not shown.

4
xpcPlugin/xpcPlugin/xpcPlugin.sln
View File

@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.30723.0
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpcPlugin", "xpcPlugin\xpcPlugin.vcxproj", "{6AEF5D28-2701-44FF-AE10-1DEF07C5CAEA}"
EndProject

BIN
xpcPlugin/xpcPlugin/xpcPlugin.v12.suo
View File

Binary file not shown.

15
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.Build.CppClean.log
View File

@@ -1,15 +0,0 @@
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugintools.obj
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.obj
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xplaneconnect.obj
f:\work\x-plane 10\resources\plugins\xpcplugin.ilk
f:\work\x-plane 10\resources\plugins\xpcplugin.xpl
f:\work\x-plane 10\resources\plugins\xpcplugin.pdb
f:\work\x-plane 10\resources\plugins\xpcplugin.lib
f:\work\x-plane 10\resources\plugins\xpcplugin.exp
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\cl.command.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\cl.read.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\cl.write.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\link.command.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\link.read.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\link.write.1.tlog
c:\users\mfeary-admin\documents\flightz\xpcplugin\xpcplugin\xpcplugin\x64\debug\xpcplugin.tlog\xpcplugin.write.1u.tlog

19
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.log
View File

@@ -1,19 +0,0 @@
Build started 9/30/2014 4:05:30 PM.
1>Project "C:\Users\mfeary-admin\Documents\flightz\xpcPlugin\xpcPlugin\xpcPlugin\xpcPlugin.vcxproj" on node 2 (Build target(s)).
1>ClCompile:
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\CL.exe /c /I./src /I"F:\work\Aide-777\dev\SDK\CHeaders\XPLM" /I"C:\Users\mfeary-admin\Documents\flightz\xpcPlugin" /Z7 /nologo /W3 /WX- /MP /Od /D IBM=1 /D XPLM200 /D _DEBUG /D _WINDOWS /D _USRDLL /D XPCPLUGIN_EXPORTS /D _WINDLL /D _MBCS /Gm- /EHsc /RTC1 /MDd /GS /Gy- /fp:precise /Zc:wchar_t /Zc:forScope /Fo"x64\Debug\\" /Fd"x64\Debug\vc120.pdb" /Gd /TP /wd4996 /wd4267 /errorReport:prompt ..\..\XPCPlugin.cpp
XPCPlugin.cpp
Link:
C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\link.exe /ERRORREPORT:PROMPT /OUT:"F:\work\X-Plane 10\Resources\Plugins\xpcPlugin.xpl" /INCREMENTAL /NOLOGO /LIBPATH:"F:\work\Aide-777\dev\SDK\Libraries\Win" XPLM_64.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"F:\work\X-Plane 10\Resources\Plugins\xpcPlugin.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"F:\work\X-Plane 10\Resources\Plugins\xpcPlugin.lib" /MACHINE:X64 /DLL x64\Debug\xplaneConnect.obj
x64\Debug\XPCPlugin.obj
x64\Debug\xpcPluginTools.obj
..\..\SDK\Libraries\Win\XPLM.lib
..\..\SDK\Libraries\Win\XPLM_64.lib
..\..\SDK\Libraries\Win\XPWidgets.lib
..\..\SDK\Libraries\Win\XPWidgets_64.lib
xpcPlugin.vcxproj -> F:\work\X-Plane 10\Resources\Plugins\xpcPlugin.xpl
1>Done Building Project "C:\Users\mfeary-admin\Documents\flightz\xpcPlugin\xpcPlugin\xpcPlugin\xpcPlugin.vcxproj" (Build target(s)).
Build succeeded.
Time Elapsed 00:00:01.65

BIN
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/CL.read.1.tlog
View File

Binary file not shown.

BIN
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/cl.command.1.tlog
View File

Binary file not shown.

2
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/xpcPlugin.lastbuildstate
View File

@@ -1,2 +0,0 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
Debug|x64|C:\Users\mfeary-admin\Documents\flightz\xpcPlugin\xpcPlugin\|

BIN
xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xplaneConnect.obj
View File

Binary file not shown.

20
xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
View File

@@ -70,14 +70,17 @@
<LinkIncremental>true</LinkIncremental>
<OutDir>..\..\Win</OutDir>
<TargetExt>.xpl</TargetExt>
<IncludePath>\\vmware-host\Shared Folders\Documents\xplaneconnect\xpcPlugin\SDK\CHeaders\XPLM;\\vmware-host\Shared Folders\Documents\xplaneconnect\C\src;$(IncludePath)</IncludePath>
<LibraryPath>\\vmware-host\Shared Folders\Documents\xplaneconnect\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
<IncludePath>..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
<LibraryPath>..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
<TargetName>$(ProjectName)32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetExt>.xpl</TargetExt>
<IncludePath>..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)</IncludePath>
<LibraryPath>..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)</LibraryPath>
<TargetName>$(ProjectName)64</TargetName>
<LinkIncremental>true</LinkIncremental>
<IncludePath>C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;$(IncludePath)</IncludePath>
<OutDir>$(XplaneDir)\Resources\Plugins\</OutDir>
<OutDir>..\..\Win</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@@ -114,20 +117,18 @@
<PreprocessorDefinitions>IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>
</SDLCheck>
<AdditionalIncludeDirectories>./src;$(XplaneSDK)\CHeaders\XPLM;C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<OmitFramePointers>
</OmitFramePointers>
<FunctionLevelLinking>false</FunctionLevelLinking>
<DisableSpecificWarnings>4996;4267</DisableSpecificWarnings>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(XplaneSDK)\Libraries\Win;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>XPLM_64.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -175,6 +176,7 @@
<ClCompile Include="..\..\XPCPlugin.cpp" />
<ClCompile Include="..\..\xpcPluginTools.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemGroup>
<ItemGroup>

21
xpcPlugin/xpcPluginTools.cpp
View File

@@ -272,28 +272,19 @@ int updateLog(const char *buffer, int length)
time_t rawtime;
struct tm * timeinfo;
char logBuffer[522] = {0};
char logBuffer[523] = { 0 };
FILE * logFile;
char errorMessage[100] = "Log Message Omitted-Too Long (500 character max)";
logFile = fopen("xpcLog.txt","a");
time(&rawtime);
timeinfo = localtime(&rawtime);
#if defined _WIN32
// strftime(logBuffer,500,"[%F %T] ",timeinfo);
#else
strftime(logBuffer,500,"[%F %T] ",timeinfo);
#endif
// Format is equivalent to [%F %T], but neither of those specifiers is
// supported on Windows as of Visual Studio 13
strftime(logBuffer, 523, "[%Y-%m-%d %H:%M:%S] ", timeinfo);
if (length <= 500)
{
memcpy(&(logBuffer[22]),buffer,length);
}
else
{
memcpy(&(logBuffer[22]),errorMessage,strlen(errorMessage));
}
length = length < 500 ? length : 500;
memcpy(&(logBuffer[22]), buffer, length);
fprintf(logFile,"%s\n",logBuffer);