diff options
-rw-r--r-- | demokit/app/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | demokit/app/res/layout-xlarge/main.xml | 94 | ||||
-rw-r--r-- | demokit/app/res/layout/main.xml | 375 | ||||
-rw-r--r-- | demokit/app/res/values/strings.xml | 4 | ||||
-rw-r--r-- | demokit/app/src/com/google/DemoKit/DemoKitActivity.java (renamed from demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java) | 30 | ||||
-rw-r--r-- | demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java (renamed from demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java) | 2 | ||||
-rw-r--r-- | demokit/demokit.pde | 61 |
7 files changed, 123 insertions, 447 deletions
diff --git a/demokit/app/AndroidManifest.xml b/demokit/app/AndroidManifest.xml index b51b29b..d873887 100644 --- a/demokit/app/AndroidManifest.xml +++ b/demokit/app/AndroidManifest.xml @@ -15,11 +15,11 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.android.DemoKit" + package="com.google.DemoKit" android:versionCode="1" android:versionName="1.0"> - <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="11" /> + <uses-sdk android:targetSdkVersion="11" /> <application android:label="DemoKit" android:icon="@drawable/icon" diff --git a/demokit/app/res/layout-xlarge/main.xml b/demokit/app/res/layout-xlarge/main.xml deleted file mode 100644 index 8fdf685..0000000 --- a/demokit/app/res/layout-xlarge/main.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <TableLayout android:id="@+id/tableLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true"> - <TableRow android:id="@+id/tableRow1" android:layout_width="match_parent" android:layout_gravity="center_vertical" android:orientation="vertical" android:showDividers="beginning|middle|end" android:layout_weight="1" android:layout_height="wrap_content" android:baselineAligned="false" android:gravity="center_vertical" android:layout_marginBottom="8dip"> - <TextView android:id="@+id/textView17" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/buttons" android:layout_marginRight="8dip"></TextView> - <LinearLayout android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:verticalScrollbarPosition="right" android:layout_width="match_parent" android:layout_gravity="fill_horizontal"> - <TextView android:id="@+id/textView1" android:layout_height="wrap_content" android:layout_width="match_parent" android:text="@string/button1" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> - <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button1Image"></ImageView> - </LinearLayout> - <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textView2" android:layout_height="wrap_content" android:text="@string/button2" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> - <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button2Image"></ImageView> - </LinearLayout> - <LinearLayout android:id="@+id/linearLayout6" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textView3" android:layout_height="wrap_content" android:text="@string/button3" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> - <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button3Image"></ImageView> - </LinearLayout> - </TableRow> - <TableRow android:id="@+id/tableRow14" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:id="@+id/textView19" android:layout_height="wrap_content" android:layout_width="wrap_content"></TextView> - <TextView android:id="@+id/textView20" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/led1"></TextView> - <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView21" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led2"></TextView> - <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView22" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led3"></TextView> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow4" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> - <TextView android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/red"></TextView> - <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Red" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led2Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led3Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow5" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> - <TextView android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/green"></TextView> - <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Green" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led2Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led3Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow6" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> - <TextView android:id="@+id/textView7" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/blue"></TextView> - <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Blue" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led2Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - <SeekBar android:id="@+id/led3Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow2" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> - <TextView android:id="@+id/textView18" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/relays" android:layout_marginRight="8dip"></TextView> - <LinearLayout android:id="@+id/linearLayout2" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:text="@string/relay1" android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> - <ToggleButton android:text="ToggleButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/relay1Button"></ToggleButton> - </LinearLayout> - <LinearLayout android:id="@+id/linearLayout7" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textView14" android:layout_height="wrap_content" android:text="@string/relay2" android:layout_marginRight="8dip"></TextView> - <ToggleButton android:layout_width="wrap_content" android:text="ToggleButton" android:layout_height="wrap_content" android:id="@+id/relay2Button"></ToggleButton> - </LinearLayout> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow3" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip"> - <TextView android:text="@string/temperature" android:id="@+id/textView15" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> - <TextView android:id="@+id/temperature" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> - </TableRow> - <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow13" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip"> - <TextView android:text="@string/light" android:id="@+id/textView16" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/light"></TextView> - </TableRow> - <TableRow android:id="@+id/tableRow7" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_marginRight="8dip" android:id="@+id/textView8" android:layout_width="wrap_content" android:text="@string/servos" android:layout_height="wrap_content"></TextView> - <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo1" android:max="255" android:progress="127"></SeekBar> - <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo2" android:max="255" android:progress="127"></SeekBar> - <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo3" android:max="255" android:progress="127"></SeekBar> - </TableRow> - <TableRow android:layout_width="match_parent" android:id="@+id/tableRow8" android:layout_height="wrap_content"> - <TextView android:id="@+id/textView9" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/joystick"></TextView> - <LinearLayout android:id="@+id/linearLayout3" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textView10" android:layout_height="wrap_content" android:text="@string/x" android:layout_marginRight="8dip"></TextView> - <TextView android:layout_width="wrap_content" android:id="@+id/joyX" android:layout_height="wrap_content"></TextView> - </LinearLayout> - <LinearLayout android:id="@+id/linearLayout4" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textView12" android:layout_height="wrap_content" android:text="@string/y" android:layout_marginRight="8dip"></TextView> - <TextView android:layout_width="wrap_content" android:id="@+id/joyY" android:layout_height="wrap_content"></TextView> - </LinearLayout> - <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView android:layout_width="wrap_content" android:id="@+id/textViewJoyButton" android:layout_height="wrap_content" android:text="@string/button" android:layout_marginRight="8dip"></TextView> - <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/joyButtonImage"></ImageView> - </LinearLayout> - - - </TableRow> - <TableRow android:layout_width="match_parent" android:id="@+id/tableRow9" android:layout_height="wrap_content"> - <TextView android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/cap"></TextView> - <ImageView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="left" android:src="@drawable/droid_off" android:id="@+id/cap"></ImageView> - </TableRow> - </TableLayout> - -</LinearLayout> diff --git a/demokit/app/res/layout/main.xml b/demokit/app/res/layout/main.xml index 6dbf840..4becaa0 100644 --- a/demokit/app/res/layout/main.xml +++ b/demokit/app/res/layout/main.xml @@ -1,297 +1,88 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent"> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <!-- Buttons --> - <TextView - android:id="@+id/textView17" android:layout_alignParentLeft="true" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/buttons" android:layout_marginRight="8dip"/> - <TextView - android:id="@+id/textView1" android:layout_below="@id/textView17" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:text="@string/button1" android:layout_gravity="center_vertical" - android:layout_marginRight="12dip" android:layout_marginLeft="8dp" - android:paddingTop="30dp" android:layout_marginBottom="5dp"/> - <ImageView - android:id="@+id/button1Image" android:layout_toRightOf="@id/textView1" - android:layout_alignBottom="@id/textView1" - android:layout_marginTop="8dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:src="@drawable/droid_off"/> - <TextView - android:id="@+id/textView2" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_toRightOf="@id/button1Image" - android:layout_marginLeft="24dp" android:text="@string/button2" - android:layout_gravity="center_vertical" android:layout_marginRight="12dip" - android:layout_alignBottom="@id/textView1"/> - <ImageView - android:id="@+id/button2Image" android:layout_toRightOf="@id/textView2" - android:layout_alignBottom="@id/textView2" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:src="@drawable/droid_off"/> - <TextView - android:id="@+id/textView3" android:layout_toRightOf="@id/button2Image" - android:layout_marginLeft="24dp" android:layout_alignBottom="@id/textView1" - android:layout_marginRight="12dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:text="@string/button3" - android:layout_gravity="center_vertical"/> - <ImageView - android:id="@+id/button3Image" android:layout_toRightOf="@id/textView3" - android:layout_alignBottom="@id/textView3" android:layout_marginTop="8dp" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/droid_off"/> - - <!-- LED 1 --> - <TextView - android:id="@+id/textView20" android:layout_height="wrap_content" - android:layout_width="match_parent" android:layout_gravity="center_horizontal" - android:text="@string/led1" android:layout_below="@id/textView1" - android:paddingTop="30dp"/> - <TextView - android:id="@+id/textView5" android:layout_below="@id/textView20" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/red" - android:paddingTop="20dp"/> - <SeekBar - android:id="@+id/led1Red" - android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5" - android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/> - <TextView - android:id="@+id/textView6" android:layout_below="@id/textView5" - android:paddingTop="20dp" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/green"/> - <SeekBar - android:id="@+id/led1Green" - android:layout_alignParentRight="true" - android:layout_alignBottom="@id/textView6" android:layout_height="wrap_content" - android:max="255" android:layout_marginRight="16dip" - android:layout_width="250dip"/> - <TextView - android:id="@+id/textView7" android:layout_below="@id/textView6" - android:paddingTop="20dp" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/blue"/> - <SeekBar - android:id="@+id/led1Blue" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:max="255" - android:layout_marginRight="16dip" android:layout_width="250dip" - android:layout_alignBottom="@id/textView7"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <TableLayout android:id="@+id/tableLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true"> + <TableRow android:id="@+id/tableRow1" android:layout_width="match_parent" android:layout_gravity="center_vertical" android:orientation="vertical" android:showDividers="beginning|middle|end" android:layout_weight="1" android:layout_height="wrap_content" android:baselineAligned="false" android:gravity="center_vertical" android:layout_marginBottom="8dip"> + <TextView android:id="@+id/textView17" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/buttons" android:layout_marginRight="8dip"></TextView> + <LinearLayout android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:verticalScrollbarPosition="right" android:layout_width="match_parent" android:layout_gravity="fill_horizontal"> + <TextView android:id="@+id/textView1" android:layout_height="wrap_content" android:layout_width="match_parent" android:text="@string/button1" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button1Image"></ImageView> + </LinearLayout> + <LinearLayout android:id="@+id/linearLayout5" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textView2" android:layout_height="wrap_content" android:text="@string/button2" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button2Image"></ImageView> + </LinearLayout> + <LinearLayout android:id="@+id/linearLayout6" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textView3" android:layout_height="wrap_content" android:text="@string/button3" android:layout_gravity="center_vertical" android:layout_marginRight="8dip"></TextView> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/droid_off" android:id="@+id/button3Image"></ImageView> + </LinearLayout> + </TableRow> + <TableRow android:id="@+id/tableRow14" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:id="@+id/textView19" android:layout_height="wrap_content" android:layout_width="wrap_content"></TextView> + <TextView android:id="@+id/textView20" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/led1"></TextView> + <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView21" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led2"></TextView> + <TextView android:layout_gravity="center_horizontal" android:id="@+id/textView22" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/led3"></TextView> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow4" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> + <TextView android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/red"></TextView> + <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Red" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led2Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led3Red" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow5" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> + <TextView android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/green"></TextView> + <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Green" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led2Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led3Green" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow6" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> + <TextView android:id="@+id/textView7" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:text="@string/blue"></TextView> + <SeekBar android:layout_height="wrap_content" android:max="255" android:id="@+id/led1Blue" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led2Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + <SeekBar android:id="@+id/led3Blue" android:layout_height="wrap_content" android:max="255" android:layout_marginRight="16dip" android:layout_width="250dip"></SeekBar> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow2" android:layout_width="match_parent" android:layout_weight="1" android:gravity="center_vertical" android:layout_marginBottom="8dip"> + <TextView android:id="@+id/textView18" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/relays" android:layout_marginRight="8dip"></TextView> + <LinearLayout android:id="@+id/linearLayout2" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:text="@string/relay1" android:id="@+id/textView4" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> + <ToggleButton android:text="ToggleButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/relay1Button"></ToggleButton> + </LinearLayout> + <LinearLayout android:id="@+id/linearLayout7" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textView14" android:layout_height="wrap_content" android:text="@string/relay2" android:layout_marginRight="8dip"></TextView> + <ToggleButton android:layout_width="wrap_content" android:text="ToggleButton" android:layout_height="wrap_content" android:id="@+id/relay2Button"></ToggleButton> + </LinearLayout> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow3" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip"> + <TextView android:text="@string/temperature" android:id="@+id/textView15" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> + <TextView android:id="@+id/temperature" android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView> + </TableRow> + <TableRow android:layout_height="wrap_content" android:id="@+id/tableRow13" android:layout_width="match_parent" android:layout_weight="1" android:layout_marginBottom="8dip"> + <TextView android:text="@string/light" android:id="@+id/textView16" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dip"></TextView> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/light"></TextView> + </TableRow> + <TableRow android:id="@+id/tableRow7" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_marginRight="8dip" android:id="@+id/textView8" android:layout_width="wrap_content" android:text="@string/servos" android:layout_height="wrap_content"></TextView> + <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo1" android:max="255" android:progress="127"></SeekBar> + <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo2" android:max="255" android:progress="127"></SeekBar> + <SeekBar android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="8dip" android:id="@+id/servo3" android:max="255" android:progress="127"></SeekBar> + </TableRow> + <TableRow android:layout_width="match_parent" android:id="@+id/tableRow8" android:layout_height="wrap_content"> + <TextView android:id="@+id/textView9" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/joystick"></TextView> + <LinearLayout android:id="@+id/linearLayout3" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textView10" android:layout_height="wrap_content" android:text="@string/x" android:layout_marginRight="8dip"></TextView> + <TextView android:layout_width="wrap_content" android:id="@+id/joyX" android:layout_height="wrap_content"></TextView> + </LinearLayout> + <LinearLayout android:id="@+id/linearLayout4" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:layout_width="wrap_content" android:id="@+id/textView12" android:layout_height="wrap_content" android:text="@string/y" android:layout_marginRight="8dip"></TextView> + <TextView android:layout_width="wrap_content" android:id="@+id/joyY" android:layout_height="wrap_content"></TextView> + </LinearLayout> + </TableRow> + <TableRow android:layout_width="match_parent" android:id="@+id/tableRow9" android:layout_height="wrap_content"> + <TextView android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="@string/cap"></TextView> + <ImageView android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="left" android:src="@drawable/redball" android:id="@+id/cap"></ImageView> + </TableRow> + </TableLayout> - <!-- LED 2 --> - <TextView - android:id="@+id/textView21" android:layout_height="wrap_content" - android:layout_width="match_parent" android:layout_gravity="center_horizontal" - android:text="@string/led2" android:layout_below="@id/led1Blue" - android:paddingTop="30dp"/> - <TextView - android:id="@+id/textView5_2" android:layout_below="@id/textView21" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/red" - android:paddingTop="20dp"/> - <SeekBar - android:id="@+id/led2Red" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5_2" - android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/> - <TextView - android:id="@+id/textView6_2" android:layout_below="@id/textView5_2" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/green"/> - <SeekBar - android:id="@+id/led2Green" android:layout_alignParentRight="true" - android:layout_alignBottom="@id/textView6_2" android:layout_height="wrap_content" - android:max="255" android:layout_marginRight="16dip" - android:layout_width="250dip"/> - <TextView - android:id="@+id/textView7_2" android:layout_below="@id/textView6_2" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/blue"/> - <SeekBar - android:id="@+id/led2Blue" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:max="255" - android:layout_marginRight="16dip" android:layout_width="250dip" - android:layout_alignBottom="@id/textView7_2"/> - - <!-- LED 3 --> - <TextView - android:id="@+id/textView22" android:layout_height="wrap_content" - android:layout_width="match_parent" android:layout_gravity="center_horizontal" - android:text="@string/led3" android:layout_below="@id/led2Blue" - android:paddingTop="30dp"/> - <TextView - android:id="@+id/textView5_3" android:layout_below="@id/textView22" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/red" - android:paddingTop="20dp"/> - <SeekBar - android:id="@+id/led3Red" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:layout_alignBottom="@id/textView5_3" - android:max="255" android:layout_width="250dp" android:layout_marginRight="16dip"/> - <TextView - android:id="@+id/textView6_3" android:layout_below="@id/textView5_3" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/green"/> - <SeekBar - android:id="@+id/led3Green" android:layout_alignParentRight="true" - android:layout_alignBottom="@id/textView6_3" android:layout_height="wrap_content" - android:max="255" android:layout_marginRight="16dip" - android:layout_width="250dip"/> - <TextView - android:id="@+id/textView7_3" android:layout_below="@id/textView6_3" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/blue"/> - <SeekBar - android:id="@+id/led3Blue" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:max="255" - android:layout_marginRight="16dip" android:layout_width="250dip" - android:layout_alignBottom="@id/textView7_3"/> - - <!-- Relays --> - <TextView - android:id="@+id/textView18" android:layout_below="@id/led3Blue" - android:paddingTop="60dp" android:layout_alignParentLeft="true" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/relays" android:layout_marginRight="8dip"/> - <ToggleButton - android:id="@+id/relay1Button" android:text="ToggleButton" - android:layout_toRightOf="@id/textView18" - android:layout_alignBottom="@id/textView18" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginLeft="12dp"/> - <TextView - android:id="@+id/textView4" android:layout_below="@id/relay1Button" - android:layout_alignLeft="@id/relay1Button" - android:layout_alignRight="@id/relay1Button" android:text="@string/relay1" - android:layout_width="wrap_content" android:gravity="center_horizontal" - android:layout_marginTop="4dp" android:layout_height="wrap_content"/> - <ToggleButton - android:id="@+id/relay2Button" android:text="ToggleButton" - android:layout_alignBottom="@id/textView18" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="12dp" android:layout_alignParentRight="true"/> - <TextView - android:id="@+id/textView4" android:layout_below="@id/relay2Button" - android:layout_alignLeft="@id/relay2Button" - android:layout_alignRight="@id/relay2Button" android:text="@string/relay2" - android:layout_width="wrap_content" android:gravity="center_horizontal" - android:layout_marginTop="4dp" android:layout_height="wrap_content"/> - - <!-- Temperature --> - <TextView - android:id="@+id/textView15" android:text="@string/temperature" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:layout_below="@id/textView18" - android:paddingTop="50dp" android:layout_alignParentLeft="true"/> - <TextView - android:id="@+id/temperature" android:layout_toRightOf="@id/textView15" - android:layout_alignBottom="@id/textView15" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - <!-- Light --> - <TextView - android:id="@+id/light" android:layout_alignParentRight="true" - android:layout_alignBottom="@id/textView15" android:layout_width="50dp" - android:layout_height="wrap_content"/> - <TextView - android:id="@+id/textView16" android:text="@string/light" - android:layout_alignBottom="@id/light" android:layout_toLeftOf="@id/light" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip"/> - - <!-- Servos --> - <TextView - android:id="@+id/textView8" android:layout_height="wrap_content" - android:layout_width="match_parent" android:layout_gravity="center_horizontal" - android:text="@string/servos" android:layout_below="@id/textView15" - android:paddingTop="30dp"/> - <TextView - android:id="@+id/servo1Text" android:layout_below="@id/textView8" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="8dip" android:text="@string/servo1" - android:paddingTop="20dp"/> - <SeekBar - android:id="@+id/servo1" android:layout_alignParentRight="true" - android:progress="127" android:layout_height="wrap_content" - android:layout_alignBottom="@id/servo1Text" android:max="255" - android:layout_width="250dp" android:layout_marginRight="16dip"/> - <TextView - android:id="@+id/servo2Text" android:layout_below="@id/servo1Text" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/servo2"/> - <SeekBar - android:id="@+id/servo2" android:layout_alignParentRight="true" - android:progress="127" android:layout_alignBottom="@id/servo2Text" - android:layout_height="wrap_content" android:max="255" - android:layout_marginRight="16dip" android:layout_width="250dip"/> - <TextView - android:id="@+id/servo3Text" android:layout_below="@id/servo2Text" - android:paddingTop="20dp" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginRight="8dip" - android:text="@string/servo3"/> - <SeekBar - android:id="@+id/servo3" android:layout_alignParentRight="true" - android:layout_height="wrap_content" android:max="255" - android:layout_marginRight="16dip" android:layout_width="250dip" - android:layout_alignBottom="@id/servo3Text" android:progress="127"/> - - <!-- Joystick --> - <TextView - android:id="@+id/textView9" android:layout_below="@id/servo3Text" - android:padding="30dp" android:text="@string/joystick" - android:layout_width="wrap_content" android:layout_height="wrap_content"/> - <TextView - android:layout_width="wrap_content" android:id="@+id/textView10" - android:layout_height="wrap_content" android:text="@string/x" - android:layout_marginRight="8dip" android:paddingTop="20dp" - android:layout_below="@id/textView9" android:layout_alignParentLeft="true"/> - <TextView - android:layout_width="wrap_content" android:id="@+id/joyX" - android:layout_height="wrap_content" android:layout_toRightOf="@id/textView10" - android:layout_alignBottom="@id/textView10"/> - <TextView - android:layout_width="wrap_content" android:id="@+id/textView12" - android:layout_height="wrap_content" android:text="@string/y" - android:layout_marginRight="8dip" android:paddingTop="20dp" - android:layout_below="@id/textView10" android:layout_alignParentLeft="true"/> - <TextView - android:layout_width="wrap_content" android:id="@+id/joyY" - android:layout_height="wrap_content" android:layout_toRightOf="@id/textView12" - android:layout_alignBottom="@id/textView12"/> - <TextView - android:layout_width="wrap_content" android:id="@+id/textViewJoyButton" - android:layout_height="wrap_content" android:text="@string/button" - android:layout_marginRight="8dip" android:paddingTop="20dp" - android:layout_below="@id/textView12" android:layout_alignParentLeft="true"/> - <ImageView - android:src="@drawable/droid_off" android:id="@+id/joyButtonImage" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/textViewJoyButton" - android:layout_alignBottom="@id/textViewJoyButton"/> - - <!-- Touch panel --> - <TextView - android:id="@+id/textView11" android:layout_below="@id/textViewJoyButton" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" android:text="@string/cap" - android:paddingTop="30dp"/> - <ImageView - android:id="@+id/cap" android:layout_marginLeft="8dp" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:layout_gravity="left" android:src="@drawable/droid_off" - android:layout_toRightOf="@id/textView11" - android:layout_alignBottom="@id/textView11"/> - </RelativeLayout> - </ScrollView> </LinearLayout> diff --git a/demokit/app/res/values/strings.xml b/demokit/app/res/values/strings.xml index 8a5d45d..54be6eb 100644 --- a/demokit/app/res/values/strings.xml +++ b/demokit/app/res/values/strings.xml @@ -2,7 +2,6 @@ <resources> <string name="hello">Hello World, DemoKitActivity!</string> <string name="app_name">DemoKit</string> - <string name="button">button</string> <string name="button1">1</string> <string name="button2">2</string> <string name="button3">3</string> @@ -32,7 +31,4 @@ <string name="y">Y</string> <string name="joystick">Joystick</string> <string name="cap">Cap Button</string> - <string name="servo1">1</string> - <string name="servo2">2</string> - <string name="servo3">3</string> </resources> diff --git a/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java b/demokit/app/src/com/google/DemoKit/DemoKitActivity.java index d066f8b..338276f 100644 --- a/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java +++ b/demokit/app/src/com/google/DemoKit/DemoKitActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.DemoKit; +package com.google.DemoKit; import android.app.Activity; import android.app.PendingIntent; @@ -48,7 +48,7 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee private static final String TAG = "DemoKit"; private static final String ACTION_USB_PERMISSION = - "com.google.android.DemoKit.action.USB_PERMISSION"; + "com.google.DemoKit.action.USB_PERMISSION"; private UsbManager mUsbManager; private PendingIntent mPermissionIntent; @@ -85,8 +85,6 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee TextView mJoyX; TextView mJoyY; - ImageView mJoyButtonImage; - ImageView mCap; @@ -192,11 +190,6 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee filter.addAction(UsbManager.ACTION_USB_ACCESSORY_DETACHED); registerReceiver(mUsbReceiver, filter); - if (getLastNonConfigurationInstance() != null) { - mAccessory = (UsbAccessory) getLastNonConfigurationInstance(); - openAccessory(mAccessory); - } - setContentView(R.layout.main); mButton1Image = (ImageView)findViewById(R.id.button1Image); @@ -241,7 +234,6 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mJoyX = (TextView)findViewById(R.id.joyX); mJoyY = (TextView)findViewById(R.id.joyY); - mJoyButtonImage = (ImageView)findViewById(R.id.joyButtonImage); mCap = (ImageView)findViewById(R.id.cap); @@ -252,24 +244,11 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee } @Override - public Object onRetainNonConfigurationInstance() { - if (mAccessory != null) { - return mAccessory; - } else { - return super.onRetainNonConfigurationInstance(); - } - } - - @Override public void onResume() { super.onResume(); Intent intent = getIntent(); Log.d(TAG, "intent: " + intent); - if (mInputStream != null && mOutputStream != null) { - return; - } - UsbAccessory[] accessories = mUsbManager.getAccessoryList(); UsbAccessory accessory = (accessories == null ? null : accessories[0]); if (accessory != null) { @@ -323,7 +302,6 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mButton1Image.setImageDrawable(mSwitchOff); mButton2Image.setImageDrawable(mSwitchOff); mButton3Image.setImageDrawable(mSwitchOff); - mJoyButtonImage.setImageDrawable(mSwitchOff); mCap.setImageDrawable(mSwitchOff); mLed1Red.setProgress(0); mLed1Green.setProgress(0); @@ -458,8 +436,6 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee mButton3Image.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); else if (o.getSw() == 3) mCap.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); - else if (o.getSw() == 4) - mJoyButtonImage.setImageDrawable(o.getState() != 0 ? mSwitchOn : mSwitchOff); break; case MESSAGE_TEMPERATURE: @@ -516,7 +492,7 @@ public class DemoKitActivity extends Activity implements Runnable, SeekBar.OnSee else if (seekBar == mServo3) buffer[1] = 0x12; - if (mOutputStream != null && buffer[1] != -1) { + if (buffer[1] != -1) { try { mOutputStream.write(buffer); } catch (IOException e) { diff --git a/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java b/demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java index f6a6ae5..d451e38 100644 --- a/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java +++ b/demokit/app/src/com/google/DemoKit/UsbAccessoryActivity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.android.DemoKit; +package com.google.DemoKit; import android.app.Activity; diff --git a/demokit/demokit.pde b/demokit/demokit.pde index 6f70e4c..5a4d29a 100644 --- a/demokit/demokit.pde +++ b/demokit/demokit.pde @@ -5,8 +5,6 @@ #include <Usb.h> #include <AndroidAccessory.h> -#include <CapSense.h> - #define LED3_RED 2 #define LED3_GREEN 4 #define LED3_BLUE 3 @@ -23,8 +21,7 @@ #define SERVO2 12 #define SERVO3 13 -#define TOUCH_RECV 14 -#define TOUCH_SEND 15 +#define TOUCH 14 #define RELAY1 A0 #define RELAY2 A1 @@ -48,8 +45,6 @@ AndroidAccessory acc("Google, Inc.", "0000000012345678"); Servo servos[3]; -CapSense touch_robot = CapSense(TOUCH_SEND, TOUCH_RECV); // 10M ohm resistor on demo shield - void setup(); void loop(); @@ -58,12 +53,10 @@ void init_buttons() pinMode( BUTTON1, INPUT ); pinMode( BUTTON2, INPUT ); pinMode( BUTTON3, INPUT ); - pinMode( JOY_SWITCH, INPUT ); digitalWrite( BUTTON1, HIGH ); // enable the internal pullups digitalWrite( BUTTON2, HIGH ); digitalWrite( BUTTON3, HIGH ); - digitalWrite( JOY_SWITCH, HIGH ); } @@ -103,7 +96,7 @@ void init_leds() void init_joystick( int threshold ); -byte b1, b2, b3, b4, c; +byte b1, b2, b3, c; void setup() { Serial.begin( 115200 ); @@ -114,7 +107,6 @@ void setup() init_buttons(); init_joystick( 5 ); // initialize with thresholding enabled, dead zone of 5 units - touch_robot.set_CS_AutocaL_Millis(0xFFFFFFFF); // autocalibrate OFF servos[0].attach(SERVO1); servos[0].write(90); @@ -127,8 +119,7 @@ void setup() b1 = digitalRead(BUTTON1); b2 = digitalRead(BUTTON2); b3 = digitalRead(BUTTON3); - b4 = digitalRead(JOY_SWITCH); - c = 0; + c = captouched(); acc.powerOn(); } @@ -139,7 +130,6 @@ void loop() byte idle; static byte count = 0; byte msg[3]; - long touchcount; if (acc.isConnected()) { int len = acc.read(msg, sizeof(msg), 1); @@ -217,14 +207,6 @@ void loop() b3 = b; } - b = digitalRead(JOY_SWITCH); - if (b != b4) { - msg[1] = 4; - msg[2] = b ? 0 : 1; - acc.write(msg, 3); - b4 = b; - } - switch (count++ % 0x10) { case 0: @@ -251,21 +233,19 @@ void loop() acc.write(msg, 3); break; +#if 0 /* captoutched needs to be asynchonous */ case 0xc: - touchcount = touch_robot.capSense(5); - - c0 = touchcount > 750; - + c0 = captouched(); if (c0 != c) { msg[0] = 0x1; msg[1] = 3; - msg[2] = c0; + msg[2] = c0 ? 0 : 1; acc.write(msg, 3); c = c0; } - break; +#endif } } @@ -396,3 +376,30 @@ void write_joy_reg( char reg_addr, char val ) Wire.send( val ); Wire.endTransmission(); } + +/* Capacitive touch technique from Mario Becker, Fraunhofer IGD, 2007 http://www.igd.fhg.de/igd-a4 */ + +char captouched() +{ + char iii, jjj, retval; + + retval = 0; + + for( jjj = 0; jjj != 10; jjj++ ) { + delay( 10 ); + + pinMode( TOUCH, INPUT ); + digitalWrite( TOUCH, HIGH ); + + for ( iii = 0; iii < 16; iii++ ) + if( digitalRead( TOUCH ) ) + break; + + digitalWrite( TOUCH, LOW ); + pinMode( TOUCH, OUTPUT ); + + retval += iii; + } + + return retval; +} |