/*
- * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ * Copyright © 2012-2013 Mike Beattie <mike@ethernal.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import android.os.Message;
import android.os.Messenger;
import android.os.RemoteException;
-import android.text.method.ScrollingMovementMethod;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.widget.Toast;
import android.app.AlertDialog;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
-/**
- * This is the main Activity that displays the current chat session.
- */
public class AltosDroid extends Activity {
// Debugging
private static final String TAG = "AltosDroid";
private TextView mLatitudeView;
private TextView mLongitudeView;
- // Generic field for extras at the bottom
- private TextView mTextView;
+ // field to display the version at the bottom of the screen
+ private TextView mVersion;
// Service
private boolean mIsBound = false;
private Messenger mService = null;
final Messenger mMessenger = new Messenger(new IncomingHandler(this));
+ // Preferences
+ private AltosDroidPreferences prefs = null;
+
// TeleBT Config data
private AltosConfigData mConfigData = null;
// Local Bluetooth adapter
ad.mTitle.append(str);
Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
ad.mAltosVoice.speak("Connected");
- //TEST!
- ad.mTextView.setText(Dumper.dump(ad.mConfigData));
break;
case TelemetryService.STATE_CONNECTING:
ad.mTitle.setText(R.string.title_connecting);
case TelemetryService.STATE_NONE:
ad.mConfigData = null;
ad.mTitle.setText(R.string.title_not_connected);
- ad.mTextView.setText("");
break;
}
break;
case MSG_TELEMETRY:
ad.update_ui((AltosState) msg.obj);
- // TEST!
- ad.mTextView.setText(Dumper.dump(msg.obj));
break;
}
}
mSerialView.setText(String.format("%d", state.data.serial));
mFlightView.setText(String.format("%d", state.data.flight));
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));
+ mSpeedView.setText(String.format("%6.0f m/s", state.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));
return;
}
+ // Initialise preferences
+ prefs = new AltosDroidPreferences(this);
+ AltosPreferences.init(prefs);
+
// Set up the window layout
requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
- //setContentView(R.layout.main);
setContentView(R.layout.altosdroid);
getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
mTitle.setText(R.string.app_name);
mTitle = (TextView) findViewById(R.id.title_right_text);
- // Set up the temporary Text View
- mTextView = (TextView) findViewById(R.id.text);
- mTextView.setMovementMethod(new ScrollingMovementMethod());
- mTextView.setClickable(false);
- mTextView.setLongClickable(false);
+ // Display the Version
+ mVersion = (TextView) findViewById(R.id.version);
+ mVersion.setText("Version: " + BuildInfo.version +
+ " Built: " + BuildInfo.builddate + " " + BuildInfo.buildtime + " " + BuildInfo.buildtz +
+ " (" + BuildInfo.branch + "-" + BuildInfo.commitnum + "-" + BuildInfo.commithash + ")");
mCallsignView = (TextView) findViewById(R.id.callsign_value);
mRSSIView = (TextView) findViewById(R.id.rssi_value);
mAltosVoice.stop();
}
-
-
-
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if(D) Log.d(TAG, "onActivityResult " + resultCode);
switch (requestCode) {
void setFrequency(String freq) {
try {
- setFrequency (Double.parseDouble(freq));
+ setFrequency (Double.parseDouble(freq.substring(11, 17)));
} catch (NumberFormatException e) {
}
}
// Set the TBT radio frequency
final String[] frequencies = {
- "434.550",
- "434.650",
- "434.750",
- "434.850",
- "434.950",
- "435.050",
- "435.150",
- "435.250",
- "435.350",
- "435.450"
+ "Channel 0 (434.550MHz)",
+ "Channel 1 (434.650MHz)",
+ "Channel 2 (434.750MHz)",
+ "Channel 3 (434.850MHz)",
+ "Channel 4 (434.950MHz)",
+ "Channel 5 (435.050MHz)",
+ "Channel 6 (435.150MHz)",
+ "Channel 7 (435.250MHz)",
+ "Channel 8 (435.350MHz)",
+ "Channel 9 (435.450MHz)"
};
AlertDialog.Builder builder = new AlertDialog.Builder(this);