From fcaced59b581451c15d26844048b75f666fb9a80 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Wed, 10 Oct 2012 00:49:28 -0500 Subject: [PATCH] AndroidGCS: Entire hash is now used to locate objects and they are pulled from assets/uavos --- .../org/openpilot/androidgcs/telemetry/OPTelemetryService.java | 2 +- .../src/org/openpilot/androidgcs/telemetry/TelemetryTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java index 7997af2ea..f7ed96fc7 100644 --- a/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java +++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java @@ -309,7 +309,7 @@ public class OPTelemetryService extends Service { try { File outputFile = new File(jarsDir, JAR_NAME); - inputStream = assetManager.open(JAR_NAME); //JAR_DIR + File.separatorChar + JAR_NAME); + inputStream = assetManager.open("uavos/" + JAR_NAME); outputStream = new FileOutputStream(outputFile); copyStream(inputStream, outputStream); } diff --git a/androidgcs/src/org/openpilot/androidgcs/telemetry/TelemetryTask.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/TelemetryTask.java index e437ebea3..01341c8c4 100644 --- a/androidgcs/src/org/openpilot/androidgcs/telemetry/TelemetryTask.java +++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/TelemetryTask.java @@ -103,7 +103,7 @@ public abstract class TelemetryTask implements Runnable { if(description == null || description.getNumElements() < 100) { telemService.toastMessage("Failed to determine UAVO set"); } else { - final int HASH_SIZE_USED = 8; + final int HASH_SIZE_USED = 20; String jarName = new String(); for(int i = 0; i < HASH_SIZE_USED; i++) jarName += Integer.toHexString((int) description.getDouble(i+60));