From 5b976a6651f4eb05d30afc08b9e1f27c7e52ae00 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 5 Sep 2013 11:33:48 -0700 Subject: altoslib: Finish AltosState changes. Update version number. Removes all of the AltosRecord bits, changes the monitor idle bits to have per-object state updaters. Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java index 716ec589..e37019fd 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java @@ -25,7 +25,7 @@ import java.util.concurrent.*; import android.util.Log; import android.os.Handler; -import org.altusmetrum.altoslib_1.*; +import org.altusmetrum.altoslib_2.*; public class TelemetryReader extends Thread { -- cgit v1.2.3 From ee14ad16c242e8bd7a9d33ebf569211d1490b8e1 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Tue, 3 Sep 2013 15:10:23 +1200 Subject: altosdroid: update to support new state code Signed-off-by: Mike Beattie Conflicts: altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java --- .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 12 +++---- .../src/org/altusmetrum/AltosDroid/AltosVoice.java | 6 ++-- .../src/org/altusmetrum/AltosDroid/TabAscent.java | 8 ++--- .../src/org/altusmetrum/AltosDroid/TabDescent.java | 8 ++--- .../src/org/altusmetrum/AltosDroid/TabPad.java | 20 ++++++------ .../altusmetrum/AltosDroid/TelemetryReader.java | 37 +++++++++++----------- 6 files changed, 46 insertions(+), 45 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 6f378777..92287476 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -147,7 +147,7 @@ public class AltosDroid extends FragmentActivity { case MSG_CRC_ERROR: case MSG_UPDATE_AGE: if (ad.saved_state != null) { - ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.report_time + 500) / 1000)); + ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.received_time + 500) / 1000)); } break; } @@ -243,11 +243,11 @@ public class AltosDroid extends FragmentActivity { } if (state != null) { - mCallsignView.setText(state.data.callsign); - mSerialView.setText(String.format("%d", state.data.serial)); - mFlightView.setText(String.format("%d", state.data.flight)); - mStateView.setText(state.data.state()); - mRSSIView.setText(String.format("%d", state.data.rssi)); + mCallsignView.setText(state.callsign); + mSerialView.setText(String.format("%d", state.serial)); + mFlightView.setText(String.format("%d", state.flight)); + mStateView.setText(state.state_name()); + mRSSIView.setText(String.format("%d", state.rssi)); } for (AltosDroidTab mTab : mTabs) diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java index df7409c4..c512089f 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java @@ -63,7 +63,7 @@ public class AltosVoice { boolean spoke = false; if (old_state == null || old_state.state != state.state) { - speak(state.data.state()); + speak(state.state_name()); if ((old_state == null || old_state.state <= AltosLib.ao_flight_boost) && state.state > AltosLib.ao_flight_boost) { speak(String.format("max speed: %d meters per second.", (int) (state.max_speed() + 0.5))); @@ -132,10 +132,10 @@ public class AltosVoice { */ if (state.state >= AltosLib.ao_flight_drogue && (last || - System.currentTimeMillis() - state.report_time >= 15000 || + System.currentTimeMillis() - state.received_time >= 15000 || state.state == AltosLib.ao_flight_landed)) { - if (Math.abs(state.baro_speed) < 20 && state.height < 100) + if (Math.abs(state.speed) < 20 && state.height < 100) speak("rocket landed safely"); else speak("rocket may have crashed"); diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java index 69bc68c9..95aaea36 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java @@ -102,11 +102,11 @@ public class TabAscent extends Fragment implements AltosDroidTab { mLongitudeView.setText(""); } - mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense)); - mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosLib.MISSING); + mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage)); + mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING); - mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense)); - mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosLib.MISSING); + mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage)); + mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING); } } } diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java index ee09ea88..6076c401 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java @@ -111,11 +111,11 @@ public class TabDescent extends Fragment implements AltosDroidTab { mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E")); } - mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense)); - mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosLib.MISSING); + mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage)); + mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING); - mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense)); - mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosLib.MISSING); + mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage)); + mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING); } } diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java index f9d30b34..2c6732e5 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java @@ -103,26 +103,26 @@ public class TabPad extends Fragment implements AltosDroidTab { public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) { if (state != null) { - mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery)); - mBatteryLights.set(state.battery > 3.7, state.battery == AltosLib.MISSING); + mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage)); + mBatteryLights.set(state.battery_voltage > 3.7, state.battery_voltage == AltosLib.MISSING); - mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense)); - mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosLib.MISSING); + mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage)); + mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING); - mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense)); - mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosLib.MISSING); + mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage)); + mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING); - if (state.data.flight != 0) { - if (state.data.state <= AltosLib.ao_flight_pad) + if (state.flight != 0) { + if (state.state <= AltosLib.ao_flight_pad) mDataLoggingView.setText("Ready to record"); - else if (state.data.state < AltosLib.ao_flight_landed) + else if (state.state < AltosLib.ao_flight_landed) mDataLoggingView.setText("Recording data"); else mDataLoggingView.setText("Recorded data"); } else { mDataLoggingView.setText("Storage full"); } - mDataLoggingLights.set(state.data.flight != 0, state.data.flight == AltosLib.MISSING); + mDataLoggingLights.set(state.flight != 0, state.flight == AltosLib.MISSING); if (state.gps != null) { mGPSLockedView.setText(AltosDroid.integer("%4d sats", state.gps.nsat)); diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java index e37019fd..cdd1decd 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java @@ -37,25 +37,29 @@ public class TelemetryReader extends Thread { Handler handler; AltosLink link; - AltosRecord previous; + AltosState state = null; - LinkedBlockingQueue telem; + LinkedBlockingQueue telemQueue; - public AltosRecord read() throws ParseException, AltosCRCException, InterruptedException, IOException { - AltosLine l = telem.take(); + public AltosState read() throws ParseException, AltosCRCException, InterruptedException, IOException { + AltosLine l = telemQueue.take(); if (l.line == null) throw new IOException("IO error"); - AltosRecord next = AltosTelemetry.parse(l.line, previous); - previous = next; - return next; + AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line); + if (state == null) + state = new AltosState(); + else + state = state.clone(); + telem.update_state(state); + return state; } public void close() { - previous = null; - link.remove_monitor(telem); + state = null; + link.remove_monitor(telemQueue); link = null; - telem.clear(); - telem = null; + telemQueue.clear(); + telemQueue = null; } public void run() { @@ -64,10 +68,7 @@ public class TelemetryReader extends Thread { try { for (;;) { try { - AltosRecord record = read(); - if (record == null) - break; - state = new AltosState(record, state); + state = read(); handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget(); } catch (ParseException pp) { Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage())); @@ -87,8 +88,8 @@ public class TelemetryReader extends Thread { link = in_link; handler = in_handler; - previous = null; - telem = new LinkedBlockingQueue(); - link.add_monitor(telem); + state = null; + telemQueue = new LinkedBlockingQueue(); + link.add_monitor(telemQueue); } } -- cgit v1.2.3 From e9e9c6592c49109288a4e02e780b130fadb97db7 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Tue, 3 Sep 2013 15:11:33 +1200 Subject: altosdroid: convert rogue files to unix line endings Signed-off-by: Mike Beattie --- .../src/org/altusmetrum/AltosDroid/Dumper.java | 366 ++++++++++----------- .../altusmetrum/AltosDroid/TelemetryReader.java | 190 +++++------ altoslib/Makefile.am | 14 + 3 files changed, 292 insertions(+), 278 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java b/altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java index 17e4cf5b..2797fc5e 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java @@ -1,183 +1,183 @@ -package org.altusmetrum.AltosDroid; - - import java.lang.reflect.Array; - import java.lang.reflect.Field; - import java.util.HashMap; - - public class Dumper { - private static Dumper instance = new Dumper(); - - protected static Dumper getInstance() { - return instance; - } - - class DumpContext { - int maxDepth = 0; - int maxArrayElements = 0; - int callCount = 0; - HashMap ignoreList = new HashMap(); - HashMap visited = new HashMap(); - } - - public static String dump(Object o) { - return dump(o, 0, 0, null); - } - - public static String dump(Object o, int maxDepth, int maxArrayElements, String[] ignoreList) { - DumpContext ctx = Dumper.getInstance().new DumpContext(); - ctx.maxDepth = maxDepth; - ctx.maxArrayElements = maxArrayElements; - - if (ignoreList != null) { - for (int i = 0; i < Array.getLength(ignoreList); i++) { - int colonIdx = ignoreList[i].indexOf(':'); - if (colonIdx == -1) - ignoreList[i] = ignoreList[i] + ":"; - ctx.ignoreList.put(ignoreList[i], ignoreList[i]); - } - } - - return dump(o, ctx); - } - - protected static String dump(Object o, DumpContext ctx) { - if (o == null) { - return ""; - } - - ctx.callCount++; - StringBuffer tabs = new StringBuffer(); - for (int k = 0; k < ctx.callCount; k++) { - tabs.append("\t"); - } - StringBuffer buffer = new StringBuffer(); - @SuppressWarnings("rawtypes") - Class oClass = o.getClass(); - - String oSimpleName = getSimpleNameWithoutArrayQualifier(oClass); - - if (ctx.ignoreList.get(oSimpleName + ":") != null) - return ""; - - if (oClass.isArray()) { - buffer.append("\n"); - buffer.append(tabs.toString().substring(1)); - buffer.append("[\n"); - int rowCount = ctx.maxArrayElements == 0 ? Array.getLength(o) : Math.min(ctx.maxArrayElements, Array.getLength(o)); - for (int i = 0; i < rowCount; i++) { - buffer.append(tabs.toString()); - try { - Object value = Array.get(o, i); - buffer.append(dumpValue(value, ctx)); - } catch (Exception e) { - buffer.append(e.getMessage()); - } - if (i < Array.getLength(o) - 1) - buffer.append(","); - buffer.append("\n"); - } - if (rowCount < Array.getLength(o)) { - buffer.append(tabs.toString()); - buffer.append(Array.getLength(o) - rowCount + " more array elements..."); - buffer.append("\n"); - } - buffer.append(tabs.toString().substring(1)); - buffer.append("]"); - } else { - buffer.append("\n"); - buffer.append(tabs.toString().substring(1)); - buffer.append("{\n"); - buffer.append(tabs.toString()); - buffer.append("hashCode: " + o.hashCode()); - buffer.append("\n"); - while (oClass != null && oClass != Object.class) { - Field[] fields = oClass.getDeclaredFields(); - - if (ctx.ignoreList.get(oClass.getSimpleName()) == null) { - if (oClass != o.getClass()) { - buffer.append(tabs.toString().substring(1)); - buffer.append(" Inherited from superclass " + oSimpleName + ":\n"); - } - - for (int i = 0; i < fields.length; i++) { - - String fSimpleName = getSimpleNameWithoutArrayQualifier(fields[i].getType()); - String fName = fields[i].getName(); - - fields[i].setAccessible(true); - buffer.append(tabs.toString()); - buffer.append(fName + "(" + fSimpleName + ")"); - buffer.append("="); - - if (ctx.ignoreList.get(":" + fName) == null && - ctx.ignoreList.get(fSimpleName + ":" + fName) == null && - ctx.ignoreList.get(fSimpleName + ":") == null) { - - try { - Object value = fields[i].get(o); - buffer.append(dumpValue(value, ctx)); - } catch (Exception e) { - buffer.append(e.getMessage()); - } - buffer.append("\n"); - } else { - buffer.append(""); - buffer.append("\n"); - } - } - oClass = oClass.getSuperclass(); - oSimpleName = oClass.getSimpleName(); - } else { - oClass = null; - oSimpleName = ""; - } - } - buffer.append(tabs.toString().substring(1)); - buffer.append("}"); - } - ctx.callCount--; - return buffer.toString(); - } - - protected static String dumpValue(Object value, DumpContext ctx) { - if (value == null) { - return ""; - } - if (value.getClass().isPrimitive() || - value.getClass() == java.lang.Short.class || - value.getClass() == java.lang.Long.class || - value.getClass() == java.lang.String.class || - value.getClass() == java.lang.Integer.class || - value.getClass() == java.lang.Float.class || - value.getClass() == java.lang.Byte.class || - value.getClass() == java.lang.Character.class || - value.getClass() == java.lang.Double.class || - value.getClass() == java.lang.Boolean.class) { - - return value.toString(); - - } else { - - Integer visitedIndex = ctx.visited.get(value); - if (visitedIndex == null) { - ctx.visited.put(value, ctx.callCount); - if (ctx.maxDepth == 0 || ctx.callCount < ctx.maxDepth) { - return dump(value, ctx); - } else { - return ""; - } - } else { - return ""; - } - } - } - - - private static String getSimpleNameWithoutArrayQualifier(@SuppressWarnings("rawtypes") Class clazz) { - String simpleName = clazz.getSimpleName(); - int indexOfBracket = simpleName.indexOf('['); - if (indexOfBracket != -1) - return simpleName.substring(0, indexOfBracket); - return simpleName; - } -} +package org.altusmetrum.AltosDroid; + + import java.lang.reflect.Array; + import java.lang.reflect.Field; + import java.util.HashMap; + + public class Dumper { + private static Dumper instance = new Dumper(); + + protected static Dumper getInstance() { + return instance; + } + + class DumpContext { + int maxDepth = 0; + int maxArrayElements = 0; + int callCount = 0; + HashMap ignoreList = new HashMap(); + HashMap visited = new HashMap(); + } + + public static String dump(Object o) { + return dump(o, 0, 0, null); + } + + public static String dump(Object o, int maxDepth, int maxArrayElements, String[] ignoreList) { + DumpContext ctx = Dumper.getInstance().new DumpContext(); + ctx.maxDepth = maxDepth; + ctx.maxArrayElements = maxArrayElements; + + if (ignoreList != null) { + for (int i = 0; i < Array.getLength(ignoreList); i++) { + int colonIdx = ignoreList[i].indexOf(':'); + if (colonIdx == -1) + ignoreList[i] = ignoreList[i] + ":"; + ctx.ignoreList.put(ignoreList[i], ignoreList[i]); + } + } + + return dump(o, ctx); + } + + protected static String dump(Object o, DumpContext ctx) { + if (o == null) { + return ""; + } + + ctx.callCount++; + StringBuffer tabs = new StringBuffer(); + for (int k = 0; k < ctx.callCount; k++) { + tabs.append("\t"); + } + StringBuffer buffer = new StringBuffer(); + @SuppressWarnings("rawtypes") + Class oClass = o.getClass(); + + String oSimpleName = getSimpleNameWithoutArrayQualifier(oClass); + + if (ctx.ignoreList.get(oSimpleName + ":") != null) + return ""; + + if (oClass.isArray()) { + buffer.append("\n"); + buffer.append(tabs.toString().substring(1)); + buffer.append("[\n"); + int rowCount = ctx.maxArrayElements == 0 ? Array.getLength(o) : Math.min(ctx.maxArrayElements, Array.getLength(o)); + for (int i = 0; i < rowCount; i++) { + buffer.append(tabs.toString()); + try { + Object value = Array.get(o, i); + buffer.append(dumpValue(value, ctx)); + } catch (Exception e) { + buffer.append(e.getMessage()); + } + if (i < Array.getLength(o) - 1) + buffer.append(","); + buffer.append("\n"); + } + if (rowCount < Array.getLength(o)) { + buffer.append(tabs.toString()); + buffer.append(Array.getLength(o) - rowCount + " more array elements..."); + buffer.append("\n"); + } + buffer.append(tabs.toString().substring(1)); + buffer.append("]"); + } else { + buffer.append("\n"); + buffer.append(tabs.toString().substring(1)); + buffer.append("{\n"); + buffer.append(tabs.toString()); + buffer.append("hashCode: " + o.hashCode()); + buffer.append("\n"); + while (oClass != null && oClass != Object.class) { + Field[] fields = oClass.getDeclaredFields(); + + if (ctx.ignoreList.get(oClass.getSimpleName()) == null) { + if (oClass != o.getClass()) { + buffer.append(tabs.toString().substring(1)); + buffer.append(" Inherited from superclass " + oSimpleName + ":\n"); + } + + for (int i = 0; i < fields.length; i++) { + + String fSimpleName = getSimpleNameWithoutArrayQualifier(fields[i].getType()); + String fName = fields[i].getName(); + + fields[i].setAccessible(true); + buffer.append(tabs.toString()); + buffer.append(fName + "(" + fSimpleName + ")"); + buffer.append("="); + + if (ctx.ignoreList.get(":" + fName) == null && + ctx.ignoreList.get(fSimpleName + ":" + fName) == null && + ctx.ignoreList.get(fSimpleName + ":") == null) { + + try { + Object value = fields[i].get(o); + buffer.append(dumpValue(value, ctx)); + } catch (Exception e) { + buffer.append(e.getMessage()); + } + buffer.append("\n"); + } else { + buffer.append(""); + buffer.append("\n"); + } + } + oClass = oClass.getSuperclass(); + oSimpleName = oClass.getSimpleName(); + } else { + oClass = null; + oSimpleName = ""; + } + } + buffer.append(tabs.toString().substring(1)); + buffer.append("}"); + } + ctx.callCount--; + return buffer.toString(); + } + + protected static String dumpValue(Object value, DumpContext ctx) { + if (value == null) { + return ""; + } + if (value.getClass().isPrimitive() || + value.getClass() == java.lang.Short.class || + value.getClass() == java.lang.Long.class || + value.getClass() == java.lang.String.class || + value.getClass() == java.lang.Integer.class || + value.getClass() == java.lang.Float.class || + value.getClass() == java.lang.Byte.class || + value.getClass() == java.lang.Character.class || + value.getClass() == java.lang.Double.class || + value.getClass() == java.lang.Boolean.class) { + + return value.toString(); + + } else { + + Integer visitedIndex = ctx.visited.get(value); + if (visitedIndex == null) { + ctx.visited.put(value, ctx.callCount); + if (ctx.maxDepth == 0 || ctx.callCount < ctx.maxDepth) { + return dump(value, ctx); + } else { + return ""; + } + } else { + return ""; + } + } + } + + + private static String getSimpleNameWithoutArrayQualifier(@SuppressWarnings("rawtypes") Class clazz) { + String simpleName = clazz.getSimpleName(); + int indexOfBracket = simpleName.indexOf('['); + if (indexOfBracket != -1) + return simpleName.substring(0, indexOfBracket); + return simpleName; + } +} diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java index cdd1decd..45604284 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java @@ -1,95 +1,95 @@ -/* - * Copyright © 2011 Keith Packard - * Copyright © 2012 Mike Beattie - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - - -package org.altusmetrum.AltosDroid; - -import java.text.*; -import java.io.*; -import java.util.concurrent.*; -import android.util.Log; -import android.os.Handler; - -import org.altusmetrum.altoslib_2.*; - - -public class TelemetryReader extends Thread { - - private static final String TAG = "TelemetryReader"; - - int crc_errors; - - Handler handler; - - AltosLink link; - AltosState state = null; - - LinkedBlockingQueue telemQueue; - - public AltosState read() throws ParseException, AltosCRCException, InterruptedException, IOException { - AltosLine l = telemQueue.take(); - if (l.line == null) - throw new IOException("IO error"); - AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line); - if (state == null) - state = new AltosState(); - else - state = state.clone(); - telem.update_state(state); - return state; - } - - public void close() { - state = null; - link.remove_monitor(telemQueue); - link = null; - telemQueue.clear(); - telemQueue = null; - } - - public void run() { - AltosState state = null; - - try { - for (;;) { - try { - state = read(); - handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget(); - } catch (ParseException pp) { - Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage())); - } catch (AltosCRCException ce) { - ++crc_errors; - handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget(); - } - } - } catch (InterruptedException ee) { - } catch (IOException ie) { - } finally { - close(); - } - } - - public TelemetryReader (AltosLink in_link, Handler in_handler) { - link = in_link; - handler = in_handler; - - state = null; - telemQueue = new LinkedBlockingQueue(); - link.add_monitor(telemQueue); - } -} +/* + * Copyright © 2011 Keith Packard + * Copyright © 2012 Mike Beattie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ + + +package org.altusmetrum.AltosDroid; + +import java.text.*; +import java.io.*; +import java.util.concurrent.*; +import android.util.Log; +import android.os.Handler; + +import org.altusmetrum.altoslib_2.*; + + +public class TelemetryReader extends Thread { + + private static final String TAG = "TelemetryReader"; + + int crc_errors; + + Handler handler; + + AltosLink link; + AltosState state = null; + + LinkedBlockingQueue telemQueue; + + public AltosState read() throws ParseException, AltosCRCException, InterruptedException, IOException { + AltosLine l = telemQueue.take(); + if (l.line == null) + throw new IOException("IO error"); + AltosTelemetry telem = AltosTelemetryLegacy.parse(l.line); + if (state == null) + state = new AltosState(); + else + state = state.clone(); + telem.update_state(state); + return state; + } + + public void close() { + state = null; + link.remove_monitor(telemQueue); + link = null; + telemQueue.clear(); + telemQueue = null; + } + + public void run() { + AltosState state = null; + + try { + for (;;) { + try { + state = read(); + handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget(); + } catch (ParseException pp) { + Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage())); + } catch (AltosCRCException ce) { + ++crc_errors; + handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget(); + } + } + } catch (InterruptedException ee) { + } catch (IOException ie) { + } finally { + close(); + } + } + + public TelemetryReader (AltosLink in_link, Handler in_handler) { + link = in_link; + handler = in_handler; + + state = null; + telemQueue = new LinkedBlockingQueue(); + link.add_monitor(telemQueue); + } +} diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am index 62159bcc..794f3fac 100644 --- a/altoslib/Makefile.am +++ b/altoslib/Makefile.am @@ -9,6 +9,20 @@ CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/ SRC=. altoslibdir = $(datadir)/java +record_files = \ + AltosEepromRecord.java \ + AltosEepromTeleScience.java \ + AltosRecordCompanion.java \ + AltosRecordIterable.java \ + AltosOrderedRecord.java \ + AltosOrderedMegaRecord.java \ + AltosOrderedMiniRecord.java \ + AltosRecord.java \ + AltosRecordNone.java \ + AltosRecordTM.java \ + AltosRecordMM.java \ + AltosRecordMini.java + altoslib_JAVA = \ AltosLib.java \ -- cgit v1.2.3