summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altosdroid/res/layout/altosdroid.xml12
-rw-r--r--altosdroid/res/layout/tab_ascent.xml20
-rw-r--r--altosdroid/res/layout/tab_descent.xml22
-rw-r--r--altosdroid/res/layout/tab_landed.xml14
-rw-r--r--altosdroid/res/layout/tab_map.xml88
-rw-r--r--altosdroid/res/layout/tab_pad.xml30
-rw-r--r--altosdroid/res/values/strings.xml10
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java4
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java21
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java5
10 files changed, 149 insertions, 77 deletions
diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index b653aa2e..71b7ad05 100644
--- a/altosdroid/res/layout/altosdroid.xml
+++ b/altosdroid/res/layout/altosdroid.xml
@@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/callsign_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/serial_label"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/flight_label"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -107,7 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/state_label"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -127,7 +127,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rssi_label"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -147,7 +147,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/age_label"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
diff --git a/altosdroid/res/layout/tab_ascent.xml b/altosdroid/res/layout/tab_ascent.xml
index 555da7f2..d2d721e1 100644
--- a/altosdroid/res/layout/tab_ascent.xml
+++ b/altosdroid/res/layout/tab_ascent.xml
@@ -47,7 +47,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/height_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -68,7 +68,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_height_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -99,7 +99,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/speed_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -120,7 +120,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_speed_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -151,7 +151,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/accel_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -172,7 +172,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_accel_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -194,7 +194,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lat_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -215,7 +215,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lon_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -254,7 +254,7 @@
android:layout_below="@id/apogee_voltage_label"
android:layout_toRightOf="@id/apogee_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -293,7 +293,7 @@
android:layout_below="@id/main_voltage_label"
android:layout_toRightOf="@id/main_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout> \ No newline at end of file
diff --git a/altosdroid/res/layout/tab_descent.xml b/altosdroid/res/layout/tab_descent.xml
index 5f11a999..56e8a00a 100644
--- a/altosdroid/res/layout/tab_descent.xml
+++ b/altosdroid/res/layout/tab_descent.xml
@@ -46,7 +46,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/speed_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -67,7 +67,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/height_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -99,7 +99,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/elevation_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -120,7 +120,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/range_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -152,7 +152,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/bearing_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -173,7 +173,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/compass_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -205,7 +205,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/distance_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<TextView
@@ -234,7 +234,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lat_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -255,7 +255,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lon_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -294,7 +294,7 @@
android:layout_below="@id/apogee_voltage_label"
android:layout_toRightOf="@id/apogee_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -333,7 +333,7 @@
android:layout_below="@id/main_voltage_label"
android:layout_toRightOf="@id/main_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
diff --git a/altosdroid/res/layout/tab_landed.xml b/altosdroid/res/layout/tab_landed.xml
index 18b1c566..9008700f 100644
--- a/altosdroid/res/layout/tab_landed.xml
+++ b/altosdroid/res/layout/tab_landed.xml
@@ -37,7 +37,7 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/bearing_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -58,7 +58,7 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/distance_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -79,7 +79,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lat_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -100,7 +100,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/lon_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -121,7 +121,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_height_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -142,7 +142,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_speed_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -163,7 +163,7 @@
android:layout_alignParentRight="true"
android:layout_below="@id/max_accel_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout> \ No newline at end of file
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index 233d2a0d..f611ae48 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -46,16 +46,16 @@
android:id="@+id/distance_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingRight="4dp"
android:text="@string/distance_label" />
<TextView
android:id="@+id/distance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/distance_label"
+ android:layout_toRightOf="@+id/distance_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -68,16 +68,16 @@
android:id="@+id/bearing_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingRight="4dp"
android:text="@string/bearing_label" />
<TextView
android:id="@+id/bearing_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/bearing_label"
+ android:layout_toRightOf="@+id/bearing_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
@@ -96,19 +96,19 @@
android:paddingTop="5dp" >
<TextView
- android:id="@+id/lat_label"
+ android:id="@+id/target_lat_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/latitude_label" />
+ android:paddingRight="4dp"
+ android:text="@string/target_latitude_label" />
<TextView
- android:id="@+id/lat_value"
+ android:id="@+id/target_lat_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@id/lat_label"
+ android:layout_toRightOf="@id/target_lat_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -118,19 +118,71 @@
android:paddingTop="5dp" >
<TextView
- android:id="@+id/lon_label"
+ android:id="@+id/target_lon_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/longitude_label" />
+ android:paddingRight="4dp"
+ android:text="@string/target_longitude_label" />
<TextView
- android:id="@+id/lon_value"
+ android:id="@+id/target_lon_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@id/lon_label"
+ android:layout_toRightOf="@id/target_lon_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ </RelativeLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:baselineAligned="true"
+ android:orientation="horizontal" >
+
+ <RelativeLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="5dp" >
+
+ <TextView
+ android:id="@+id/receiver_lat_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/receiver_latitude_label" />
+
+ <TextView
+ android:id="@+id/receiver_lat_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/receiver_lat_label"
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingTop="5dp" >
+
+ <TextView
+ android:id="@+id/receiver_lon_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingRight="4dp"
+ android:text="@string/receiver_longitude_label" />
+
+ <TextView
+ android:id="@+id/receiver_lon_value"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/receiver_lon_label"
+ android:text=""
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout>
</LinearLayout> \ No newline at end of file
diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index b8ca1a44..a21f9bbb 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -55,7 +55,7 @@
android:layout_below="@id/battery_voltage_label"
android:layout_toRightOf="@id/battery_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -93,7 +93,7 @@
android:layout_below="@id/apogee_voltage_label"
android:layout_toRightOf="@id/apogee_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -131,7 +131,7 @@
android:layout_below="@id/main_voltage_label"
android:layout_toRightOf="@id/main_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -169,7 +169,7 @@
android:layout_below="@id/logging_label"
android:layout_toRightOf="@id/logging_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -207,7 +207,7 @@
android:layout_below="@id/gps_locked_label"
android:layout_toRightOf="@id/gps_locked_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -245,7 +245,7 @@
android:layout_below="@id/gps_ready_label"
android:layout_toRightOf="@id/gps_ready_greenled"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -258,6 +258,7 @@
android:id="@+id/pad_lat_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android.paddingRight="4dp"
android:layout_toRightOf="@id/gps_ready_greenled"
android:text="@string/pad_lat_label" />
@@ -265,10 +266,9 @@
android:id="@+id/pad_lat_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/pad_lat_label"
- android:layout_toRightOf="@id/gps_ready_greenled"
+ android:layout_toRightOf="@id/pad_lat_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -281,6 +281,7 @@
android:id="@+id/pad_lon_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android.paddingRight="4dp"
android:layout_toRightOf="@id/gps_ready_greenled"
android:text="@string/pad_lon_label" />
@@ -288,10 +289,9 @@
android:id="@+id/pad_lon_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/pad_lon_label"
- android:layout_toRightOf="@id/gps_ready_greenled"
+ android:layout_toRightOf="@id/pad_lon_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<RelativeLayout
@@ -304,6 +304,7 @@
android:id="@+id/pad_alt_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android.paddingRight="4dp"
android:layout_toRightOf="@id/gps_ready_greenled"
android:text="@string/pad_alt_label" />
@@ -311,10 +312,9 @@
android:id="@+id/pad_alt_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/pad_alt_label"
- android:layout_toRightOf="@id/gps_ready_greenled"
+ android:layout_toRightOf="@id/pad_alt_label"
android:text=""
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
</LinearLayout> \ No newline at end of file
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 639611c2..90da617b 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -72,8 +72,12 @@
<string name="gps_ready_label">GPS Ready</string>
<string name="latitude_label">Latitude</string>
<string name="longitude_label">Longitude</string>
- <string name="pad_lat_label">Pad Latitude</string>
- <string name="pad_lon_label">Pad Longitude</string>
- <string name="pad_alt_label">Pad Altitude</string>
+ <string name="target_latitude_label">Tar Lat</string>
+ <string name="target_longitude_label">Tar Lon</string>
+ <string name="receiver_latitude_label">My Lat</string>
+ <string name="receiver_longitude_label">My Lon</string>
+ <string name="pad_lat_label">Pad Lat</string>
+ <string name="pad_lon_label">Pad Lon</string>
+ <string name="pad_alt_label">Pad Alt</string>
</resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index cf4227ca..3715c3f9 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -271,7 +271,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
@@ -312,6 +312,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);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 0a208fa8..29696dbf 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -55,8 +55,10 @@ public class TabMap extends Fragment implements AltosDroidTab {
private TextView mDistanceView;
private TextView mBearingView;
- private TextView mLatitudeView;
- private TextView mLongitudeView;
+ private TextView mTargetLatitudeView;
+ private TextView mTargetLongitudeView;
+ private TextView mReceiverLatitudeView;
+ private TextView mReceiverLongitudeView;
@Override
public void onAttach(Activity activity) {
@@ -84,8 +86,10 @@ public class TabMap extends Fragment implements AltosDroidTab {
View v = inflater.inflate(R.layout.tab_map, container, false);
mDistanceView = (TextView)v.findViewById(R.id.distance_value);
mBearingView = (TextView)v.findViewById(R.id.bearing_value);
- mLatitudeView = (TextView)v.findViewById(R.id.lat_value);
- mLongitudeView = (TextView)v.findViewById(R.id.lon_value);
+ mTargetLatitudeView = (TextView)v.findViewById(R.id.target_lat_value);
+ mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
+ mReceiverLatitudeView = (TextView)v.findViewById(R.id.receiver_lat_value);
+ mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
return v;
}
@@ -146,8 +150,13 @@ public class TabMap extends Fragment implements AltosDroidTab {
mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
}
if (state.gps != null) {
- mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
- mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+ mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+ mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+ }
+
+ if (receiver != null) {
+ mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+ mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
}
if (mapLoaded) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 0ddfdfc3..f1304a95 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -245,6 +245,9 @@ public class TelemetryService extends Service {
}
private void startAltosBluetooth() {
+ if (device == null) {
+ return;
+ }
if (mAltosBluetooth == null) {
if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
mAltosBluetooth = new AltosBluetooth(device, mHandler);
@@ -274,6 +277,8 @@ public class TelemetryService extends Service {
private void connected() {
try {
+ if (mAltosBluetooth == null)
+ throw new InterruptedException("no bluetooth");
mConfigData = mAltosBluetooth.config_data();
} catch (InterruptedException e) {
} catch (TimeoutException e) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-15 20:53:33 +0000