diff --git a/.gitignore b/.gitignore index a5af05849..c9478a9c1 100644 --- a/.gitignore +++ b/.gitignore @@ -64,10 +64,16 @@ ground/uavobjgenerator/uavobjgenerator.pro.user ground/uavobjects/uavobjects.pro.user ground/ground.pro.user -# Ignore GNU global tags files GPATH GRTAGS GSYMS GTAGS + +plane +quad + +# Ignore auto generated java files +androidgcs/bin/ +androidgcs/gen/ /.cproject /.project diff --git a/androidgcs/.classpath b/androidgcs/.classpath new file mode 100644 index 000000000..609aa00eb --- /dev/null +++ b/androidgcs/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/androidgcs/.project b/androidgcs/.project new file mode 100644 index 000000000..c607dd2bd --- /dev/null +++ b/androidgcs/.project @@ -0,0 +1,33 @@ + + + androidgcs + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/androidgcs/.settings/org.eclipse.jdt.core.prefs b/androidgcs/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..f3fe4d6d6 --- /dev/null +++ b/androidgcs/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Tue Mar 01 01:16:25 CST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/androidgcs/AndroidManifest.xml b/androidgcs/AndroidManifest.xml index 83d19e96c..7a96a6600 100644 --- a/androidgcs/AndroidManifest.xml +++ b/androidgcs/AndroidManifest.xml @@ -3,16 +3,10 @@ package="org.openpilot.androidgcs" android:versionCode="1" android:versionName="1.0"> - + - - - - - - + \ No newline at end of file diff --git a/androidgcs/bin/OpieMobi.apk b/androidgcs/bin/OpieMobi.apk deleted file mode 100644 index 87a15c5e8..000000000 Binary files a/androidgcs/bin/OpieMobi.apk and /dev/null differ diff --git a/androidgcs/bin/classes.dex b/androidgcs/bin/classes.dex deleted file mode 100644 index 3655f3762..000000000 Binary files a/androidgcs/bin/classes.dex and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.class b/androidgcs/bin/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.class deleted file mode 100644 index 306bc08c9..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/ObjectBrowser.class b/androidgcs/bin/org/openpilot/androidgcs/ObjectBrowser.class deleted file mode 100644 index 2893e454b..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/ObjectBrowser.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$attr.class b/androidgcs/bin/org/openpilot/androidgcs/R$attr.class deleted file mode 100644 index f69a8e175..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$attr.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$color.class b/androidgcs/bin/org/openpilot/androidgcs/R$color.class deleted file mode 100644 index 1c2575f48..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$color.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$drawable.class b/androidgcs/bin/org/openpilot/androidgcs/R$drawable.class deleted file mode 100644 index 43d486e46..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$drawable.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$id.class b/androidgcs/bin/org/openpilot/androidgcs/R$id.class deleted file mode 100644 index 6e4cbafb9..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$id.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$layout.class b/androidgcs/bin/org/openpilot/androidgcs/R$layout.class deleted file mode 100644 index 63cf32e58..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$layout.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R$string.class b/androidgcs/bin/org/openpilot/androidgcs/R$string.class deleted file mode 100644 index d473cb81c..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R$string.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/androidgcs/R.class b/androidgcs/bin/org/openpilot/androidgcs/R.class deleted file mode 100644 index 27ae2280a..000000000 Binary files a/androidgcs/bin/org/openpilot/androidgcs/R.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVDataObject.class b/androidgcs/bin/org/openpilot/uavtalk/UAVDataObject.class deleted file mode 100644 index 95af7d703..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVDataObject.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVMetaObject.class b/androidgcs/bin/org/openpilot/uavtalk/UAVMetaObject.class deleted file mode 100644 index 7234b135e..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVMetaObject.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVObject$AccessMode.class b/androidgcs/bin/org/openpilot/uavtalk/UAVObject$AccessMode.class deleted file mode 100644 index b2f073d35..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVObject$AccessMode.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVObject$UpdateMode.class b/androidgcs/bin/org/openpilot/uavtalk/UAVObject$UpdateMode.class deleted file mode 100644 index 5e520fa0e..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVObject$UpdateMode.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVObject.class b/androidgcs/bin/org/openpilot/uavtalk/UAVObject.class deleted file mode 100644 index 5e2281553..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVObject.class and /dev/null differ diff --git a/androidgcs/bin/org/openpilot/uavtalk/UAVObjectManager.class b/androidgcs/bin/org/openpilot/uavtalk/UAVObjectManager.class deleted file mode 100644 index f4a6dd7e4..000000000 Binary files a/androidgcs/bin/org/openpilot/uavtalk/UAVObjectManager.class and /dev/null differ diff --git a/androidgcs/bin/resources.ap_ b/androidgcs/bin/resources.ap_ deleted file mode 100644 index 2452fd26f..000000000 Binary files a/androidgcs/bin/resources.ap_ and /dev/null differ diff --git a/androidgcs/default.properties b/androidgcs/default.properties index e2e8061f2..46769a720 100644 --- a/androidgcs/default.properties +++ b/androidgcs/default.properties @@ -8,4 +8,4 @@ # project structure. # Project target. -target=android-8 +target=android-7 diff --git a/androidgcs/gen/org/openpilot/androidgcs/R.java b/androidgcs/gen/org/openpilot/androidgcs/R.java deleted file mode 100644 index 31e90ffd1..000000000 --- a/androidgcs/gen/org/openpilot/androidgcs/R.java +++ /dev/null @@ -1,31 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.openpilot.androidgcs; - -public final class R { - public static final class attr { - } - public static final class color { - public static final int all_black=0x7f050001; - public static final int all_white=0x7f050000; - } - public static final class drawable { - public static final int icon=0x7f020000; - } - public static final class id { - public static final int objects=0x7f060000; - } - public static final class layout { - public static final int main=0x7f030000; - public static final int objectbrowser=0x7f030001; - } - public static final class string { - public static final int app_name=0x7f040001; - public static final int hello=0x7f040000; - } -} diff --git a/androidgcs/res/drawable-hdpi/icon.png b/androidgcs/res/drawable-hdpi/icon.png index eab1fc68f..8074c4c57 100644 Binary files a/androidgcs/res/drawable-hdpi/icon.png and b/androidgcs/res/drawable-hdpi/icon.png differ diff --git a/androidgcs/res/drawable-ldpi/icon.png b/androidgcs/res/drawable-ldpi/icon.png index eab1fc68f..1095584ec 100644 Binary files a/androidgcs/res/drawable-ldpi/icon.png and b/androidgcs/res/drawable-ldpi/icon.png differ diff --git a/androidgcs/res/drawable-mdpi/icon.png b/androidgcs/res/drawable-mdpi/icon.png index eab1fc68f..a07c69fa5 100644 Binary files a/androidgcs/res/drawable-mdpi/icon.png and b/androidgcs/res/drawable-mdpi/icon.png differ diff --git a/androidgcs/res/layout/objectbrowser.xml b/androidgcs/res/layout/objectbrowser.xml deleted file mode 100644 index 02a3f5dd6..000000000 --- a/androidgcs/res/layout/objectbrowser.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/androidgcs/res/values/strings.xml b/androidgcs/res/values/strings.xml index eba6becf8..0d9f93bc2 100644 --- a/androidgcs/res/values/strings.xml +++ b/androidgcs/res/values/strings.xml @@ -1,7 +1,5 @@ - OpenPilot Android GCS - OpieMobi - #FFFFFF - #000000 + Hello World! + OpenPilot GCS diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.java b/androidgcs/src/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.java deleted file mode 100644 index 190668d80..000000000 --- a/androidgcs/src/org/openpilot/androidgcs/ObjBrowserExpandableListAdapter.java +++ /dev/null @@ -1,99 +0,0 @@ -/** - * - */ -package org.openpilot.androidgcs; - -import android.widget.AbsListView; -import android.widget.TextView; -import android.content.Context; -import android.view.Gravity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseExpandableListAdapter; - -/** - * @author jcotton81 - * - */ -public class ObjBrowserExpandableListAdapter extends BaseExpandableListAdapter { - - // Sample data set. children[i] contains the children (String[]) for - // groups[i]. - private String[] groups = { "Parent1", "Parent2", "Parent3" }; - private String[][] children = { { "Child1" },{ "Child2" }, { "Child3" },{ "Child4" }, { "Child5" } }; - - private Context context; - - public ObjBrowserExpandableListAdapter(Context context) { - this.context = context; - } - - public Object getChild(int groupPosition, int childPosition) { - return children[groupPosition][childPosition]; - } - - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - public int getChildrenCount(int groupPosition) { - int i = 0; - try { - i = children[groupPosition].length; - - } catch (Exception e) { - } - - return i; - } - - public TextView getGenericView() { - // Layout parameters for the ExpandableListView - AbsListView.LayoutParams lp = new AbsListView.LayoutParams( - ViewGroup.LayoutParams.FILL_PARENT, 64); - - TextView textView = new TextView(context); - textView.setLayoutParams(lp); - // Center the text vertically - textView.setGravity(Gravity.CENTER_VERTICAL | Gravity.LEFT); - // Set the text starting position - textView.setPadding(36, 0, 0, 0); - return textView; - } - - public View getChildView(int groupPosition, int childPosition, - boolean isLastChild, View convertView, ViewGroup parent) { - TextView textView = getGenericView(); - textView.setText(getChild(groupPosition, childPosition).toString()); - return textView; - } - - public Object getGroup(int groupPosition) { - return groups[groupPosition]; - } - - public int getGroupCount() { - return groups.length; - } - - public long getGroupId(int groupPosition) { - return groupPosition; - } - - public View getGroupView(int groupPosition, boolean isExpanded, - View convertView, ViewGroup parent) { - TextView textView = getGenericView(); - textView.setText(getGroup(groupPosition).toString()); - return textView; - } - - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - public boolean hasStableIds() { - return true; - } - - -} diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java b/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java deleted file mode 100644 index 19e9b2812..000000000 --- a/androidgcs/src/org/openpilot/androidgcs/ObjectBrowser.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.openpilot.androidgcs; - -import android.app.Activity; -import android.os.Bundle; - -import android.widget.*; - -public class ObjectBrowser extends Activity { - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.objectbrowser); - ExpandableListAdapter mAdapter; - ExpandableListView epView = (ExpandableListView) findViewById(R.id.objects); - mAdapter = new ObjBrowserExpandableListAdapter(this); - epView.setAdapter(mAdapter); - - } -} \ No newline at end of file diff --git a/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java b/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java index a1e5773b9..e5197b02e 100644 --- a/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java +++ b/androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java @@ -2,13 +2,11 @@ package org.openpilot.uavtalk; public class UAVMetaObject extends UAVObject { - public UAVMetaObject(int objID, Boolean isSingleInst, String name) { - super(objID, isSingleInst, name); - // TODO Auto-generated constructor stub - } - - public UAVMetaObject(int objID, String mname, UAVDataObject obj) { - // TODO Auto-generated constructor stub + private UAVDataObject parent; + + public UAVMetaObject(int objID, String mname, UAVDataObject parent) { + super(objID, true, mname); + this.parent = parent; } @Override