altosdroid: Add tilt angle to pad and flight tabs

[fw/altos] / altosdroid / app / src / main / java / org / altusmetrum / AltosDroid / TabPad.java

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
index f317ae912c77dc3b03614a5886769337d362dfed..4a8b3f862b9bbeed9077133fc6e8a5b1b1f84f69 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
@@ -18,11 +18,9 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.*;
 import android.widget.*;
 import android.location.Location;
@@ -64,6 +62,8 @@ public class TabPad extends AltosDroidTab {
        private TextView[] ignite_voltage_label = new TextView[4];
        private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
 
+       private View tilt_view;
+       private TextView tilt_value;
 
        @Override
        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -109,6 +109,9 @@ public class TabPad extends AltosDroidTab {
                                                   (ImageView) v.findViewById(R.id.gps_ready_greenled),
                                                   getResources());
 
+               tilt_view       = (View) v.findViewById(R.id.tilt_view);
+               tilt_value      = (TextView) v.findViewById(R.id.tilt_value);
+
                for (int i = 0; i < 4; i++) {
                        int row_id, view_id, label_id, lights_id;
                        int red_id, green_id;
@@ -161,19 +164,19 @@ public class TabPad extends AltosDroidTab {
 
        public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
                if (state != null) {
-                       battery_voltage_view.setText(AltosDroid.number(" %4.2f V", state.battery_voltage));
+                       battery_voltage_view.setText(AltosDroid.number("%1.2f V", state.battery_voltage));
                        battery_lights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
                        if (state.apogee_voltage == AltosLib.MISSING) {
                                apogee_row.setVisibility(View.GONE);
                        } else {
-                               apogee_voltage_view.setText(AltosDroid.number(" %4.2f V", state.apogee_voltage));
+                               apogee_voltage_view.setText(AltosDroid.number("%1.2f V", state.apogee_voltage));
                                apogee_row.setVisibility(View.VISIBLE);
                        }
                        apogee_lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
                        if (state.main_voltage == AltosLib.MISSING) {
                                main_row.setVisibility(View.GONE);
                        } else {
-                               main_voltage_view.setText(AltosDroid.number(" %4.2f V", state.main_voltage));
+                               main_voltage_view.setText(AltosDroid.number("%1.2f V", state.main_voltage));
                                main_row.setVisibility(View.VISIBLE);
                        }
                        main_lights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
@@ -185,7 +188,7 @@ public class TabPad extends AltosDroidTab {
                                if (voltage == AltosLib.MISSING) {
                                        ignite_row[i].setVisibility(View.GONE);
                                } else {
-                                       ignite_voltage_view[i].setText(AltosDroid.number(" %4.2f V", voltage));
+                                       ignite_voltage_view[i].setText(AltosDroid.number("%1.2f V", voltage));
                                        ignite_row[i].setVisibility(View.VISIBLE);
                                }
                                ignite_lights[i].set(voltage >= AltosLib.ao_igniter_good, voltage == AltosLib.MISSING);
@@ -215,13 +218,23 @@ public class TabPad extends AltosDroidTab {
                        } else
                                gps_locked_lights.set(false, true);
                        gps_ready_lights.set(state.gps_ready, state.gps == null);
+
+                       double orient = state.orient();
+
+                       if (orient == AltosLib.MISSING) {
+                               tilt_view.setVisibility(View.GONE);
+                       } else {
+                               tilt_value.setText(AltosDroid.number("%1.0f°", orient));
+                               tilt_view.setVisibility(View.VISIBLE);
+                       }
                }
 
+
                if (telem_state != null) {
                        if (telem_state.receiver_battery == AltosLib.MISSING) {
                                receiver_row.setVisibility(View.GONE);
                        } else {
-                               receiver_voltage_view.setText(AltosDroid.number(" %4.2f V", telem_state.receiver_battery));
+                               receiver_voltage_view.setText(AltosDroid.number("%1.2f V", telem_state.receiver_battery));
                                receiver_row.setVisibility(View.VISIBLE);
                        }
                        receiver_voltage_lights.set(telem_state.receiver_battery >= AltosLib.ao_battery_good, telem_state.receiver_battery == AltosLib.MISSING);