summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2012-08-28 17:37:45 +1200
committerMike Beattie <mike@ethernal.org>2012-08-28 17:37:45 +1200
commit162c640d382b9f823573578fe97584adc94cd9b6 (patch)
tree3a054058831dfe4a9a8843ca4f050a5fd70cd21e
parentae03d8e87985b9f746e9e22b2394a0a5b4f39f1c (diff)
altosdroid: miscellaneous cleanup
* Copyright info * whitespace * comments * unused imports Signed-off-by: Mike Beattie <mike@ethernal.org>
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java4
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java3
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java19
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java1
4 files changed, 24 insertions, 3 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 19b2a2a5..18581142 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -1,6 +1,6 @@
/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
*
* 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
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index cf982eac..3855f6f9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -18,6 +18,7 @@
package org.altusmetrum.AltosDroid;
import java.lang.ref.WeakReference;
+
import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
@@ -47,7 +48,7 @@ import android.view.Window;
//import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
-import org.altusmetrum.AltosDroid.R;
+//import org.altusmetrum.AltosDroid.R;
/**
* This is the main Activity that displays the current chat session.
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
index bfa5db5c..c47e4942 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.*;
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 3ae87bb1..4701ba1f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -70,6 +70,7 @@ public class TelemetryService extends Service {
private AltosBluetooth mAltosBluetooth = null;
private TelemetryReader mTelemetryReader = null;
+ // internally track state of bluetooth connection
private int state = STATE_NONE;
// Handler of incoming messages from clients.