Version 1.3-rc.1 (#138)
* Minor improvements to the handling of landing gear by the SetGear and HandlePOSI functions * sendPOSI command change (double for lat/lon/h) (#111) * Updated POSI to use doubles for lat/lon/alt, as step size for floats was unacceptably large at high longitudes. * Updated Java library for MATLAB, updated Java project, and updated Windows plugin binaries * Rolled back Java version to 1.7 for MATLAB compatibility * Update MessageHandlers.cpp * Update DataManager.cpp * Added pause functionality for individual a/c Adds new cases such that: 0: Unpauses all a/c 1: Pauses all a/c 2: Switches case for all a/c 100:119: Pauses a/c 0:19 200:219: Unpauses a/c 0:19 Updates log messages. Keeps the 0,1,2 arguments as they previously were. * Finished individual pause functionality * Update DataManager.cpp * Updated flags to allow for individual pause commands * Individual pause command documentation * Updated flags to allow for individual pause commands * Adding individual pause to documentation * Updated flags to allow for individual pause commands * Requested changes, cleaning * Update CMakeLists.txt Include "-fno-stack-protector" for linking and compiling for systems that do not have this have this flag as a default. * Enabling AI after setting position (#118) Previously, the code enabled the AI before setting the position of a/c, which negated its purpose. * Updated XPlane SDK to version 2.1.3 * Resolve function ambiguity for std::abs on mac Fixes #126 * Update copyright notice * Update Windows binaries * Update Linux binaries * Update version numbers * fix osx abs ambiguity (#142) * fix indexing error (#143) * Runway camera location control (#144) * update ignore * basics working * set cam pos remotely * log cam position * keep default behaviour, if short view message is received Compatibility with existing software * all to tabs * rename variable * option to use camera direction fields * Added UDP multicast for plugin discovery (#153) * Added Timer * Added UDPSocket::GetAddr * Added MessageHandlers::SendBeacon() * PoC of starting a timer on PluginEnable * C++11 * Added Timer to xcode project * C++11 in cmake * added Timer to cmake * use function pointer in Timer * moved Timer to namespace + wait for thread to join when stopping the timer * Windows: changed uint to unisgned short * Windows: Added Timer.h/cpp to project * GetAddr static * Send xplane and plugin version with BECN * SendBeacon with params * fixed file copyrights * Include functional to fix Linux compile error * review fixes * Send plugin receive port in BECN * review fixes * Fixed tabs vs spaces indentations (#157) * Java client BECN implementation (#155) * Added MS Azure Dev Ops CI integration (#162) * Do not build for i386 on macOS Use ARCHS_STANDARD to avoid the error “The i386 architecture is deprecated. You should update your ARCHS build setting to remove the i386 architecture.” * Fixed missing include The Visual Studio solution was not compiling * Fixed isnan ambigious refernce Ambigious reference when compiling on travis https://stackoverflow.com/questions/33770374/why-is-isnan-ambiguous-and-how-to-avoid-it * Set MSVC warning level to 3 Too many warnings were generated when building a Release build making Travis job to fail because of too much output * Use default toolset for Visual Studio AppVeyor recommends to set the default toolset * #include <cstdint> * Use MSVC ToolsVersion="14.0" # Conflicts: # xpcPlugin/xpcPlugin/xpcPlugin.vcxproj * Removed binaries from repository # Conflicts: # xpcPlugin/XPlaneConnect/64/win.xpl # xpcPlugin/XPlaneConnect/win.xpl * Added ms azure ci xcode linux linux + macos linux + macos removed branch filter win tests win tests Test all platfroms artifacts tests * output all binaries to ‘XPlaneConnect’ All platforms produce a binary in xpcPlugin/XPlaneConnect/ xpcPlugin/XPlaneConnect/64/ * Added ms azure GH deploy deploy stage GH release test trigger tags * Clean up yml file - Added variables - Added job decriptions * Ignore script to ignore .exp files + fixed output path * Renamed ms azure GH connection * Update service connection for azure pipeline * Added Python3 compatible xpc client. (#156) * Update Azure Pipelines service connection
This commit is contained in:
Jason Watkins
@@ -542,15 +542,15 @@ public class XPlaneConnectTest
|
||||
public void testSendPOSI() throws IOException
|
||||
{
|
||||
String[] drefs = {
|
||||
"sim/flightmodel/position/latitude",
|
||||
"sim/flightmodel/position/longitude",
|
||||
"sim/flightmodel/position/y_agl",
|
||||
"sim/flightmodel/position/phi",
|
||||
"sim/flightmodel/position/theta",
|
||||
"sim/flightmodel/position/psi",
|
||||
"sim/cockpit/switches/gear_handle_status"
|
||||
"sim/flightmodel/position/latitude",
|
||||
"sim/flightmodel/position/longitude",
|
||||
"sim/flightmodel/position/y_agl",
|
||||
"sim/flightmodel/position/phi",
|
||||
"sim/flightmodel/position/theta",
|
||||
"sim/flightmodel/position/psi",
|
||||
"sim/cockpit/switches/gear_handle_status"
|
||||
};
|
||||
float[] posi = new float[] {37.524F, -122.06899F, 2500, 0, 0, 0, 1};
|
||||
double[] posi = new double[] {37.524, -122.06899, 2500, 0, 0, 0, 1};
|
||||
try(XPlaneConnect xpc = new XPlaneConnect())
|
||||
{
|
||||
xpc.pauseSim(true);
|
||||
@@ -585,7 +585,7 @@ public class XPlaneConnectTest
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testSendPOSI_LongCtrl() throws IOException
|
||||
{
|
||||
float[] posi = new float[] {37.524F, -122.06899F, 2500, 0, 0, 0, 1, -998};
|
||||
double[] posi = new double[] {37.524, -122.06899, 2500, 0, 0, 0, 1, -998};
|
||||
try(XPlaneConnect xpc = new XPlaneConnect())
|
||||
{
|
||||
xpc.sendPOSI(posi);
|
||||
@@ -595,7 +595,7 @@ public class XPlaneConnectTest
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testSendPOSI_NegativeAircraftNum() throws IOException
|
||||
{
|
||||
float[] posi = new float[] {37.524F, -122.06899F, 2500, 0, 0, 0, 1, -998};
|
||||
double[] posi = new double[] {37.524, -122.06899, 2500, 0, 0, 0, 1, -998};
|
||||
try(XPlaneConnect xpc = new XPlaneConnect())
|
||||
{
|
||||
xpc.sendPOSI(posi, -1);
|
||||
@@ -605,7 +605,7 @@ public class XPlaneConnectTest
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void testSendPOSI_LargeAircraftNum() throws IOException
|
||||
{
|
||||
float[] posi = new float[] {37.524F, -122.06899F, 2500, 0, 0, 0, 1, -998};
|
||||
double[] posi = new double[] {37.524, -122.06899, 2500, 0, 0, 0, 1, -998};
|
||||
try(XPlaneConnect xpc = new XPlaneConnect())
|
||||
{
|
||||
xpc.sendPOSI(posi, 300);
|
||||
@@ -702,12 +702,12 @@ public class XPlaneConnectTest
|
||||
@Test
|
||||
public void testGetPOSI() throws IOException
|
||||
{
|
||||
float[] values = { 37.524F, -122.06899F, 2500.0F, 45.0F, -45.0F, 15.0F, 1.0F };
|
||||
double[] values = { 37.524, -122.06899, 2500.0, 45.0, -45.0, 15.0, 1.0 };
|
||||
try(XPlaneConnect xpc = new XPlaneConnect())
|
||||
{
|
||||
xpc.pauseSim(true);
|
||||
xpc.sendPOSI(values);
|
||||
float[] actual = xpc.getPOSI(0);
|
||||
double[] actual = xpc.getPOSI(0);
|
||||
|
||||
assertArrayEquals(values, actual, 1e-4F);
|
||||
}
|
||||
@@ -725,4 +725,4 @@ public class XPlaneConnectTest
|
||||
assertArrayEquals(values, actual, 1e-4F);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
73
TestScripts/Java Tests/XPlaneDiscoveryTests.java
Normal file
73
TestScripts/Java Tests/XPlaneDiscoveryTests.java
Normal file
@@ -0,0 +1,73 @@
|
||||
package gov.nasa.xpc.test;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import gov.nasa.xpc.discovery.Beacon;
|
||||
import gov.nasa.xpc.discovery.BeaconParser;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.DatagramPacket;
|
||||
|
||||
|
||||
public class XPlaneDiscoveryTests {
|
||||
|
||||
private BeaconParser parser;
|
||||
private DatagramPacket packet;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
parser = new BeaconParser();
|
||||
byte[] bytes = HexHelper.decodeHexString("4245434E0071BFFC2B0000312E332D72632E310000000000000000");
|
||||
packet = new DatagramPacket(bytes, 0, bytes.length);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readBeaconParsesPort() throws IOException {
|
||||
Beacon beacon = parser.readBCN(packet);
|
||||
assertEquals(beacon.getPluginPort(), 49009);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readBeaconParsesXplaneVersion() throws IOException {
|
||||
Beacon beacon = parser.readBCN(packet);
|
||||
assertEquals(beacon.getXplaneVersion(), "112.60");
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void readBeaconParsesPluginVersion() throws IOException {
|
||||
Beacon beacon = parser.readBCN(packet);
|
||||
assertEquals(beacon.getPluginVersion(), "1.3-rc.1");
|
||||
}
|
||||
}
|
||||
|
||||
class HexHelper {
|
||||
static byte[] decodeHexString(String hexString) {
|
||||
if (hexString.length() % 2 == 1) {
|
||||
throw new IllegalArgumentException("Invalid hexadecimal String supplied.");
|
||||
}
|
||||
|
||||
byte[] bytes = new byte[hexString.length() / 2];
|
||||
for (int i = 0; i < hexString.length(); i += 2) {
|
||||
bytes[i / 2] = hexToByte(hexString.substring(i, i + 2));
|
||||
}
|
||||
return bytes;
|
||||
}
|
||||
|
||||
private static byte hexToByte(String hexString) {
|
||||
int firstDigit = toDigit(hexString.charAt(0));
|
||||
int secondDigit = toDigit(hexString.charAt(1));
|
||||
return (byte) ((firstDigit << 4) + secondDigit);
|
||||
}
|
||||
|
||||
private static int toDigit(char hexChar) {
|
||||
int digit = Character.digit(hexChar, 16);
|
||||
if (digit == -1) {
|
||||
throw new IllegalArgumentException(
|
||||
"Invalid Hexadecimal Character: " + hexChar);
|
||||
}
|
||||
return digit;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user