first commit

sudo-a13 · Mar 31, 2014 · f5b2842 · f5b2842
1 parent e58cda7
commit f5b2842
Show file tree

Hide file tree

Showing 77 changed files with 514 additions and 175 deletions.
diff --git a/.classpath b/.classpath
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="src" path="/IOIOLibAndroid"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="/openxc"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,12 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.ioiomint.pixelhelloworld" android:versionCode="10" android:versionName="1.5">
 
-       <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"/>
+       <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
 
       <uses-permission android:name="android.permission.BLUETOOTH"></uses-permission> 
       <uses-permission android:name="android.permission.INTERNET"></uses-permission> 
 
-      <application android:icon="@drawable/icon" android:label="@string/app_name">
+      <application 
+          android:icon="@drawable/icon" 
+          android:label="@string/app_name">
 
             <uses-library android:name="com.android.future.usb.accessory" android:required="false" />	
 
@@ -21,7 +23,8 @@
             		<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
                                   android:resource="@xml/accessory_filter" />
             </activity>
-
+      <service android:name="com.openxc.VehicleManager"/>
+      <activity android:name="preferences" ></activity>
 
       </application>
 

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -2,12 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.ioiomint.pixelhelloworld" android:versionCode="10" android:versionName="1.5">
 
-       <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"/>
+       <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
 
       <uses-permission android:name="android.permission.BLUETOOTH"></uses-permission> 
       <uses-permission android:name="android.permission.INTERNET"></uses-permission> 
 
-      <application android:icon="@drawable/icon" android:label="@string/app_name">
+      <application 
+          android:icon="@drawable/icon" 
+          android:label="@string/app_name">
 
             <uses-library android:name="com.android.future.usb.accessory" android:required="false" />	
 
@@ -21,7 +23,8 @@
             		<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
                                   android:resource="@xml/accessory_filter" />
             </activity>
-
+      <service android:name="com.openxc.VehicleManager"/>
+      <activity android:name="preferences" ></activity>
 
       </application>
 

diff --git a/bin/PixelHalloween.apk b/bin/PixelHalloween.apk
diff --git a/bin/PixelHelloWord.apk b/bin/PixelHelloWord.apk
diff --git a/bin/R.txt b/bin/R.txt
@@ -0,0 +1,36 @@
+int drawable apple 0x7f020000
+int drawable icon 0x7f020001
+int drawable openxc_notification_icon_small_white 0x7f020002
+int id brake_status 0x7f080001
+int id title 0x7f080000
+int id vehicle_speed 0x7f080002
+int layout main 0x7f030000
+int raw blank 0x7f050000
+int raw footbrake 0x7f050001
+int raw openxcgrey 0x7f050002
+int raw rapid_brake 0x7f050003
+int string OKText 0x7f060012
+int string app_name 0x7f06000f
+int string bluetoothPairingString 0x7f060014
+int string bluetooth_checkbox_key 0x7f060008
+int string bluetooth_mac_key 0x7f060009
+int string gps_overwrite_checkbox_key 0x7f060003
+int string hello_world 0x7f060010
+int string intro 0x7f060011
+int string matrix_default_value 0x7f060015
+int string native_gps_checkbox_key 0x7f060002
+int string network_checkbox_key 0x7f06000a
+int string network_host_key 0x7f06000b
+int string network_port_key 0x7f06000c
+int string notFoundString 0x7f060013
+int string notification_content 0x7f060001
+int string openxc_name 0x7f060000
+int string recording_checkbox_key 0x7f060004
+int string recording_directory_key 0x7f060005
+int string selected_matrix 0x7f060016
+int string trace_source_checkbox_key 0x7f06000d
+int string trace_source_file_key 0x7f06000e
+int string uploading_checkbox_key 0x7f060006
+int string uploading_path_key 0x7f060007
+int style AppTheme 0x7f070000
+int xml accessory_filter 0x7f040000
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$1.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$1.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$2$1.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$2$1.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$2.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$2.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$3$1.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$3$1.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$3.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$3.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$ConnectTimer.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$ConnectTimer.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$IOIOThread.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord$IOIOThread.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord.class b/bin/classes/com/ioiomint/pixelhelloworld/PixelHelloWord.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$drawable.class b/bin/classes/com/ioiomint/pixelhelloworld/R$drawable.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$id.class b/bin/classes/com/ioiomint/pixelhelloworld/R$id.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$layout.class b/bin/classes/com/ioiomint/pixelhelloworld/R$layout.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$raw.class b/bin/classes/com/ioiomint/pixelhelloworld/R$raw.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$string.class b/bin/classes/com/ioiomint/pixelhelloworld/R$string.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$style.class b/bin/classes/com/ioiomint/pixelhelloworld/R$style.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R$xml.class b/bin/classes/com/ioiomint/pixelhelloworld/R$xml.class
diff --git a/bin/classes/com/ioiomint/pixelhelloworld/R.class b/bin/classes/com/ioiomint/pixelhelloworld/R.class
diff --git a/bin/classes/com/openxc/R$drawable.class b/bin/classes/com/openxc/R$drawable.class
diff --git a/bin/classes/com/openxc/R$string.class b/bin/classes/com/openxc/R$string.class
diff --git a/bin/classes/com/openxc/R.class b/bin/classes/com/openxc/R.class
diff --git a/bin/classes/ioio/lib/R$attr.class b/bin/classes/ioio/lib/R$attr.class
diff --git a/bin/classes/ioio/lib/R$drawable.class b/bin/classes/ioio/lib/R$drawable.class
diff --git a/bin/classes/ioio/lib/R$id.class b/bin/classes/ioio/lib/R$id.class
diff --git a/bin/classes/ioio/lib/R$layout.class b/bin/classes/ioio/lib/R$layout.class
diff --git a/bin/classes/ioio/lib/R$string.class b/bin/classes/ioio/lib/R$string.class
diff --git a/bin/classes/ioio/lib/R$style.class b/bin/classes/ioio/lib/R$style.class
diff --git a/bin/classes/ioio/lib/R$xml.class b/bin/classes/ioio/lib/R$xml.class
diff --git a/bin/classes/ioio/lib/R.class b/bin/classes/ioio/lib/R.class
diff --git a/bin/classes/ioio/lib/accessory/R$attr.class b/bin/classes/ioio/lib/accessory/R$attr.class
diff --git a/bin/classes/ioio/lib/accessory/R$drawable.class b/bin/classes/ioio/lib/accessory/R$drawable.class
diff --git a/bin/classes/ioio/lib/accessory/R$id.class b/bin/classes/ioio/lib/accessory/R$id.class
diff --git a/bin/classes/ioio/lib/accessory/R$layout.class b/bin/classes/ioio/lib/accessory/R$layout.class
diff --git a/bin/classes/ioio/lib/accessory/R$string.class b/bin/classes/ioio/lib/accessory/R$string.class
diff --git a/bin/classes/ioio/lib/accessory/R$style.class b/bin/classes/ioio/lib/accessory/R$style.class
diff --git a/bin/classes/ioio/lib/accessory/R$xml.class b/bin/classes/ioio/lib/accessory/R$xml.class
diff --git a/bin/classes/ioio/lib/accessory/R.class b/bin/classes/ioio/lib/accessory/R.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$attr.class b/bin/classes/ioio/lib/bluetooth/R$attr.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$drawable.class b/bin/classes/ioio/lib/bluetooth/R$drawable.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$id.class b/bin/classes/ioio/lib/bluetooth/R$id.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$layout.class b/bin/classes/ioio/lib/bluetooth/R$layout.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$string.class b/bin/classes/ioio/lib/bluetooth/R$string.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$style.class b/bin/classes/ioio/lib/bluetooth/R$style.class
diff --git a/bin/classes/ioio/lib/bluetooth/R$xml.class b/bin/classes/ioio/lib/bluetooth/R$xml.class
diff --git a/bin/classes/ioio/lib/bluetooth/R.class b/bin/classes/ioio/lib/bluetooth/R.class
diff --git a/bin/dexedLibs/guava-15.0-68a5094d15156bea338a716a78ceeedb.jar b/bin/dexedLibs/guava-15.0-68a5094d15156bea338a716a78ceeedb.jar
diff --git a/bin/dexedLibs/ioiolibaccessory-d8917fb360bed0e556767ba6dc0013bf.jar b/bin/dexedLibs/ioiolibaccessory-d8917fb360bed0e556767ba6dc0013bf.jar
diff --git a/bin/dexedLibs/ioiolibandroid-f9d0f8264f83eedeb8b0e35c5ab41d51.jar b/bin/dexedLibs/ioiolibandroid-f9d0f8264f83eedeb8b0e35c5ab41d51.jar
diff --git a/bin/dexedLibs/ioiolibbt-542326f4ce9033fbe2a474bd00491824.jar b/bin/dexedLibs/ioiolibbt-542326f4ce9033fbe2a474bd00491824.jar
diff --git a/bin/dexedLibs/jackson-core-2.2.3-099f1742084ac7bf55b86f3c9d24de6a.jar b/bin/dexedLibs/jackson-core-2.2.3-099f1742084ac7bf55b86f3c9d24de6a.jar
diff --git a/bin/dexedLibs/openxc-dc3cbdcb1897c2dab8d704b80ba5c49d.jar b/bin/dexedLibs/openxc-dc3cbdcb1897c2dab8d704b80ba5c49d.jar
diff --git a/bin/dexedLibs/protobuf-java-2.5.0-bb0d087d20afc93f3b066373948858fe.jar b/bin/dexedLibs/protobuf-java-2.5.0-bb0d087d20afc93f3b066373948858fe.jar
diff --git a/bin/dexedLibs/support-v4-19.0.0-a8105175e51303ead2fec0c87244fb1a.jar b/bin/dexedLibs/support-v4-19.0.0-a8105175e51303ead2fec0c87244fb1a.jar
diff --git a/bin/jarlist.cache b/bin/jarlist.cache
diff --git a/bin/res/drawable/apple.png → bin/res/crunch/drawable/apple.png b/bin/res/drawable/apple.png → bin/res/crunch/drawable/apple.png
diff --git a/bin/res/crunch/drawable/icon.png b/bin/res/crunch/drawable/icon.png
diff --git a/bin/res/drawable/icon.png b/bin/res/drawable/icon.png
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/ioiomint/pixelhelloworld/R.java b/gen/com/ioiomint/pixelhelloworld/R.java
@@ -13,20 +13,49 @@ public static final class attr {
     public static final class drawable {
         public static final int apple=0x7f020000;
         public static final int icon=0x7f020001;
+        public static final int openxc_notification_icon_small_white=0x7f020002;
     }
     public static final class id {
-        public static final int title=0x7f070000;
+        public static final int brake_status=0x7f080001;
+        public static final int title=0x7f080000;
+        public static final int vehicle_speed=0x7f080002;
     }
     public static final class layout {
         public static final int main=0x7f030000;
     }
+    public static final class raw {
+        public static final int blank=0x7f050000;
+        public static final int footbrake=0x7f050001;
+        public static final int openxcgrey=0x7f050002;
+        public static final int rapid_brake=0x7f050003;
+    }
     public static final class string {
-        public static final int app_name=0x7f050000;
-        public static final int hello_world=0x7f050001;
-        public static final int intro=0x7f050002;
+        public static final int OKText=0x7f060012;
+        public static final int app_name=0x7f06000f;
+        public static final int bluetoothPairingString=0x7f060014;
+        public static final int bluetooth_checkbox_key=0x7f060008;
+        public static final int bluetooth_mac_key=0x7f060009;
+        public static final int gps_overwrite_checkbox_key=0x7f060003;
+        public static final int hello_world=0x7f060010;
+        public static final int intro=0x7f060011;
+        public static final int matrix_default_value=0x7f060015;
+        public static final int native_gps_checkbox_key=0x7f060002;
+        public static final int network_checkbox_key=0x7f06000a;
+        public static final int network_host_key=0x7f06000b;
+        public static final int network_port_key=0x7f06000c;
+        public static final int notFoundString=0x7f060013;
+        public static final int notification_content=0x7f060001;
+        public static final int openxc_name=0x7f060000;
+        public static final int recording_checkbox_key=0x7f060004;
+        public static final int recording_directory_key=0x7f060005;
+        public static final int selected_matrix=0x7f060016;
+        public static final int trace_source_checkbox_key=0x7f06000d;
+        public static final int trace_source_file_key=0x7f06000e;
+        public static final int uploading_checkbox_key=0x7f060006;
+        public static final int uploading_path_key=0x7f060007;
     }
     public static final class style {
-        public static final int AppTheme=0x7f060000;
+        public static final int AppTheme=0x7f070000;
     }
     public static final class xml {
         public static final int accessory_filter=0x7f040000;

diff --git a/gen/com/openxc/R.java b/gen/com/openxc/R.java
@@ -0,0 +1,30 @@
+/* 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 com.openxc;
+
+public final class R {
+	public static final class drawable {
+		public static final int openxc_notification_icon_small_white = 0x7f020002;
+	}
+	public static final class string {
+		public static final int bluetooth_checkbox_key = 0x7f060008;
+		public static final int bluetooth_mac_key = 0x7f060009;
+		public static final int gps_overwrite_checkbox_key = 0x7f060003;
+		public static final int native_gps_checkbox_key = 0x7f060002;
+		public static final int network_checkbox_key = 0x7f06000a;
+		public static final int network_host_key = 0x7f06000b;
+		public static final int network_port_key = 0x7f06000c;
+		public static final int notification_content = 0x7f060001;
+		public static final int openxc_name = 0x7f060000;
+		public static final int recording_checkbox_key = 0x7f060004;
+		public static final int recording_directory_key = 0x7f060005;
+		public static final int trace_source_checkbox_key = 0x7f06000d;
+		public static final int trace_source_file_key = 0x7f06000e;
+		public static final int uploading_checkbox_key = 0x7f060006;
+		public static final int uploading_path_key = 0x7f060007;
+	}
+}
diff --git a/gen/ioio/lib/R.java b/gen/ioio/lib/R.java
diff --git a/gen/ioio/lib/accessory/R.java b/gen/ioio/lib/accessory/R.java
diff --git a/gen/ioio/lib/bluetooth/R.java b/gen/ioio/lib/bluetooth/R.java
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/project.properties b/project.properties
@@ -11,7 +11,8 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:8
-android.library.reference.3=../IOIOLibBT
-android.library.reference.1=../IOIOLib
-android.library.reference.2=../IOIOLibAccessory
+target=android-19
+android.library.reference.3=../../ioio/software/IOIOLibBT
+android.library.reference.1=../../ioio/software/IOIOLibAccessory
+android.library.reference.2=../../ioio/software/IOIOLib/target/android
+android.library.reference.4=../../../openxc-android/openxc
diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -10,4 +10,18 @@
     android:text="@string/intro"
     android:id="@+id/title"/>
 
+<TextView
+    android:id="@+id/brake_status"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="No Data" 
+    android:textColor="#0099CC"/>
+
+<TextView
+    android:id="@+id/vehicle_speed"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="No speed" 
+    android:textColor="#0099CC"/>
+
 </LinearLayout>
diff --git a/res/raw/blank.rgb565 b/res/raw/blank.rgb565
diff --git a/res/raw/footbrake.rgb565 b/res/raw/footbrake.rgb565
diff --git a/res/raw/openxcgrey.rgb565 b/res/raw/openxcgrey.rgb565
diff --git a/res/raw/rapid_brake.rgb565 b/res/raw/rapid_brake.rgb565
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -3,6 +3,10 @@
     <string name="app_name">Pixel Hello World</string>
     <string name="hello_world">Hello world!</string>
     <string name="intro">A picture of an Apple should now be showing on the Pixel LED frame\n\nIf no Apple image is showing, then first make sure you have Bluetooth paired the Pixel Frame to your Android device\n\nIn Bluetooth search, look for a device starting with IOIO and then pair with code: 4545</string>
+    <string name="OKText">OK</string>   
+    <string name="notFoundString">PIXEL Not Found</string>   
+	<string name="bluetoothPairingString">Please ensure Bluetooth pairing has been completed prior. The Bluetooth pairing code is: 4545."</string> 
+    <string name="matrix_default_value">3</string> 
+    <string name="selected_matrix">selected_matrix</string>
 
-
 </resources>