From 0c2e786890aa10f734869b2d3230e9665148bd75 Mon Sep 17 00:00:00 2001 From: Chris Teubert Date: Fri, 3 Apr 2015 10:47:55 -0700 Subject: [PATCH] Removed "sim/" auto add feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed “sim/“ auto add feature. There are some drefs (custom/art) that do not start with “sim/“ --- C/xpcExample/xpcExample/src/main.cpp | 2 +- MATLAB/Example/Example.m | 2 +- TestScripts/C Tests/main.c | 2 +- TestScripts/CPP Tests/main.cpp | 2 +- TestScripts/MATLAB Tests/requestDREFTest.m | 2 +- xpcPlugin/XPCPlugin.cpp | 3 --- xpcPlugin/XPlaneConnect/mac.xpl | Bin 48740 -> 48620 bytes xpcPlugin/xpcPluginTools.cpp | 17 ----------------- xpcPlugin/xpcPluginTools.h | 4 +--- 9 files changed, 6 insertions(+), 28 deletions(-) diff --git a/C/xpcExample/xpcExample/src/main.cpp b/C/xpcExample/xpcExample/src/main.cpp index 13e5a6e..f4ba86b 100644 --- a/C/xpcExample/xpcExample/src/main.cpp +++ b/C/xpcExample/xpcExample/src/main.cpp @@ -105,7 +105,7 @@ int main() { // SendDREF (Landing Gear) printf("- Stowing Landing Gear\n"); - strcpy(DREF, "cockpit/switches/gear_handle_status"); // Gear handle data reference + strcpy(DREF, "sim/cockpit/switches/gear_handle_status"); // Gear handle data reference DREFSizes[0] = strlen(DREF); gear = 1; // Stow gear diff --git a/MATLAB/Example/Example.m b/MATLAB/Example/Example.m index aadea40..9803791 100644 --- a/MATLAB/Example/Example.m +++ b/MATLAB/Example/Example.m @@ -45,7 +45,7 @@ sendDATA(data); pause(10) % Run sim for 10 seconds %% Use DREF to raise landing gear disp('Raising gear'); - gearDREF = 'cockpit/switches/gear_handle_status'; + gearDREF = 'sim/cockpit/switches/gear_handle_status'; sendDREF(gearDREF, 0); pause(10) % Run sim for 10 seconds %% Confirm gear and paus status by reading DREFs diff --git a/TestScripts/C Tests/main.c b/TestScripts/C Tests/main.c index 08dfc47..04f7037 100644 --- a/TestScripts/C Tests/main.c +++ b/TestScripts/C Tests/main.c @@ -103,7 +103,7 @@ short requestDREFTest() // Request DREF Test (Required for next tests) sendPort = openUDP( 49064, "127.0.0.1", 49009 ); recvPort = openUDP( 49008, "127.0.0.1", 49009 ); strcpy(DREFArray[0],"sim/cockpit/switches/gear_handle_status"); - strcpy(DREFArray[1],"cockpit2/switches/panel_brightness_ratio"); + strcpy(DREFArray[1],"sim/cockpit2/switches/panel_brightness_ratio"); for (i=0;i<2;i++) { DREFSizes[i] = (int) strlen(DREFArray[i]); } diff --git a/TestScripts/CPP Tests/main.cpp b/TestScripts/CPP Tests/main.cpp index f69e7ef..5f8ea20 100755 --- a/TestScripts/CPP Tests/main.cpp +++ b/TestScripts/CPP Tests/main.cpp @@ -106,7 +106,7 @@ void requestDREFTest() // Request DREF Test (Required for next tests) sendPort = openUDP( 49064, "127.0.0.1", 49009 ); recvPort = openUDP( 49008, "127.0.0.1", 49009 ); strcpy(DREFArray[0],"sim/cockpit/switches/gear_handle_status"); - strcpy(DREFArray[1],"cockpit2/switches/panel_brightness_ratio"); + strcpy(DREFArray[1],"sim/cockpit2/switches/panel_brightness_ratio"); for (i=0;i<2;i++) { DREFSizes[i] = (int) strlen(DREFArray[i]); } diff --git a/TestScripts/MATLAB Tests/requestDREFTest.m b/TestScripts/MATLAB Tests/requestDREFTest.m index e9ce4d3..36e5f70 100644 --- a/TestScripts/MATLAB Tests/requestDREFTest.m +++ b/TestScripts/MATLAB Tests/requestDREFTest.m @@ -5,7 +5,7 @@ addpath('../../MATLAB') import XPlaneConnect.* DREFS = {'sim/cockpit/switches/gear_handle_status',... - 'cockpit2/switches/panel_brightness_ratio'}; + 'sim/cockpit2/switches/panel_brightness_ratio'}; result = requestDREF(DREFS); diff --git a/xpcPlugin/XPCPlugin.cpp b/xpcPlugin/XPCPlugin.cpp index 5776f8b..1861cc3 100755 --- a/xpcPlugin/XPCPlugin.cpp +++ b/xpcPlugin/XPCPlugin.cpp @@ -829,7 +829,6 @@ int handleGETD(char buf[]) { if (listLength > 0) { - handleDREFSIM(DREFArray[i]);// Adds "sim/" if not present connectionList[current_connection].XPLMRequestedDRefs[i] = XPLMFindDataRef(DREFArray[i]); } @@ -908,8 +907,6 @@ int handleDREF(char buf[]) } // Handle DREF - handleDREFSIM(DREF);// Adds "sim/" if not present - sprintf(logmsg,"[DREF] Request to set DREF value received (Conn %i): %s",current_connection+1,DREF); updateLog(logmsg,strlen(logmsg)); diff --git a/xpcPlugin/XPlaneConnect/mac.xpl b/xpcPlugin/XPlaneConnect/mac.xpl index fd4150ca52fa596eaf03163f0aa34a62a1aeac04..0e3fcbabc127b0360be20affe313ca7a613937f6 100755 GIT binary patch delta 15094 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 diff --git a/xpcPlugin/xpcPluginTools.cpp b/xpcPlugin/xpcPluginTools.cpp index caa60f2..442cef3 100644 --- a/xpcPlugin/xpcPluginTools.cpp +++ b/xpcPlugin/xpcPluginTools.cpp @@ -304,23 +304,6 @@ unsigned short getIP(struct sockaddr recvaddr, char *IP) return ntohs((*sendaddr).sin_port); } -int handleDREFSIM(char *DREF) -{ - //checks if sim/ is at the beginning of the dref string. If not, adds it. - char firstFour[5] = {0}; - char fullDREF[200] = {0}; - - memcpy(firstFour,DREF,4); - - if (strcmp(firstFour,"sim/") != 0) - { - sprintf(fullDREF, "sim/%s",DREF); - memcpy(DREF,fullDREF,strlen(fullDREF)); - } - - return 0; -} - // DEBUGGING TOOLS // -------------------------------- int printBufferToLog(struct XPCMessage & msg) diff --git a/xpcPlugin/xpcPluginTools.h b/xpcPlugin/xpcPluginTools.h index e7cba98..93ac3de 100644 --- a/xpcPlugin/xpcPluginTools.h +++ b/xpcPlugin/xpcPluginTools.h @@ -41,9 +41,7 @@ unsigned short getIP(struct sockaddr recvaddr, char *IP); int printBufferToLog(struct XPCMessage & msg); - - int handleDREFSIM(char *DREF); - + int fmini(int a, int b);