projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java library versions
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosBluetooth.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 4a1fc3716c9320d6cbf8bca44990832d1edce89c..3740f55d7f83a44d49cf7eabe08a150a4222fef6 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@
-31,7
+31,7
@@
import android.os.Handler;
//import android.os.Message;
import android.util.Log;
//import android.os.Message;
import android.util.Log;
-import org.altusmetrum.altoslib_
5
.*;
+import org.altusmetrum.altoslib_
6
.*;
public class AltosBluetooth extends AltosLink {
public class AltosBluetooth extends AltosLink {
@@
-146,16
+146,18
@@
public class AltosBluetooth extends AltosLink {
}
public void save_frequency() {
}
public void save_frequency() {
- AltosPreferences.set_frequency(
serial
, frequency);
+ AltosPreferences.set_frequency(
0
, frequency);
}
public void save_telemetry_rate() {
}
public void save_telemetry_rate() {
- AltosPreferences.set_telemetry_rate(
serial
, telemetry_rate);
+ AltosPreferences.set_telemetry_rate(
0
, telemetry_rate);
}
private synchronized void wait_connected() throws InterruptedException, IOException {
if (input == null) {
}
private synchronized void wait_connected() throws InterruptedException, IOException {
if (input == null) {
+ if (D) Log.d(TAG, "wait_connected...");
wait();
wait();
+ if (D) Log.d(TAG, "wait_connected done");
if (input == null) throw new IOException();
}
}
if (input == null) throw new IOException();
}
}