1.0.7 Removed non required includes, prevented Dumper from reading de…

…leted values, Updated objectlist.txt
Luuk3333 · Nov 14, 2017 · a9ca8d3 · a9ca8d3
1 parent 5c7d57a
commit a9ca8d3
Show file tree

Hide file tree

Showing 12 changed files with 67,335 additions and 67,360 deletions.
diff --git a/README.md b/README.md
@@ -12,16 +12,20 @@ https://forums.x-plane.org/index.php?/files/file/40834-flightfactor-a320-connect
 
 # Download Nightly Builds
 
-If you want to get the absolutely latest build, click here: https://github.com/mokny/FFA320Connector/releases 
+If you want to get the absolutely latest build, click "Clone or Download" and then "Download ZIP"
 Put the FFA320Connector folder from the bin directory into your A320's Plugins folder.
 
 ## Installation
 
 The folder FFA320Connector must be placed in the A320\plugins 
 folder, or in the main X-Plane\Resources\plugins folder.
 
-## Building the FFA320 Connector
+## Building the FFA320 Connector on Windows
 
 To build the FFA320 Connector, you need Visual C++ 2013 or
-later. I am searching for someone who is able to compile it
-for Mac / Linux. Leave me a message at the X-Plane forums.
+later.
+
+## Building the FFA320 Connector on MaxOS
+
+I am urgently searching for someone who is able to compile it
+for Mac / Linux. Leave me a message at the X-Plane forums.
diff --git a/bin/FFA320Connector/64/win.xpl b/bin/FFA320Connector/64/win.xpl
diff --git a/bin/FFA320Connector/objectlist.txt b/bin/FFA320Connector/objectlist.txt
diff --git a/src/FFA320Connector.cpp b/src/FFA320Connector.cpp
@@ -8,20 +8,13 @@
 
 #pragma warning(disable: 4996)
 
-#include "XPLMDisplay.h"
-#include "XPLMGraphics.h"
 #include "XPLMDataAccess.h"
 #include "XPLMPlugin.h"
 #include "XPLMUtilities.h"
 #include "XPLMProcessing.h"
-#include "XPLMScenery.h"
 #include "XPLMMenus.h"
-#include "XPLMGraphics.h"
 #include "XPLMPlanes.h"
 #include "XPLMDataAccess.h"
-#include "XPLMNavigation.h"
-#include "XPWidgets.h"
-#include "XPStandardWidgets.h"
 #include <stdio.h>
 #include <algorithm>
 #include <string.h>
@@ -73,6 +66,7 @@ bool					InternalDatarefUpdate = FALSE;																		// For recognition if i
 
 bool					DumpObjectsToLogActive = FALSE;
 void					DumpObjectsToLog();																					//Constructor
+
 /*
 * StringToObjectType
 *
@@ -253,8 +247,9 @@ class DataObject {
 		}
 
 		void destroy() {
-			/* Remove the CommandHandler */
-			XPLMUnregisterCommandHandler(CMD, UniversalCommandHandler, 0, 0);
+			/* Remove the CommandHandler + Dataref */
+			if (CMD != NULL) XPLMUnregisterCommandHandler(CMD, UniversalCommandHandler, 0, 0);
+			if (DREF != NULL) XPLMUnregisterDataAccessor(DREF);
 		}
 
 };
@@ -468,6 +463,7 @@ void DumpObjectsToLog() {
 	LogWrite("=============== DUMP OF ALL A320 OBJECTS AND PARAMETERS =================");
 	unsigned int valuesCount = ffAPI.ValuesCount();
 	int valueID = -1;
+
 	unsigned int ii = 0;
 	for (ii = 0; ii < valuesCount; ii++) {
 		int TmpParentID = -1;
@@ -477,68 +473,71 @@ void DumpObjectsToLog() {
 		char *valueName, *valueDescription;
 
 		valueID = ffAPI.ValueIdByIndex(ii);
-		valueName = (char *)ffAPI.ValueName(valueID);
-		valueDescription = (char *)ffAPI.ValueDesc(valueID);
 
-		unsigned int valueType = ffAPI.ValueType(valueID);
-		unsigned int valueFlag = ffAPI.ValueFlags(valueID);
+		if (valueID >= 0) { 
+			valueName = (char *)ffAPI.ValueName(valueID);
+			valueDescription = (char *)ffAPI.ValueDesc(valueID);
 
-		int parentValueID = ffAPI.ValueParent(valueID);
+			unsigned int valueType = ffAPI.ValueType(valueID);
+			unsigned int valueFlag = ffAPI.ValueFlags(valueID);
 
-		TmpValueID = valueID;
-		TmpParentID = parentValueID;
-		while ((TmpParentID > 0) && (TmpValueID > 0)) {
-			TmpParentID = ffAPI.ValueParent(TmpValueID);
-			if ((TmpParentID >= 0) && (TmpValueID > 0)) FullObjectName = string((char *)ffAPI.ValueName(TmpParentID)) + string(".") + FullObjectName;
-			TmpValueID = TmpParentID;
-		}
-		FullObjectName += string(valueName);
+			int parentValueID = ffAPI.ValueParent(valueID);
 
-		char *valueTypeString;
+			// Here we get all the parents to get the full name of the object
+			TmpValueID = valueID;
+			TmpParentID = parentValueID;
+			while ((TmpParentID > 0) && (TmpValueID > 0)) {
+				TmpParentID = ffAPI.ValueParent(TmpValueID);
+				if ((TmpParentID >= 0) && (TmpValueID >= 0)) FullObjectName = string((char *)ffAPI.ValueName(TmpParentID)) + string(".") + FullObjectName;
+				TmpValueID = TmpParentID;
+			}
+			FullObjectName += string(valueName);
 
-		if (valueType == Value_Type_Deleted) {
-			valueTypeString = "Deleted";
-		}
-		else if (valueType == Value_Type_Object) {
-			valueTypeString = "Object";
-		}
-		else if (valueType == Value_Type_sint8) {
-			valueTypeString = "sint8";
-		}
-		else if (valueType == Value_Type_uint8) {
-			valueTypeString = "uint8";
-		}
-		else if (valueType == Value_Type_sint16) {
-			valueTypeString = "sint16";
-		}
-		else if (valueType == Value_Type_uint16) {
-			valueTypeString = "uint16";
-		}
-		else if (valueType == Value_Type_sint32) {
-			valueTypeString = "sint32";
-		}
-		else if (valueType == Value_Type_uint32) {
-			valueTypeString = "uint32";
-		}
-		else if (valueType == Value_Type_float32) {
-			valueTypeString = "float32";
-		}
-		else if (valueType == Value_Type_float64) {
-			valueTypeString = "float64";
-		}
-		else if (valueType == Value_Type_String) {
-			valueTypeString = "String";
-		}
-		else if (valueType == Value_Type_Time) {
-			valueTypeString = "Time";
-		}
-		else {
-			valueTypeString = "UNKNOWN";
-		}
+			char *valueTypeString;
 
-
+			if (valueType == Value_Type_Deleted) {
+				valueTypeString = "Deleted";
+			}
+			else if (valueType == Value_Type_Object) {
+				valueTypeString = "Object";
+			}
+			else if (valueType == Value_Type_sint8) {
+				valueTypeString = "sint8";
+			}
+			else if (valueType == Value_Type_uint8) {
+				valueTypeString = "uint8";
+			}
+			else if (valueType == Value_Type_sint16) {
+				valueTypeString = "sint16";
+			}
+			else if (valueType == Value_Type_uint16) {
+				valueTypeString = "uint16";
+			}
+			else if (valueType == Value_Type_sint32) {
+				valueTypeString = "sint32";
+			}
+			else if (valueType == Value_Type_uint32) {
+				valueTypeString = "uint32";
+			}
+			else if (valueType == Value_Type_float32) {
+				valueTypeString = "float32";
+			}
+			else if (valueType == Value_Type_float64) {
+				valueTypeString = "float64";
+			}
+			else if (valueType == Value_Type_String) {
+				valueTypeString = "String";
+			}
+			else if (valueType == Value_Type_Time) {
+				valueTypeString = "Time";
+			}
+			else {
+				valueTypeString = "UNKNOWN";
+			}
 
-		LogWrite("#" + to_string(valueID) + ": " + FullObjectName + " - " + string(valueDescription) + " (" + valueTypeString + ")" + " Value-Flag: " + to_string(valueFlag));
+			LogWrite("#" + to_string(valueID) + ": " + FullObjectName + " - " + string(valueDescription) + " (" + valueTypeString + ")" + " Value-Flag: " + to_string(valueFlag));
+
+		}
 
 	}
 	LogWrite("=============== DUMP END =================");

diff --git a/src/FFA320Connector.sdf b/src/FFA320Connector.sdf
diff --git a/src/FFA320Connector.v12.suo b/src/FFA320Connector.v12.suo
diff --git a/src/Release/64/Custom-Command-with-Custom-DataRef.exp b/src/Release/64/Custom-Command-with-Custom-DataRef.exp
diff --git a/src/Release/64/Custom-Command-with-Custom-DataRef.lib b/src/Release/64/Custom-Command-with-Custom-DataRef.lib
diff --git a/src/Release/64/FFA320Connector.log b/src/Release/64/FFA320Connector.log
@@ -1,11 +1,11 @@
-Der Buildvorgang wurde am 14.11.2017 09:38:20 gestartet.
+Der Buildvorgang wurde am 14.11.2017 12:12:07 gestartet.
      1>Projekt "E:\FFA320Connector\src\FFA320Connector.vcxproj" auf Knoten "2", Rebuild Ziel(e).
      1>ClCompile:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\CL.exe /c /ISDK\CHeaders\XPLM /ISDK\CHeaders\Widgets /Zi /nologo /W3 /WX- /O2 /Ob1 /D WIN32 /D NDEBUG /D _WINDOWS /D _USRDLL /D SIMDATA_EXPORTS /D IBM=1 /D XPLM200=1 /D XPLM210=1 /D _CRT_SECURE_NO_WARNINGS /D _VC80_UPGRADE=0x0600 /D _WINDLL /D _MBCS /GF /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Fo".\Release\64\\" /Fd".\Release\64\vc120.pdb" /Gd /TP /errorReport:prompt FFA320Connector.cpp
          FFA320Connector.cpp
-     1>FFA320Connector.cpp(40): warning C4005: 'XPLM200': Makro-Neudefinition
+     1>FFA320Connector.cpp(33): warning C4005: 'XPLM200': Makro-Neudefinition
                  Befehlszeilenargumente: siehe vorherige Definition von "XPLM200"
-     1>FFA320Connector.cpp(797): warning C4244: 'Argument': Konvertierung von 'float' in 'int', möglicher Datenverlust
+     1>FFA320Connector.cpp(796): warning C4244: 'Argument': Konvertierung von 'float' in 'int', möglicher Datenverlust
        Link:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64\link.exe /ERRORREPORT:PROMPT /OUT:"..\bin\FFA320Connector\64\win.xpl" /INCREMENTAL:NO /NOLOGO /LIBPATH:SDK\Libraries\Win Opengl32.lib odbc32.lib odbccp32.lib XPLM_64.lib XPWidgets_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:NO /PDB:"..\bin\FFA320Connector\64\win.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\Release\64\Custom-Command-with-Custom-DataRef.lib" /MACHINE:X64 /DLL .\Release\64\FFA320Connector.obj
             Bibliothek ".\Release\64\Custom-Command-with-Custom-DataRef.lib" und Objekt ".\Release\64\Custom-Command-with-Custom-DataRef.exp" werden erstellt.
@@ -14,4 +14,4 @@
 
 Build erfolgreich.
 
-Verstrichene Zeit 00:00:00.98
+Verstrichene Zeit 00:00:01.00
diff --git a/src/Release/64/FFA320Connector.obj b/src/Release/64/FFA320Connector.obj
diff --git a/src/Release/64/FFA320Connector.tlog/CL.read.1.tlog b/src/Release/64/FFA320Connector.tlog/CL.read.1.tlog
diff --git a/src/Release/64/vc120.pdb b/src/Release/64/vc120.pdb