From 8932edbd67c265098978326ff56ba7091808849a Mon Sep 17 00:00:00 2001 From: Jason Watkins Date: Mon, 27 Apr 2015 10:02:31 -0700 Subject: [PATCH] Renamed "setDREF" function back to "sendDREF". --- C/src/xplaneConnect.c | 2 +- C/src/xplaneConnect.h | 2 +- C/xpcExample/xpcExample/src/main.cpp | 2 +- Java/Examples/BasicOperation/src/Main.java | 2 +- Java/src/XPlaneConnect.java | 6 +++--- MATLAB/+XPlaneConnect/XPlaneConnect.jar | Bin 6791 -> 6808 bytes .../+XPlaneConnect/{setDREF.m => sendDREF.m} | 2 +- TestScripts/C Tests/main.c | 2 +- TestScripts/Java Tests/XPlaneConnectTest.java | 14 +++++++------- .../{setDREFTest.m => sendDREFTest.m} | 4 ++-- TestScripts/MATLAB Tests/tests.m | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) rename MATLAB/+XPlaneConnect/{setDREF.m => sendDREF.m} (96%) rename TestScripts/MATLAB Tests/{setDREFTest.m => sendDREFTest.m} (89%) diff --git a/C/src/xplaneConnect.c b/C/src/xplaneConnect.c index b065bd0..ec44366 100755 --- a/C/src/xplaneConnect.c +++ b/C/src/xplaneConnect.c @@ -362,7 +362,7 @@ int readDATA(XPCSocket sock, float data[][9], int rows) /*****************************************************************************/ /**** DREF functions ****/ /*****************************************************************************/ -int setDREF(XPCSocket sock, const char* dref, float value[], int size) +int sendDREF(XPCSocket sock, const char* dref, float value[], int size) { // Setup command // 5 byte header + max 255 char dref name + max 255 values * 4 bytes per value = 1279 diff --git a/C/src/xplaneConnect.h b/C/src/xplaneConnect.h index 3a2a02e..8b38193 100644 --- a/C/src/xplaneConnect.h +++ b/C/src/xplaneConnect.h @@ -133,7 +133,7 @@ int sendDATA(XPCSocket sock, float data[][9], int rows); /// \param values An array of values representing the data to set. /// \param size The number of elements in values. /// \returns 0 if successful, otherwise a negative value. -int setDREF(XPCSocket sock, const char* dref, float value[], int size); +int sendDREF(XPCSocket sock, const char* dref, float value[], int size); /// Gets the value of the specified dataref. /// diff --git a/C/xpcExample/xpcExample/src/main.cpp b/C/xpcExample/xpcExample/src/main.cpp index 325622d..acc9219 100644 --- a/C/xpcExample/xpcExample/src/main.cpp +++ b/C/xpcExample/xpcExample/src/main.cpp @@ -93,7 +93,7 @@ int main() const char* dref = "sim/cockpit/switches/gear_handle_status"; // Gear handle data reference float gear = 0; // Stow gear - setDREF(sock, dref, &gear, 1); // Set gear to stow + sendDREF(sock, dref, &gear, 1); // Set gear to stow // Simulate for 10 seconds sleep(10); diff --git a/Java/Examples/BasicOperation/src/Main.java b/Java/Examples/BasicOperation/src/Main.java index 86d0648..1ab5bcc 100644 --- a/Java/Examples/BasicOperation/src/Main.java +++ b/Java/Examples/BasicOperation/src/Main.java @@ -71,7 +71,7 @@ public class Main try { Thread.sleep(10000); } catch (InterruptedException ex) {} System.out.println("Stowing landing gear"); - xpc.setDREF("sim/cockpit/switches/gear_handle_status", 1); + xpc.sendDREF("sim/cockpit/switches/gear_handle_status", 1); //Let sim run for 10 seconds try { Thread.sleep(10000); } catch (InterruptedException ex) {} diff --git a/Java/src/XPlaneConnect.java b/Java/src/XPlaneConnect.java index f59e18c..faa2204 100644 --- a/Java/src/XPlaneConnect.java +++ b/Java/src/XPlaneConnect.java @@ -306,9 +306,9 @@ public class XPlaneConnect implements AutoCloseable throw new IOException("No response received."); } - public void setDREF(String dref, float value) throws IOException + public void sendDREF(String dref, float value) throws IOException { - setDREF(dref, new float[] {value}); + sendDREF(dref, new float[] {value}); } /** @@ -318,7 +318,7 @@ public class XPlaneConnect implements AutoCloseable * @param value An array of floating point values whose structure depends on the dref specified. * @throws IOException If the command cannot be sent. */ - public void setDREF(String dref, float[] value) throws IOException + public void sendDREF(String dref, float[] value) throws IOException { //Preconditions if(dref == null) diff --git a/MATLAB/+XPlaneConnect/XPlaneConnect.jar b/MATLAB/+XPlaneConnect/XPlaneConnect.jar index edf9b739c8d56a5583ddc34dc3387973751d5355..495f2229d11ca87415c21a6aea892282f2fefe8e 100644 GIT binary patch delta 5737 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 G0000viW-Xm diff --git a/MATLAB/+XPlaneConnect/setDREF.m b/MATLAB/+XPlaneConnect/sendDREF.m similarity index 96% rename from MATLAB/+XPlaneConnect/setDREF.m rename to MATLAB/+XPlaneConnect/sendDREF.m index 13e6f00..65e23aa 100644 --- a/MATLAB/+XPlaneConnect/setDREF.m +++ b/MATLAB/+XPlaneConnect/sendDREF.m @@ -1,4 +1,4 @@ -function setDREF( dref, value, socket ) +function sendDREF( dref, value, socket ) % sendDREF Sends a command to X-Plane that sets the given DREF. % % Inputs diff --git a/TestScripts/C Tests/main.c b/TestScripts/C Tests/main.c index dca0291..487b351 100644 --- a/TestScripts/C Tests/main.c +++ b/TestScripts/C Tests/main.c @@ -150,7 +150,7 @@ int sendDREFTest() // sendDREF test } // Execution - setDREF(sock, drefs[0], &value, 1); + sendDREF(sock, drefs[0], &value, 1); int result = getDREFs(sock, drefs, data, 1, sizes); // Close diff --git a/TestScripts/Java Tests/XPlaneConnectTest.java b/TestScripts/Java Tests/XPlaneConnectTest.java index 8eb2b69..aed0883 100644 --- a/TestScripts/Java Tests/XPlaneConnectTest.java +++ b/TestScripts/Java Tests/XPlaneConnectTest.java @@ -308,7 +308,7 @@ public class XPlaneConnectTest float gearHandle = xpc.getDREF(dref)[0]; float value = gearHandle > 0.5 ? 0 : 1; - xpc.setDREF(dref, value); + xpc.sendDREF(dref, value); float result = xpc.getDREF(dref)[0]; assertEquals(value, result, 1e-4); @@ -320,7 +320,7 @@ public class XPlaneConnectTest { try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(null, 0); + xpc.sendDREF(null, 0); fail(); } } @@ -332,7 +332,7 @@ public class XPlaneConnectTest try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(dref, null); + xpc.sendDREF(dref, null); fail(); } } @@ -343,7 +343,7 @@ public class XPlaneConnectTest String dref = "sim/cockpit/switches/gear_handle_status"; try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(dref, new float[0]); + xpc.sendDREF(dref, new float[0]); fail(); } } @@ -358,7 +358,7 @@ public class XPlaneConnectTest String dref = "sim/cockpit/switches/gear_handle_status"; try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(dref, new float[200]); + xpc.sendDREF(dref, new float[200]); } } @@ -368,7 +368,7 @@ public class XPlaneConnectTest String dref = "sim/cockpit/switches/i/am/a/very/long/fake/dref/that/is/over/255/characters/./which/means/that/my/length/cant/be/encoded/in/the/single/byte/allocated/by/the/message/format/,/so/i/should/cause/an/exception/instead/./i/am/still/not/long/enough/./almost/there"; try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(dref, 0); + xpc.sendDREF(dref, 0); fail(); } } @@ -379,7 +379,7 @@ public class XPlaneConnectTest String dref = ""; try(XPlaneConnect xpc = new XPlaneConnect()) { - xpc.setDREF(dref, 0); + xpc.sendDREF(dref, 0); fail(); } } diff --git a/TestScripts/MATLAB Tests/setDREFTest.m b/TestScripts/MATLAB Tests/sendDREFTest.m similarity index 89% rename from TestScripts/MATLAB Tests/setDREFTest.m rename to TestScripts/MATLAB Tests/sendDREFTest.m index 70077b3..33741c2 100644 --- a/TestScripts/MATLAB Tests/setDREFTest.m +++ b/TestScripts/MATLAB Tests/sendDREFTest.m @@ -1,4 +1,4 @@ -function setDREFTest( ) +function sendDREFTest( ) %SENDREADTEST Summary of this function goes here % Detailed explanation goes here addpath('../../MATLAB') @@ -7,7 +7,7 @@ import XPlaneConnect.* DREFS = {'sim/cockpit/switches/gear_handle_status'}; value = randi([0 10]); -setDREF(DREFS{1},value); +sendDREF(DREFS{1},value); result = getDREFs(DREFS); assert(isequal(length(result),1),'setDREFTest: requestDREF unsucessful-wrong number of elements returned'); diff --git a/TestScripts/MATLAB Tests/tests.m b/TestScripts/MATLAB Tests/tests.m index ec2329f..6871686 100644 --- a/TestScripts/MATLAB Tests/tests.m +++ b/TestScripts/MATLAB Tests/tests.m @@ -13,7 +13,7 @@ disp(['XPC Tests-MATLAB (', os, ')']); theTests = {{@openCloseTest, 'Open/Close Test', 0},... {@sendTEXTTest,'TEXT Test', 0},... {@getDREFsTest,'Request DREF Test', 0},... - {@setDREFTest,'Send DREF Test', 0},... + {@sendDREFTest,'Send DREF Test', 0},... {@DATATest,'DATA Test', 0},... {@CTRLTest,'CTRL Test', 0},... {@POSITest,'POSI Test', 0},...