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 fd4150c..0e3fcba 100755 Binary files a/xpcPlugin/XPlaneConnect/mac.xpl and b/xpcPlugin/XPlaneConnect/mac.xpl differ 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);