Merge branch 'master' into droid-gps

[fw/altos] / 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 fb07442ee47e0c6d38c492aae50c0c4922440b7f..716ec5894c9df42c5e0a975591ba8464c42e91bd 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -36,7 +36,6 @@ public class TelemetryReader extends Thread {
 \r
        Handler     handler;\r
 \r
-       TelemetryService service;\r
        AltosLink   link;\r
        AltosRecord previous;\r
 \r
@@ -69,12 +68,12 @@ public class TelemetryReader extends Thread {
                                        if (record == null)\r
                                                break;\r
                                        state = new AltosState(record, state);\r
-                                       service.sendTelemetry(state);\r
+                                       handler.obtainMessage(TelemetryService.MSG_TELEMETRY, state).sendToTarget();\r
                                } catch (ParseException pp) {\r
                                        Log.e(TAG, String.format("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage()));\r
                                } catch (AltosCRCException ce) {\r
                                        ++crc_errors;\r
-                                       service.sendCrcErrors(crc_errors);\r
+                                       handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();\r
                                }\r
                        }\r
                } catch (InterruptedException ee) {\r
@@ -84,8 +83,7 @@ public class TelemetryReader extends Thread {
                }\r
        }\r
 \r
-       public TelemetryReader (TelemetryService in_service, AltosLink in_link, Handler in_handler) {\r
-               service = in_service;\r
+       public TelemetryReader (AltosLink in_link, Handler in_handler) {\r
                link    = in_link;\r
                handler = in_handler;\r
 \r