Merge remote-tracking branch 'mjb/master'

diff --git a/.gitignore b/.gitignore
index 9f33ea3c437bcb562512487fdfb38d4efa5f3868..b7b8fda159f4ed74050b357331a2cee6d19547e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ ao-tools/ao-load/ao-load
 ao-tools/ao-postflight/ao-postflight
 ao-tools/ao-rawload/ao-rawload
 ao-tools/ao-send-telem/ao-send-telem
+ao-tools/ao-sky-flash/ao-sky-flash
 ao-tools/ao-view/ao-view
 ao-view/Makefile
 ao-view/ao-view

diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index e3acba4051795715f5a0514552778b6e09ae4371..0d2ee6e0b5c12d6212c25ddd28db36a7eea586ff 100644 (file)
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -1,4 +1,5 @@
 local.properties
 bin
 gen
+libs
 src/org/altusmetrum/AltosDroid/BuildInfo.java

diff --git a/altosdroid/res/layout/main.xml b/altosdroid/res/layout/main.xml
deleted file mode 100644 (file)
index 00ca63c..0000000
--- a/altosdroid/res/layout/main.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-
-    <TextView
-        android:id="@+id/in"
-        android:layout_width="fill_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
-        android:gravity="bottom"
-        android:scrollbars="vertical"
-        android:textSize="7dp"
-        android:typeface="monospace" />
-
-</LinearLayout>

diff --git a/altosdroid/res/layout/message.xml b/altosdroid/res/layout/message.xml
deleted file mode 100644 (file)
index 8fa358c..0000000
--- a/altosdroid/res/layout/message.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textSize="18sp"
-    android:padding="5dp"
-/>
\ No newline at end of file

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index caa1a1c5a7c80b73639ea1b5c149f87bd3fbcf96..61931731ff320094db1efe2dace1f529a3d396df 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -33,7 +33,6 @@ import android.os.Handler;
 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;
@@ -45,9 +44,6 @@ import android.app.AlertDialog;
 
 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";
@@ -79,8 +75,7 @@ public class AltosDroid extends Activity {
        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
@@ -118,8 +113,6 @@ public class AltosDroid extends Activity {
                                        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);
@@ -128,14 +121,11 @@ public class AltosDroid extends Activity {
                                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;
                        }
                }
@@ -235,7 +225,6 @@ public class AltosDroid extends Activity {
 
                // 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);
 
@@ -244,12 +233,7 @@ public class AltosDroid extends Activity {
                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 +

diff --git a/altoslib/.gitignore b/altoslib/.gitignore
index a71d076cd2bd093c6d732db61d14d0c0b2d6b90e..ff0fd7108e117edf0bde0b9c4de3b8072e05c2c7 100644 (file)
--- a/altoslib/.gitignore
+++ b/altoslib/.gitignore
@@ -1,3 +1,3 @@
 bin
-classAltosLib.stamp
-AltosLib.jar
+classaltoslib.stamp
+altoslib*.jar

diff --git a/altosui/.gitignore b/altosui/.gitignore
index 6d2d8c23f8cab1f96a3012893cf958f8a4d3ec59..f8554c6a2292cc50db18204037e533d541aa8870 100644 (file)
--- a/altosui/.gitignore
+++ b/altosui/.gitignore
@@ -12,6 +12,7 @@ altosui
 altosui-test
 altosui-jdb
 classaltosui.stamp
+altos-windows.nsi
 Altos-Linux-*.tar.bz2
 Altos-Mac-*.zip
 Altos-Windows-*.exe

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 8ae1a72e74582d223e5ab4e6f26558c796d317bc..96cf77f2a99c2efbbaafdff2006f66a99e03a646 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -182,7 +182,7 @@ all-local: classes/altosui $(JAR) altosui altosui-test altosui-jdb
 clean-local:
        -rm -rf classes $(JAR) $(FATJAR) \
                $(LINUX_DIST) $(MACOSX_DIST) windows $(WINDOWS_DIST) $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(FREETTS_CLASS) \
-               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log \
+               $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt altos-windows.log altos-windows.nsi \
                altosui altosui-test altosui-jdb macosx linux
 
 if FATINSTALL

diff --git a/altosuilib/.gitignore b/altosuilib/.gitignore
new file mode 100644 (file)
index 0000000..4ad8a77
--- /dev/null
+++ b/altosuilib/.gitignore
@@ -0,0 +1,4 @@
+AltosUIVersion.java
+bin
+classaltosuilib.stamp
+altosuilib*.jar

diff --git a/micropeak/.gitignore b/micropeak/.gitignore
index ab80492bacd5045aceb24964cc5cbebd5ca47308..6a6475f0b02e83b4833df0588ff58c576bc594ce 100644 (file)
--- a/micropeak/.gitignore
+++ b/micropeak/.gitignore
@@ -7,6 +7,7 @@ micropeak
 micropeak-test
 micropeak-jdb
 micropeak-windows.log
+micropeak-windows.nsi
 MicroPeak-Linux-*
 MicroPeak-Mac-*
 MicroPeak-Windows-*
@@ -17,3 +18,4 @@ linux
 macosx
 CDM*.exe
 FTDI*.dmg
+Info.plist

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index d45ecab9371efed3c1b966d219342a388b06e0f6..098a00fb0e293e765571f50e48894167c941f615 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -78,7 +78,8 @@ clean-local:
                $(ALTOSLIB_CLASS) \
                $(ALTOSUILIB_CLASS) \
                $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) Manifest.txt Manifest-fat.txt \
-               micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log
+               micropeak micropeak-test micropeak-jdb macosx linux windows micropeak-windows.log \
+               micropeak-windows.nsi
 
 LINUX_DIST=MicroPeak-Linux-$(VERSION).tar.bz2
 MACOSX_DIST=MicroPeak-Mac-$(VERSION).dmg

diff --git a/src/test/.gitignore b/src/test/.gitignore
index 5d528ab9a2402681ccc184a0a2499eeb92adf5b5..8d79d168db0cda75551664666c2a4c8a22bc063c 100644 (file)
--- a/src/test/.gitignore
+++ b/src/test/.gitignore
@@ -1,3 +1,5 @@
+ao_aprs_data.wav
+ao_aprs_test
 ao_flight_test
 ao_flight_test_baro
 ao_flight_test_accel
@@ -6,4 +8,6 @@ ao_gps_test_skytraq
 ao_convert_test
 ao_convert_pa_test
 ao_fec_test
+ao_flight_test_mm
 ao_flight_test_noisy_accel
+ao_micropeak_test

diff --git a/src/test/Makefile b/src/test/Makefile
index 1c2d771ed6511e818106c30885fd480721f7c167..fccc793787da3bcfe92fb3ee1fd5aee64ede4015 100644 (file)
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -13,7 +13,7 @@ CFLAGS=-I.. -I. -I../core -I../drivers -I../micropeak -O0 -g -Wall
 all: $(PROGS) ao_aprs_data.wav
 
 clean:
-       rm -f $(PROGS) run-out.baro run-out.full
+       rm -f $(PROGS) ao_aprs_data.wav run-out.baro run-out.full
 
 install: