altosdroid: rename ambiguous TextView name

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 437369e22e2a26343058bbb22bb029289265266c..5736a4c73370907b617f7708782bea8e7e4029bf 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -63,7 +63,21 @@ public class AltosDroid extends Activity {
 
        // Layout Views
        private TextView mTitle;
-       private TextView mSerialView;
+
+       // Flight state values
+       private TextView mCallsignView;
+       private TextView mStateView;
+       private TextView mSpeedView;
+       private TextView mAccelView;
+       private TextView mRangeView;
+       private TextView mHeightView;
+       private TextView mElevationView;
+       private TextView mBearingView;
+       private TextView mLatitudeView;
+       private TextView mLongitudeView;
+
+       // Generic field for extras at the bottom
+       private TextView mTextView;
 
        // Service
        private boolean mIsBound   = false;
@@ -97,6 +111,8 @@ public class AltosDroid extends Activity {
                                        ad.mTitle.setText(R.string.title_connected_to);
                                        ad.mTitle.append(str);
                                        Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
+                                       //TEST!
+                                       ad.mTextView.setText(Dumper.dump(ad.mConfigData));
                                        break;
                                case TelemetryService.STATE_CONNECTING:
                                        ad.mTitle.setText(R.string.title_connecting);
@@ -105,15 +121,14 @@ public class AltosDroid extends Activity {
                                case TelemetryService.STATE_NONE:
                                        ad.mConfigData = null;
                                        ad.mTitle.setText(R.string.title_not_connected);
-                                       ad.mSerialView.setText("");
+                                       ad.mTextView.setText("");
                                        break;
                                }
                                break;
                        case MSG_TELEMETRY:
-                               //byte[] buf = (byte[]) msg.obj;
-                               // construct a string from the buffer
-                               //String telem = new String(buf);
-                               //ad.mSerialView.append(telem);
+                               ad.update_ui((AltosState) msg.obj);
+                               // TEST!
+                               ad.mTextView.setText(Dumper.dump(msg.obj));
                                break;
                        }
                }
@@ -162,6 +177,33 @@ public class AltosDroid extends Activity {
                }
        }
 
+       void update_ui(AltosState state) {
+               mCallsignView.setText(state.data.callsign);
+               mStateView.setText(state.data.state());
+               double speed = state.speed;
+               if (!state.ascent)
+                       speed = state.baro_speed;
+               mSpeedView.setText(String.format("%6.0f m/s", speed));
+               mAccelView.setText(String.format("%6.0f m/s²", state.acceleration));
+               mRangeView.setText(String.format("%6.0f m", state.range));
+               mHeightView.setText(String.format("%6.0f m", state.height));
+               mElevationView.setText(String.format("%3.0f°", state.elevation));
+               if (state.from_pad != null)
+                       mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
+               mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
+               mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
+       }
+
+       String pos(double p, String pos, String neg) {
+               String  h = pos;
+               if (p < 0) {
+                       h = neg;
+                       p = -p;
+               }
+               int deg = (int) Math.floor(p);
+               double min = (p - Math.floor(p)) * 60.0;
+               return String.format("%d° %9.6f\" %s", deg, min, h);
+       }
 
        @Override
        public void onCreate(Bundle savedInstanceState) {
@@ -170,7 +212,8 @@ public class AltosDroid extends Activity {
 
                // Set up the window layout
                requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
-               setContentView(R.layout.main);
+               //setContentView(R.layout.main);
+               setContentView(R.layout.altosdroid);
                getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
 
                // Set up the custom title
@@ -179,10 +222,21 @@ public class AltosDroid extends Activity {
                mTitle = (TextView) findViewById(R.id.title_right_text);
 
                // Set up the temporary Text View
-               mSerialView = (TextView) findViewById(R.id.in);
-               mSerialView.setMovementMethod(new ScrollingMovementMethod());
-               mSerialView.setClickable(false);
-               mSerialView.setLongClickable(false);
+               mTextView = (TextView) findViewById(R.id.text);
+               mTextView.setMovementMethod(new ScrollingMovementMethod());
+               mTextView.setClickable(false);
+               mTextView.setLongClickable(false);
+
+               mCallsignView  = (TextView) findViewById(R.id.callsign_value);
+               mStateView     = (TextView) findViewById(R.id.state_value);
+               mSpeedView     = (TextView) findViewById(R.id.speed_value);
+               mAccelView     = (TextView) findViewById(R.id.accel_value);
+               mRangeView     = (TextView) findViewById(R.id.range_value);
+               mHeightView    = (TextView) findViewById(R.id.height_value);
+               mElevationView = (TextView) findViewById(R.id.elevation_value);
+               mBearingView   = (TextView) findViewById(R.id.bearing_value);
+               mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
+               mLongitudeView = (TextView) findViewById(R.id.longitude_value);
 
                // Get local Bluetooth adapter
                mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();