altosdroid: Centralize debug printf code

[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 03abeec6d8bb3fe4e5888902b9d20c34be396f70..7b29fe44a2f91a9742652f89dcc6c9b96f3d431a 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -22,17 +22,13 @@ 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_5.*;
+import org.altusmetrum.altoslib_7.*;
 
 
 public class TelemetryReader extends Thread {
 
-       private static final String TAG = "TelemetryReader";
-       private static final boolean D = true;
-
        int         crc_errors;
 
        Handler     handler;
@@ -67,13 +63,13 @@ public class TelemetryReader extends Thread {
                AltosState  state = null;
 
                try {
-                       if (D) Log.d(TAG, "starting loop");
+                       AltosDebug.debug("starting loop");
                        while (telemQueue != null) {
                                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()));
+                                       AltosDebug.error("Parse error: %d \"%s\"", pp.getErrorOffset(), pp.getMessage());
                                } catch (AltosCRCException ce) {
                                        ++crc_errors;
                                        handler.obtainMessage(TelemetryService.MSG_CRC_ERROR, new Integer(crc_errors)).sendToTarget();
@@ -81,13 +77,15 @@ public class TelemetryReader extends Thread {
                        }
                } catch (InterruptedException ee) {
                } catch (IOException ie) {
+                       AltosDebug.error("IO exception in telemetry reader");
+                       handler.obtainMessage(TelemetryService.MSG_DISCONNECTED, link).sendToTarget();
                } finally {
                        close();
                }
        }
 
        public TelemetryReader (AltosLink in_link, Handler in_handler, AltosState in_state) {
-               if (D) Log.d(TAG, "connected TelemetryReader create started");
+               AltosDebug.debug("connected TelemetryReader create started");
                link    = in_link;
                handler = in_handler;
 
@@ -96,6 +94,6 @@ public class TelemetryReader extends Thread {
                link.add_monitor(telemQueue);
                link.set_telemetry(AltosLib.ao_telemetry_standard);
 
-               if (D) Log.d(TAG, "connected TelemetryReader created");
+               AltosDebug.debug("connected TelemetryReader created");
        }
 }