X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=93af2fdcd6ac69d0e56530d2ef6ac877bd728cca;hp=c9ce46a0d0c8487c075d6c95e6a8b6a845e32657;hb=192bc28fbe2a8613d0b42e4fb3f7674a1a50abc7;hpb=eba7b2ef8ef23bdb61b0390e47be6f27ffde31dc

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index c9ce46a0..93af2fdc 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -47,6 +47,7 @@ import android.widget.TabHost;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.app.AlertDialog;
+import android.location.Location;
 
 import org.altusmetrum.altoslib_1.*;
 
@@ -59,6 +60,8 @@ public class AltosDroid extends FragmentActivity {
 	public static final int MSG_STATE_CHANGE    = 1;
 	public static final int MSG_TELEMETRY       = 2;
 	public static final int MSG_UPDATE_AGE      = 3;
+	public static final int MSG_LOCATION	    = 4;
+	public static final int MSG_CRC_ERROR	    = 5;
 
 	// Intent request codes
 	private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -87,6 +90,7 @@ public class AltosDroid extends FragmentActivity {
 	// Timer and Saved flight state for Age calculation
 	private Timer timer = new Timer();
 	AltosState saved_state;
+	Location saved_location;
 
 	// Service
 	private boolean mIsBound   = false;
@@ -122,7 +126,6 @@ public class AltosDroid extends FragmentActivity {
 					ad.mTitle.setText(R.string.title_connected_to);
 					ad.mTitle.append(str);
 					Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
-					ad.mAltosVoice.speak("Connected");
 					break;
 				case TelemetryService.STATE_CONNECTING:
 					ad.mTitle.setText(R.string.title_connecting);
@@ -137,6 +140,10 @@ public class AltosDroid extends FragmentActivity {
 			case MSG_TELEMETRY:
 				ad.update_ui((AltosState) msg.obj);
 				break;
+			case MSG_LOCATION:
+				ad.set_location((Location) msg.obj);
+				break;
+			case MSG_CRC_ERROR:
 			case MSG_UPDATE_AGE:
 				if (ad.saved_state != null) {
 					ad.mAgeView.setText(String.format("%d", (System.currentTimeMillis() - ad.saved_state.report_time + 500) / 1000));
@@ -196,6 +203,13 @@ public class AltosDroid extends FragmentActivity {
 		mTabs.remove(mTab);
 	}
 
+	void set_location(Location location) {
+		saved_location = location;
+		if (saved_state != null) {
+			update_ui(saved_state);
+		}
+	}
+
 	void update_ui(AltosState state) {
 		if (saved_state != null) {
 			if (saved_state.state != state.state) {
@@ -215,6 +229,20 @@ public class AltosDroid extends FragmentActivity {
 		}
 		saved_state = state;
 
+		AltosGreatCircle from_receiver = null;
+
+		if (saved_location != null && state.gps != null && state.gps.locked) {
+			double altitude = 0;
+			if (saved_location.hasAltitude())
+				altitude = saved_location.getAltitude();
+			from_receiver = new AltosGreatCircle(saved_location.getLatitude(),
+							     saved_location.getLongitude(),
+							     altitude,
+							     state.gps.lat,
+							     state.gps.lon,
+							     state.gps.alt);
+		}
+
 		mCallsignView.setText(state.data.callsign);
 		mSerialView.setText(String.format("%d", state.data.serial));
 		mFlightView.setText(String.format("%d", state.data.flight));
@@ -222,7 +250,7 @@ public class AltosDroid extends FragmentActivity {
 		mRSSIView.setText(String.format("%d", state.data.rssi));
 
 		for (AltosDroidTab mTab : mTabs)
-			mTab.update_ui(state);
+			mTab.update_ui(state, from_receiver, saved_location);
 
 		mAltosVoice.tell(state);
 	}
@@ -242,7 +270,7 @@ public class AltosDroid extends FragmentActivity {
 		}
 		int deg = (int) Math.floor(p);
 		double min = (p - Math.floor(p)) * 60.0;
-		return String.format("%d° %9.6f\" %s", deg, min, h);
+		return String.format("%d°%9.4f\" %s", deg, min, h);
 	}
 
 	@Override
@@ -283,6 +311,8 @@ public class AltosDroid extends FragmentActivity {
 		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator("Landed"), TabLanded.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator("Map"), TabMap.class, null);
 
+		for (int i = 0; i < 5; i++)
+			mTabHost.getTabWidget().getChildAt(i).getLayoutParams().height = 45;
 
 		// Set up the custom title
 		mTitle = (TextView) findViewById(R.id.title_left_text);