projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions to 13
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TelemetryService.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 45bb47328a2c9abb1cc3c41a454b28673487503b..22a2bbd75bd4724a781df8fa6dd1e54fb25410f5 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@
-41,7
+41,7
@@
import android.os.Looper;
import android.widget.Toast;
import android.location.Criteria;
import android.widget.Toast;
import android.location.Criteria;
-import org.altusmetrum.altoslib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
public class TelemetryService extends Service implements AltosIdleMonitorListener {
public class TelemetryService extends Service implements AltosIdleMonitorListener {
@@
-263,7
+263,7
@@
public class TelemetryService extends Service implements AltosIdleMonitorListene
state = telemetry_state.states.get(telem.serial());
else
state = new AltosState(new AltosCalData());
state = telemetry_state.states.get(telem.serial());
else
state = new AltosState(new AltosCalData());
- telem.provide_data(state
, state.cal_data
);
+ telem.provide_data(state);
telemetry_state.states.put(telem.serial(), state);
telemetry_state.quiet = false;
if (state != null) {
telemetry_state.states.put(telem.serial(), state);
telemetry_state.quiet = false;
if (state != null) {
@@
-628,7
+628,7
@@
public class TelemetryService extends Service implements AltosIdleMonitorListene
AltosDebug.debug("recovered old state serial %d flight %d",
serial,
AltosDebug.debug("recovered old state serial %d flight %d",
serial,
- saved_state.cal_data.flight);
+ saved_state.cal_data
()
.flight);
if (saved_state.gps != null)
AltosDebug.debug("\tposition %f,%f",
saved_state.gps.lat,
if (saved_state.gps != null)
AltosDebug.debug("\tposition %f,%f",
saved_state.gps.lat,
@@
-702,7
+702,7
@@
public class TelemetryService extends Service implements AltosIdleMonitorListene
/* AltosIdleMonitorListener */
public void update(AltosState state, AltosListenerState listener_state) {
/* AltosIdleMonitorListener */
public void update(AltosState state, AltosListenerState listener_state) {
- telemetry_state.states.put(state.cal_data.serial, state);
+ telemetry_state.states.put(state.cal_data
()
.serial, state);
telemetry_state.receiver_battery = listener_state.battery;
send_to_clients();
}
telemetry_state.receiver_battery = listener_state.battery;
send_to_clients();
}