diff --git a/C/src/xplaneConnect.c b/C/src/xplaneConnect.c
index 0f209bb..8637325 100755
--- a/C/src/xplaneConnect.c
+++ b/C/src/xplaneConnect.c
@@ -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;
}
diff --git a/TestScripts/C Tests/main.c b/TestScripts/C Tests/main.c
index 8c8e4f8..e3bac8e 100644
--- a/TestScripts/C Tests/main.c
+++ b/TestScripts/C Tests/main.c
@@ -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
diff --git a/xpcPlugin/Win/xpcPlugin.xpl b/xpcPlugin/Win/xpcPlugin.xpl
deleted file mode 100755
index a14d7b9..0000000
Binary files a/xpcPlugin/Win/xpcPlugin.xpl and /dev/null differ
diff --git a/xpcPlugin/Win/xpcPlugin32.xpl b/xpcPlugin/Win/xpcPlugin32.xpl
index 8981551..81a1eea 100644
Binary files a/xpcPlugin/Win/xpcPlugin32.xpl and b/xpcPlugin/Win/xpcPlugin32.xpl differ
diff --git a/xpcPlugin/Win/xpcPlugin64.xpl b/xpcPlugin/Win/xpcPlugin64.xpl
index 159eb42..b9e8ba7 100644
Binary files a/xpcPlugin/Win/xpcPlugin64.xpl and b/xpcPlugin/Win/xpcPlugin64.xpl differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.opensdf b/xpcPlugin/xpcPlugin/xpcPlugin.opensdf
deleted file mode 100644
index bda2342..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin.opensdf and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.sdf b/xpcPlugin/xpcPlugin/xpcPlugin.sdf
deleted file mode 100644
index e060a79..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin.sdf and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.sln b/xpcPlugin/xpcPlugin/xpcPlugin.sln
index b61ddc4..6567ac2 100644
--- a/xpcPlugin/xpcPlugin/xpcPlugin.sln
+++ b/xpcPlugin/xpcPlugin/xpcPlugin.sln
@@ -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
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin.v12.suo b/xpcPlugin/xpcPlugin/xpcPlugin.v12.suo
deleted file mode 100644
index 2309565..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin.v12.suo and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.Build.CppClean.log b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.Build.CppClean.log
deleted file mode 100644
index 7e10bc2..0000000
--- a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.Build.CppClean.log
+++ /dev/null
@@ -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
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.log b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.log
deleted file mode 100644
index 849c4b7..0000000
--- a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.log
+++ /dev/null
@@ -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
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/CL.read.1.tlog b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/CL.read.1.tlog
deleted file mode 100644
index de665a3..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/CL.read.1.tlog and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/cl.command.1.tlog b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/cl.command.1.tlog
deleted file mode 100644
index 24d049c..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/cl.command.1.tlog and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/xpcPlugin.lastbuildstate b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/xpcPlugin.lastbuildstate
deleted file mode 100644
index 75f795c..0000000
--- a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xpcPlugin.tlog/xpcPlugin.lastbuildstate
+++ /dev/null
@@ -1,2 +0,0 @@
-#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
-Debug|x64|C:\Users\mfeary-admin\Documents\flightz\xpcPlugin\xpcPlugin\|
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xplaneConnect.obj b/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xplaneConnect.obj
deleted file mode 100644
index 6705d39..0000000
Binary files a/xpcPlugin/xpcPlugin/xpcPlugin/x64/Debug/xplaneConnect.obj and /dev/null differ
diff --git a/xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj b/xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
index bdd8d82..68f60ad 100644
--- a/xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
+++ b/xpcPlugin/xpcPlugin/xpcPlugin/xpcPlugin.vcxproj
@@ -70,14 +70,17 @@
true
..\..\Win
.xpl
- \\vmware-host\Shared Folders\Documents\xplaneconnect\xpcPlugin\SDK\CHeaders\XPLM;\\vmware-host\Shared Folders\Documents\xplaneconnect\C\src;$(IncludePath)
- \\vmware-host\Shared Folders\Documents\xplaneconnect\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)
+ ..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)
+ ..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)
+ $(ProjectName)32
.xpl
+ ..\..\xpcPlugin\SDK\CHeaders\XPLM;..\..\C\src;$(IncludePath)
+ ..\..\xpcPlugin\SDK\Libraries\Win;$(LibraryPath)
+ $(ProjectName)64
true
- C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;$(IncludePath)
- $(XplaneDir)\Resources\Plugins\
+ ..\..\Win
false
@@ -114,20 +117,18 @@
IBM=1;XPLM200;_DEBUG;_WINDOWS;_USRDLL;XPCPLUGIN_EXPORTS;%(PreprocessorDefinitions)
- ./src;$(XplaneSDK)\CHeaders\XPLM;C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;%(AdditionalIncludeDirectories)
+ ./src;../../SDK/CHeaders/XPLM;../../;../../../C/src;%(AdditionalIncludeDirectories)
OldStyle
true
false
- 4996;4267
+ 4996
false
- Console
+ Windows
true
- $(XplaneSDK)\Libraries\Win;%(AdditionalLibraryDirectories)
- XPLM_64.lib;%(AdditionalDependencies)
@@ -175,6 +176,7 @@
C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)
+ C:\Users\mfeary-admin\Documents\flightz\xpcPlugin;C:\Users\mfeary-admin\Documents\flightz\C\src;%(AdditionalIncludeDirectories)
diff --git a/xpcPlugin/xpcPluginTools.cpp b/xpcPlugin/xpcPluginTools.cpp
index 7ec1fcb..caa60f2 100644
--- a/xpcPlugin/xpcPluginTools.cpp
+++ b/xpcPlugin/xpcPluginTools.cpp
@@ -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);