diff options
author | Erik Gilling <konkers@android.com> | 2011-05-06 08:16:19 -0700 |
---|---|---|
committer | Erik Gilling <konkers@android.com> | 2011-05-06 08:16:19 -0700 |
commit | 4de77996b19a3851675080072f029b0c7d0865ff (patch) | |
tree | 64b202d2bd97a9ba3e0d61b0ffbcfa58be50be9e | |
parent | 52f44bd420b3e97cd48808b03943fdd70967754e (diff) | |
download | demokit-4de77996b19a3851675080072f029b0c7d0865ff.tar.gz |
directory structure cleanup
Removed outdated accessory chat and labyrinth sketches.
Moved demokit to the top level
Change-Id: I67a15b5c9a1fe7c41afd6a874e875011edc7c19a
Signed-off-by: Erik Gilling <konkers@android.com>
-rw-r--r-- | accessorychat/accessorychat.pde | 216 | ||||
-rw-r--r-- | app/Android.mk (renamed from demokit/app/Android.mk) | 0 | ||||
-rw-r--r-- | app/AndroidManifest.xml (renamed from demokit/app/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | app/res/drawable-hdpi/ic_launcher_demokit.png (renamed from demokit/app/res/drawable-hdpi/ic_launcher_demokit.png) | bin | 10322 -> 10322 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button1_off_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png) | bin | 2705 -> 2705 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button1_on_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png) | bin | 2437 -> 2437 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button2_off_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button2_on_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png) | bin | 2520 -> 2520 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button3_off_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png) | bin | 2772 -> 2772 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button3_on_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png) | bin | 2548 -> 2548 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png) | bin | 3054 -> 3054 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png (renamed from demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png) | bin | 2544 -> 2544 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/joystick_background.png (renamed from demokit/app/res/drawable-hdpi/joystick_background.png) | bin | 137354 -> 137354 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/joystick_normal_holo_dark.png (renamed from demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png) | bin | 442 -> 442 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/joystick_pressed_holo_dark.png (renamed from demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_control_holo_dark.png (renamed from demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png) | bin | 1194 -> 1194 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png) | bin | 238 -> 238 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png) | bin | 487 -> 487 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png) | bin | 242 -> 242 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png) | bin | 274 -> 274 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png) | bin | 285 -> 285 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png) | bin | 280 -> 280 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/tab_focused_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png) | bin | 142 -> 142 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/tab_normal_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png) | bin | 149 -> 149 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/tab_touched_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png) | bin | 967 -> 967 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png) | bin | 561 -> 561 bytes | |||
-rw-r--r-- | app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png (renamed from demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png) | bin | 1839 -> 1839 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/ic_launcher_demokit.png (renamed from demokit/app/res/drawable-mdpi/ic_launcher_demokit.png) | bin | 5995 -> 5995 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button1_off_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png) | bin | 1512 -> 1512 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button1_on_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png) | bin | 2713 -> 2713 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button2_off_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png) | bin | 1533 -> 1533 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button2_on_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png) | bin | 2822 -> 2822 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button3_off_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png) | bin | 1559 -> 1559 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button3_on_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png) | bin | 2864 -> 2864 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png) | bin | 1220 -> 1220 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png) | bin | 2448 -> 2448 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/joystick_background.png (renamed from demokit/app/res/drawable-mdpi/joystick_background.png) | bin | 89262 -> 89262 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/joystick_normal_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/joystick_pressed_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png) | bin | 452 -> 452 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_control_holo_dark.png (renamed from demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png) | bin | 866 -> 866 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png) | bin | 245 -> 245 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png) | bin | 253 -> 253 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png) | bin | 390 -> 390 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png) | bin | 250 -> 250 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png) | bin | 225 -> 225 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png) | bin | 239 -> 239 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png) | bin | 240 -> 240 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/tab_focused_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png) | bin | 141 -> 141 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/tab_normal_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png) | bin | 145 -> 145 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png (renamed from demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png) | bin | 1168 -> 1168 bytes | |||
-rw-r--r-- | app/res/drawable-nodpi/background_holo_dark.jpg (renamed from demokit/app/res/drawable-nodpi/background_holo_dark.jpg) | bin | 354509 -> 354509 bytes | |||
-rw-r--r-- | app/res/drawable-nodpi/demokit_splash.png (renamed from demokit/app/res/drawable-nodpi/demokit_splash.png) | bin | 185310 -> 185310 bytes | |||
-rw-r--r-- | app/res/drawable-xlarge-nodpi/background_holo_dark.png (renamed from demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png) | bin | 1754394 -> 1754394 bytes | |||
-rw-r--r-- | app/res/layout-xlarge-land/main.xml (renamed from demokit/app/res/layout-xlarge-land/main.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/buttoncontainer.xml (renamed from demokit/app/res/layout/buttoncontainer.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/color_sliders.xml (renamed from demokit/app/res/layout/color_sliders.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/inputcontainer.xml (renamed from demokit/app/res/layout/inputcontainer.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/joycontainer.xml (renamed from demokit/app/res/layout/joycontainer.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/led_slider.xml (renamed from demokit/app/res/layout/led_slider.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/leds_tablet.xml (renamed from demokit/app/res/layout/leds_tablet.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/main.xml (renamed from demokit/app/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/no_device.xml (renamed from demokit/app/res/layout/no_device.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/output_tablet.xml (renamed from demokit/app/res/layout/output_tablet.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/outputcontainer.xml (renamed from demokit/app/res/layout/outputcontainer.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/relay_tablet.xml (renamed from demokit/app/res/layout/relay_tablet.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/relaybutton.xml (renamed from demokit/app/res/layout/relaybutton.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/servo.xml (renamed from demokit/app/res/layout/servo.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/servo_tablet.xml (renamed from demokit/app/res/layout/servo_tablet.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/servorelay.xml (renamed from demokit/app/res/layout/servorelay.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/templightcontainer.xml (renamed from demokit/app/res/layout/templightcontainer.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/vertical_color_sliders.xml (renamed from demokit/app/res/layout/vertical_color_sliders.xml) | 0 | ||||
-rw-r--r-- | app/res/layout/vertical_led_slider.xml (renamed from demokit/app/res/layout/vertical_led_slider.xml) | 0 | ||||
-rw-r--r-- | app/res/values/attrs.xml (renamed from demokit/app/res/values/attrs.xml) | 0 | ||||
-rw-r--r-- | app/res/values/colors.xml (renamed from demokit/app/res/values/colors.xml) | 0 | ||||
-rw-r--r-- | app/res/values/strings.xml (renamed from demokit/app/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | app/res/values/styles.xml (renamed from demokit/app/res/values/styles.xml) | 0 | ||||
-rw-r--r-- | app/res/xml/accessory_filter.xml (renamed from demokit/app/res/xml/accessory_filter.xml) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/AccessoryController.java (renamed from demokit/app/src/com/google/android/DemoKit/AccessoryController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/BaseActivity.java (renamed from demokit/app/src/com/google/android/DemoKit/BaseActivity.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/ColorLEDController.java (renamed from demokit/app/src/com/google/android/DemoKit/ColorLEDController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/ColorWheel.java (renamed from demokit/app/src/com/google/android/DemoKit/ColorWheel.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/ColorWheelLEDController.java (renamed from demokit/app/src/com/google/android/DemoKit/ColorWheelLEDController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/DemoKitActivity.java (renamed from demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/DemoKitLaunch.java (renamed from demokit/app/src/com/google/android/DemoKit/DemoKitLaunch.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/DemoKitPhone.java (renamed from demokit/app/src/com/google/android/DemoKit/DemoKitPhone.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/DemoKitTablet.java (renamed from demokit/app/src/com/google/android/DemoKit/DemoKitTablet.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/InputController.java (renamed from demokit/app/src/com/google/android/DemoKit/InputController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/JoystickView.java (renamed from demokit/app/src/com/google/android/DemoKit/JoystickView.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/OutputController.java (renamed from demokit/app/src/com/google/android/DemoKit/OutputController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/RelayController.java (renamed from demokit/app/src/com/google/android/DemoKit/RelayController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/ServoController.java (renamed from demokit/app/src/com/google/android/DemoKit/ServoController.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/Slider.java (renamed from demokit/app/src/com/google/android/DemoKit/Slider.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/UsbAccessoryActivity.java (renamed from demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/Utilities.java (renamed from demokit/app/src/com/google/android/DemoKit/Utilities.java) | 0 | ||||
-rw-r--r-- | app/src/com/google/android/DemoKit/VerticalSlider.java (renamed from demokit/app/src/com/google/android/DemoKit/VerticalSlider.java) | 0 | ||||
-rw-r--r-- | firmware/demokit/demokit.pde (renamed from demokit/demokit.pde) | 0 | ||||
-rw-r--r-- | labyrinth/labyrinth.pde | 519 |
99 files changed, 0 insertions, 735 deletions
diff --git a/accessorychat/accessorychat.pde b/accessorychat/accessorychat.pde deleted file mode 100644 index 20a3dee..0000000 --- a/accessorychat/accessorychat.pde +++ /dev/null @@ -1,216 +0,0 @@ -#include <Max3421e.h> -#include <usb.h> - -#define USB_ACCESSORY_VENDOR_ID 0x18D1 -#define USB_ACCESSORY_PRODUCT_ID 0x2D00 - -#define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 -#define ACCESSORY_STRING_MANUFACTURER 0 -#define ACCESSORY_STRING_MODEL 1 -#define ACCESSORY_STRING_TYPE 2 -#define ACCESSORY_STRING_VERSION 3 - -#define ACCESSORY_SEND_STRING 52 -#define ACCESSORY_START 53 - -MAX3421E Max; -USB Usb; - -void setup(); -void loop(); - -uint8_t usbBuff[256]; - -void setup() -{ - Serial.begin( 115200 ); - Serial.print("\r\nStart"); - Max.powerOn(); - delay( 200 ); -} - -bool isAndroidVendor(USB_DEVICE_DESCRIPTOR *desc) -{ - return desc->idVendor == 0x18d1 || desc->idVendor == 0x22B8; -} - -bool isAccessoryDevice(USB_DEVICE_DESCRIPTOR *desc) -{ - return desc->idProduct == 0x2D00 || desc->idProduct == 0x2D01; -} - -void sendString(byte addr, int index, char *str) -{ - Usb.ctrlReq(addr, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_VENDOR | USB_SETUP_RECIPIENT_DEVICE, - ACCESSORY_SEND_STRING, 0, 0, index, strlen(str) + 1, str); - -} - -void switchDevice(byte addr) -{ - sendString(addr, ACCESSORY_STRING_MANUFACTURER, "Google, Inc."); - sendString(addr, ACCESSORY_STRING_MODEL, "AccessoryChat"); - sendString(addr, ACCESSORY_STRING_TYPE, "Sample Program"); - sendString(addr, ACCESSORY_STRING_VERSION, "1.0"); - - Usb.ctrlReq(addr, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_VENDOR | USB_SETUP_RECIPIENT_DEVICE, - ACCESSORY_START, 0, 0, 0, 0, NULL); -} - -bool findEndpoints(byte addr, EP_RECORD *inEp, EP_RECORD *outEp) -{ - int len; - byte err; - uint8_t *p; - - err = Usb.getConfDescr(addr, 0, 4, 0, (char *)usbBuff); - if (err) { - Serial.print("Can't get config descriptor length\n"); - return false; - } - - len = usbBuff[2] | ((int)usbBuff[3] << 8); - Serial.print("Config Desc Length: "); - Serial.println(len, DEC); - if (len > sizeof(usbBuff)) { - Serial.print("config descriptor too large\n"); - /* might want to truncate here */ - return false; - } - - err = Usb.getConfDescr(addr, 0, len, 0, (char *)usbBuff); - if (err) { - Serial.print("Can't get config descriptor\n"); - return false; - } - - p = usbBuff; - while (p < (usbBuff + len)){ - uint8_t descLen = p[0]; - uint8_t descType = p[1]; - USB_ENDPOINT_DESCRIPTOR *epDesc; - EP_RECORD *ep; - - switch (descType) { - case USB_DESCRIPTOR_CONFIGURATION: - Serial.print("config desc\n"); - break; - - case USB_DESCRIPTOR_INTERFACE: - Serial.print("interface desc\n"); - break; - - case USB_DESCRIPTOR_ENDPOINT: - epDesc = (USB_ENDPOINT_DESCRIPTOR *)p; - if (!inEp->epAddr && (epDesc->bEndpointAddress & 0x80)) - ep = inEp; - else if (!outEp->epAddr) - ep = outEp; - else - ep = NULL; - - if (ep) { - ep->epAddr = epDesc->bEndpointAddress; - ep->Attr = epDesc->bmAttributes; - ep->MaxPktSize = epDesc->wMaxPacketSize; - ep->sndToggle = bmSNDTOG0; - ep->rcvToggle = bmRCVTOG0; - } - break; - - default: - Serial.print("unkown desc type "); - Serial.println( descType, HEX); - break; - } - - p += descLen; - } - - return inEp->epAddr && outEp->epAddr; -} - -EP_RECORD ep_record[ 3 ]; //endpoint record structure for the mouse - - -void doAndroid(void) -{ - byte err; - byte idle; - - if (findEndpoints(1, &ep_record[1], &ep_record[2])) { - Serial.print("inEp: "); - Serial.println(ep_record[1].epAddr, HEX); - Serial.print("outEp: "); - Serial.println(ep_record[2].epAddr, HEX); - - ep_record[0] = *(Usb.getDevTableEntry(0,0)); - Usb.setDevTableEntry(1, ep_record); - - err = Usb.setConf( 1, 0, 1 ); - if (err) - Serial.print("Can't set config to 1\n"); - - Usb.setUsbTaskState( USB_STATE_RUNNING ); - - while(1) { - int len = Usb.newInTransfer(1, 1, sizeof(usbBuff), - (char *)usbBuff); - int i; - - if (len > 0) { - for (i = 0; i < len; i++) - Serial.print((char)usbBuff[i]); - Serial.print('\n'); - } - - Usb.outTransfer(1, 2, strlen("ping"), "ping"); - } - - } - -} - - -void loop() -{ - USB_DEVICE_DESCRIPTOR *devDesc = (USB_DEVICE_DESCRIPTOR *) usbBuff; - byte err; - - Max.Task(); - Usb.Task(); - if( Usb.getUsbTaskState() >= USB_STATE_CONFIGURING ) { - Serial.print("\nDevice addressed... "); - Serial.print("Requesting device descriptor."); - - err = Usb.getDevDescr(1, 0, 0x12, (char *) devDesc); - if (err) { - Serial.print("\nDevice descriptor cannot be retrieved. Program Halted\n"); - while(1); - } - - if (isAndroidVendor(devDesc)) { - Serial.print("found android device\n"); - - if (isAccessoryDevice(devDesc)) { - Serial.print("found android acessory device\n"); - doAndroid(); - } else { - Serial.print("found possible device. swithcing to serial mode\n"); - switchDevice(1); - } - } - - while (Usb.getUsbTaskState() != USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE) { - Max.Task(); - Usb.Task(); - - - } - - Serial.print("detached\n"); - - } - -} - diff --git a/demokit/app/Android.mk b/app/Android.mk index 293c212..293c212 100644 --- a/demokit/app/Android.mk +++ b/app/Android.mk diff --git a/demokit/app/AndroidManifest.xml b/app/AndroidManifest.xml index 6eac59c..6eac59c 100644 --- a/demokit/app/AndroidManifest.xml +++ b/app/AndroidManifest.xml diff --git a/demokit/app/res/drawable-hdpi/ic_launcher_demokit.png b/app/res/drawable-hdpi/ic_launcher_demokit.png Binary files differindex 0de0a95..0de0a95 100644 --- a/demokit/app/res/drawable-hdpi/ic_launcher_demokit.png +++ b/app/res/drawable-hdpi/ic_launcher_demokit.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png b/app/res/drawable-hdpi/indicator_button1_off_noglow.png Binary files differindex 9cd43ce..9cd43ce 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button1_off_noglow.png +++ b/app/res/drawable-hdpi/indicator_button1_off_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png b/app/res/drawable-hdpi/indicator_button1_on_noglow.png Binary files differindex d24866f..d24866f 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button1_on_noglow.png +++ b/app/res/drawable-hdpi/indicator_button1_on_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png b/app/res/drawable-hdpi/indicator_button2_off_noglow.png Binary files differindex 92f962f..92f962f 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button2_off_noglow.png +++ b/app/res/drawable-hdpi/indicator_button2_off_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png b/app/res/drawable-hdpi/indicator_button2_on_noglow.png Binary files differindex 2e24282..2e24282 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button2_on_noglow.png +++ b/app/res/drawable-hdpi/indicator_button2_on_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png b/app/res/drawable-hdpi/indicator_button3_off_noglow.png Binary files differindex 4f9e951..4f9e951 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button3_off_noglow.png +++ b/app/res/drawable-hdpi/indicator_button3_off_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png b/app/res/drawable-hdpi/indicator_button3_on_noglow.png Binary files differindex 8cfefe6..8cfefe6 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button3_on_noglow.png +++ b/app/res/drawable-hdpi/indicator_button3_on_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png b/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png Binary files differindex ae46086..ae46086 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png +++ b/app/res/drawable-hdpi/indicator_button_capacitive_off_noglow.png diff --git a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png b/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png Binary files differindex 7afc536..7afc536 100644 --- a/demokit/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png +++ b/app/res/drawable-hdpi/indicator_button_capacitive_on_noglow.png diff --git a/demokit/app/res/drawable-hdpi/joystick_background.png b/app/res/drawable-hdpi/joystick_background.png Binary files differindex 7349fb7..7349fb7 100644 --- a/demokit/app/res/drawable-hdpi/joystick_background.png +++ b/app/res/drawable-hdpi/joystick_background.png diff --git a/demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png b/app/res/drawable-hdpi/joystick_normal_holo_dark.png Binary files differindex 33796ac..33796ac 100644 --- a/demokit/app/res/drawable-hdpi/joystick_normal_holo_dark.png +++ b/app/res/drawable-hdpi/joystick_normal_holo_dark.png diff --git a/demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png b/app/res/drawable-hdpi/joystick_pressed_holo_dark.png Binary files differindex 4eba4b4..4eba4b4 100644 --- a/demokit/app/res/drawable-hdpi/joystick_pressed_holo_dark.png +++ b/app/res/drawable-hdpi/joystick_pressed_holo_dark.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png b/app/res/drawable-hdpi/scrubber_control_holo_dark.png Binary files differindex 5947ee1..5947ee1 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_control_holo_dark.png +++ b/app/res/drawable-hdpi/scrubber_control_holo_dark.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png Binary files differindex 1dcd3b0..1dcd3b0 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_horizontal_blue_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png Binary files differindex 6221a0f..6221a0f 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_horizontal_green_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png Binary files differindex 6a162ed..6a162ed 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_horizontal_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png Binary files differindex b785ebd..b785ebd 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_horizontal_red_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png Binary files differindex 5a22af5..5a22af5 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_vertical_blue_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png Binary files differindex 1ebd9f6..1ebd9f6 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_vertical_green_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png b/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png Binary files differindex 74800a4..74800a4 100644 --- a/demokit/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png +++ b/app/res/drawable-hdpi/scrubber_vertical_red_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png b/app/res/drawable-hdpi/tab_focused_holo_dark.9.png Binary files differindex 39d0fc1..39d0fc1 100644 --- a/demokit/app/res/drawable-hdpi/tab_focused_holo_dark.9.png +++ b/app/res/drawable-hdpi/tab_focused_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png b/app/res/drawable-hdpi/tab_normal_holo_dark.9.png Binary files differindex bf001cf..bf001cf 100644 --- a/demokit/app/res/drawable-hdpi/tab_normal_holo_dark.9.png +++ b/app/res/drawable-hdpi/tab_normal_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png b/app/res/drawable-hdpi/tab_touched_holo_dark.9.png Binary files differindex 4c31e32..4c31e32 100644 --- a/demokit/app/res/drawable-hdpi/tab_touched_holo_dark.9.png +++ b/app/res/drawable-hdpi/tab_touched_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png b/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png Binary files differindex 52f172c..52f172c 100644 --- a/demokit/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png +++ b/app/res/drawable-hdpi/toggle_button_off_holo_dark.9.png diff --git a/demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png b/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png Binary files differindex 404f888..404f888 100644 --- a/demokit/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png +++ b/app/res/drawable-hdpi/toggle_button_on_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/ic_launcher_demokit.png b/app/res/drawable-mdpi/ic_launcher_demokit.png Binary files differindex 2111755..2111755 100644 --- a/demokit/app/res/drawable-mdpi/ic_launcher_demokit.png +++ b/app/res/drawable-mdpi/ic_launcher_demokit.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png b/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png Binary files differindex 00461f4..00461f4 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button1_off_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png b/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png Binary files differindex 387fe91..387fe91 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button1_on_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png b/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png Binary files differindex 186627b..186627b 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button2_off_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png b/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png Binary files differindex 8ad4d8c..8ad4d8c 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button2_on_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png b/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png Binary files differindex e078642..e078642 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button3_off_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png b/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png Binary files differindex 3314451..3314451 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button3_on_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png b/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png Binary files differindex 6cde802..6cde802 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button_capacitive_off_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png b/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png Binary files differindex e3fea37..e3fea37 100644 --- a/demokit/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png +++ b/app/res/drawable-mdpi/indicator_button_capacitive_on_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/joystick_background.png b/app/res/drawable-mdpi/joystick_background.png Binary files differindex 6afdd44..6afdd44 100644 --- a/demokit/app/res/drawable-mdpi/joystick_background.png +++ b/app/res/drawable-mdpi/joystick_background.png diff --git a/demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png b/app/res/drawable-mdpi/joystick_normal_holo_dark.png Binary files differindex ab72d36..ab72d36 100644 --- a/demokit/app/res/drawable-mdpi/joystick_normal_holo_dark.png +++ b/app/res/drawable-mdpi/joystick_normal_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png b/app/res/drawable-mdpi/joystick_pressed_holo_dark.png Binary files differindex c0afa77..c0afa77 100644 --- a/demokit/app/res/drawable-mdpi/joystick_pressed_holo_dark.png +++ b/app/res/drawable-mdpi/joystick_pressed_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png b/app/res/drawable-mdpi/scrubber_control_holo_dark.png Binary files differindex 90ece2a..90ece2a 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_control_holo_dark.png +++ b/app/res/drawable-mdpi/scrubber_control_holo_dark.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png Binary files differindex 3a7665b..3a7665b 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_horizontal_blue_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png Binary files differindex dac988a..dac988a 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_horizontal_green_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png Binary files differindex ce62fbe..ce62fbe 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_horizontal_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png Binary files differindex bd349fd..bd349fd 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_horizontal_red_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png Binary files differindex fd9ca52..fd9ca52 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_vertical_blue_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png Binary files differindex f5cc83e..f5cc83e 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_vertical_green_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png b/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png Binary files differindex 26eaa3d..26eaa3d 100644 --- a/demokit/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png +++ b/app/res/drawable-mdpi/scrubber_vertical_red_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png b/app/res/drawable-mdpi/tab_focused_holo_dark.9.png Binary files differindex 155d0e4..155d0e4 100644 --- a/demokit/app/res/drawable-mdpi/tab_focused_holo_dark.9.png +++ b/app/res/drawable-mdpi/tab_focused_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png b/app/res/drawable-mdpi/tab_normal_holo_dark.9.png Binary files differindex 380ffbb..380ffbb 100644 --- a/demokit/app/res/drawable-mdpi/tab_normal_holo_dark.9.png +++ b/app/res/drawable-mdpi/tab_normal_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png b/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png Binary files differindex 8cde52c..8cde52c 100644 --- a/demokit/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png +++ b/app/res/drawable-mdpi/toggle_button_off_holo_dark.9.png diff --git a/demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png b/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png Binary files differindex 8ed6cf7..8ed6cf7 100644 --- a/demokit/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png +++ b/app/res/drawable-mdpi/toggle_button_on_holo_dark.9.png diff --git a/demokit/app/res/drawable-nodpi/background_holo_dark.jpg b/app/res/drawable-nodpi/background_holo_dark.jpg Binary files differindex 97eed62..97eed62 100644 --- a/demokit/app/res/drawable-nodpi/background_holo_dark.jpg +++ b/app/res/drawable-nodpi/background_holo_dark.jpg diff --git a/demokit/app/res/drawable-nodpi/demokit_splash.png b/app/res/drawable-nodpi/demokit_splash.png Binary files differindex 1dbd8e3..1dbd8e3 100644 --- a/demokit/app/res/drawable-nodpi/demokit_splash.png +++ b/app/res/drawable-nodpi/demokit_splash.png diff --git a/demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png b/app/res/drawable-xlarge-nodpi/background_holo_dark.png Binary files differindex 5d41f1f..5d41f1f 100644 --- a/demokit/app/res/drawable-xlarge-nodpi/background_holo_dark.png +++ b/app/res/drawable-xlarge-nodpi/background_holo_dark.png diff --git a/demokit/app/res/layout-xlarge-land/main.xml b/app/res/layout-xlarge-land/main.xml index 4ba5569..4ba5569 100644 --- a/demokit/app/res/layout-xlarge-land/main.xml +++ b/app/res/layout-xlarge-land/main.xml diff --git a/demokit/app/res/layout/buttoncontainer.xml b/app/res/layout/buttoncontainer.xml index 117ee2b..117ee2b 100644 --- a/demokit/app/res/layout/buttoncontainer.xml +++ b/app/res/layout/buttoncontainer.xml diff --git a/demokit/app/res/layout/color_sliders.xml b/app/res/layout/color_sliders.xml index 0eb670c..0eb670c 100644 --- a/demokit/app/res/layout/color_sliders.xml +++ b/app/res/layout/color_sliders.xml diff --git a/demokit/app/res/layout/inputcontainer.xml b/app/res/layout/inputcontainer.xml index 2c2f18f..2c2f18f 100644 --- a/demokit/app/res/layout/inputcontainer.xml +++ b/app/res/layout/inputcontainer.xml diff --git a/demokit/app/res/layout/joycontainer.xml b/app/res/layout/joycontainer.xml index ff35579..ff35579 100644 --- a/demokit/app/res/layout/joycontainer.xml +++ b/app/res/layout/joycontainer.xml diff --git a/demokit/app/res/layout/led_slider.xml b/app/res/layout/led_slider.xml index 77eed2b..77eed2b 100644 --- a/demokit/app/res/layout/led_slider.xml +++ b/app/res/layout/led_slider.xml diff --git a/demokit/app/res/layout/leds_tablet.xml b/app/res/layout/leds_tablet.xml index f9f6cfb..f9f6cfb 100644 --- a/demokit/app/res/layout/leds_tablet.xml +++ b/app/res/layout/leds_tablet.xml diff --git a/demokit/app/res/layout/main.xml b/app/res/layout/main.xml index 1c52750..1c52750 100644 --- a/demokit/app/res/layout/main.xml +++ b/app/res/layout/main.xml diff --git a/demokit/app/res/layout/no_device.xml b/app/res/layout/no_device.xml index b8492d4..b8492d4 100644 --- a/demokit/app/res/layout/no_device.xml +++ b/app/res/layout/no_device.xml diff --git a/demokit/app/res/layout/output_tablet.xml b/app/res/layout/output_tablet.xml index bca2a7b..bca2a7b 100644 --- a/demokit/app/res/layout/output_tablet.xml +++ b/app/res/layout/output_tablet.xml diff --git a/demokit/app/res/layout/outputcontainer.xml b/app/res/layout/outputcontainer.xml index 95b8b77..95b8b77 100644 --- a/demokit/app/res/layout/outputcontainer.xml +++ b/app/res/layout/outputcontainer.xml diff --git a/demokit/app/res/layout/relay_tablet.xml b/app/res/layout/relay_tablet.xml index 18f229b..18f229b 100644 --- a/demokit/app/res/layout/relay_tablet.xml +++ b/app/res/layout/relay_tablet.xml diff --git a/demokit/app/res/layout/relaybutton.xml b/app/res/layout/relaybutton.xml index f6b8584..f6b8584 100644 --- a/demokit/app/res/layout/relaybutton.xml +++ b/app/res/layout/relaybutton.xml diff --git a/demokit/app/res/layout/servo.xml b/app/res/layout/servo.xml index 6444773..6444773 100644 --- a/demokit/app/res/layout/servo.xml +++ b/app/res/layout/servo.xml diff --git a/demokit/app/res/layout/servo_tablet.xml b/app/res/layout/servo_tablet.xml index 23c6ee8..23c6ee8 100644 --- a/demokit/app/res/layout/servo_tablet.xml +++ b/app/res/layout/servo_tablet.xml diff --git a/demokit/app/res/layout/servorelay.xml b/app/res/layout/servorelay.xml index 6225731..6225731 100644 --- a/demokit/app/res/layout/servorelay.xml +++ b/app/res/layout/servorelay.xml diff --git a/demokit/app/res/layout/templightcontainer.xml b/app/res/layout/templightcontainer.xml index d3a2ba1..d3a2ba1 100644 --- a/demokit/app/res/layout/templightcontainer.xml +++ b/app/res/layout/templightcontainer.xml diff --git a/demokit/app/res/layout/vertical_color_sliders.xml b/app/res/layout/vertical_color_sliders.xml index db65e1e..db65e1e 100644 --- a/demokit/app/res/layout/vertical_color_sliders.xml +++ b/app/res/layout/vertical_color_sliders.xml diff --git a/demokit/app/res/layout/vertical_led_slider.xml b/app/res/layout/vertical_led_slider.xml index a649648..a649648 100644 --- a/demokit/app/res/layout/vertical_led_slider.xml +++ b/app/res/layout/vertical_led_slider.xml diff --git a/demokit/app/res/values/attrs.xml b/app/res/values/attrs.xml index eeb5e0a..eeb5e0a 100644 --- a/demokit/app/res/values/attrs.xml +++ b/app/res/values/attrs.xml diff --git a/demokit/app/res/values/colors.xml b/app/res/values/colors.xml index c6d917f..c6d917f 100644 --- a/demokit/app/res/values/colors.xml +++ b/app/res/values/colors.xml diff --git a/demokit/app/res/values/strings.xml b/app/res/values/strings.xml index 740b91e..740b91e 100644 --- a/demokit/app/res/values/strings.xml +++ b/app/res/values/strings.xml diff --git a/demokit/app/res/values/styles.xml b/app/res/values/styles.xml index d2f68c7..d2f68c7 100644 --- a/demokit/app/res/values/styles.xml +++ b/app/res/values/styles.xml diff --git a/demokit/app/res/xml/accessory_filter.xml b/app/res/xml/accessory_filter.xml index 5631b03..5631b03 100644 --- a/demokit/app/res/xml/accessory_filter.xml +++ b/app/res/xml/accessory_filter.xml diff --git a/demokit/app/src/com/google/android/DemoKit/AccessoryController.java b/app/src/com/google/android/DemoKit/AccessoryController.java index 5f94faa..5f94faa 100644 --- a/demokit/app/src/com/google/android/DemoKit/AccessoryController.java +++ b/app/src/com/google/android/DemoKit/AccessoryController.java diff --git a/demokit/app/src/com/google/android/DemoKit/BaseActivity.java b/app/src/com/google/android/DemoKit/BaseActivity.java index 249ad52..249ad52 100644 --- a/demokit/app/src/com/google/android/DemoKit/BaseActivity.java +++ b/app/src/com/google/android/DemoKit/BaseActivity.java diff --git a/demokit/app/src/com/google/android/DemoKit/ColorLEDController.java b/app/src/com/google/android/DemoKit/ColorLEDController.java index 3bc6e24..3bc6e24 100644 --- a/demokit/app/src/com/google/android/DemoKit/ColorLEDController.java +++ b/app/src/com/google/android/DemoKit/ColorLEDController.java diff --git a/demokit/app/src/com/google/android/DemoKit/ColorWheel.java b/app/src/com/google/android/DemoKit/ColorWheel.java index a1292cc..a1292cc 100644 --- a/demokit/app/src/com/google/android/DemoKit/ColorWheel.java +++ b/app/src/com/google/android/DemoKit/ColorWheel.java diff --git a/demokit/app/src/com/google/android/DemoKit/ColorWheelLEDController.java b/app/src/com/google/android/DemoKit/ColorWheelLEDController.java index 82b59b1..82b59b1 100644 --- a/demokit/app/src/com/google/android/DemoKit/ColorWheelLEDController.java +++ b/app/src/com/google/android/DemoKit/ColorWheelLEDController.java diff --git a/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java b/app/src/com/google/android/DemoKit/DemoKitActivity.java index de16c1a..de16c1a 100644 --- a/demokit/app/src/com/google/android/DemoKit/DemoKitActivity.java +++ b/app/src/com/google/android/DemoKit/DemoKitActivity.java diff --git a/demokit/app/src/com/google/android/DemoKit/DemoKitLaunch.java b/app/src/com/google/android/DemoKit/DemoKitLaunch.java index a2e2e42..a2e2e42 100644 --- a/demokit/app/src/com/google/android/DemoKit/DemoKitLaunch.java +++ b/app/src/com/google/android/DemoKit/DemoKitLaunch.java diff --git a/demokit/app/src/com/google/android/DemoKit/DemoKitPhone.java b/app/src/com/google/android/DemoKit/DemoKitPhone.java index b429bb3..b429bb3 100644 --- a/demokit/app/src/com/google/android/DemoKit/DemoKitPhone.java +++ b/app/src/com/google/android/DemoKit/DemoKitPhone.java diff --git a/demokit/app/src/com/google/android/DemoKit/DemoKitTablet.java b/app/src/com/google/android/DemoKit/DemoKitTablet.java index 8abe51a..8abe51a 100644 --- a/demokit/app/src/com/google/android/DemoKit/DemoKitTablet.java +++ b/app/src/com/google/android/DemoKit/DemoKitTablet.java diff --git a/demokit/app/src/com/google/android/DemoKit/InputController.java b/app/src/com/google/android/DemoKit/InputController.java index 04624ea..04624ea 100644 --- a/demokit/app/src/com/google/android/DemoKit/InputController.java +++ b/app/src/com/google/android/DemoKit/InputController.java diff --git a/demokit/app/src/com/google/android/DemoKit/JoystickView.java b/app/src/com/google/android/DemoKit/JoystickView.java index 020e276..020e276 100644 --- a/demokit/app/src/com/google/android/DemoKit/JoystickView.java +++ b/app/src/com/google/android/DemoKit/JoystickView.java diff --git a/demokit/app/src/com/google/android/DemoKit/OutputController.java b/app/src/com/google/android/DemoKit/OutputController.java index a9842b9..a9842b9 100644 --- a/demokit/app/src/com/google/android/DemoKit/OutputController.java +++ b/app/src/com/google/android/DemoKit/OutputController.java diff --git a/demokit/app/src/com/google/android/DemoKit/RelayController.java b/app/src/com/google/android/DemoKit/RelayController.java index d08516f..d08516f 100644 --- a/demokit/app/src/com/google/android/DemoKit/RelayController.java +++ b/app/src/com/google/android/DemoKit/RelayController.java diff --git a/demokit/app/src/com/google/android/DemoKit/ServoController.java b/app/src/com/google/android/DemoKit/ServoController.java index 4584a9f..4584a9f 100644 --- a/demokit/app/src/com/google/android/DemoKit/ServoController.java +++ b/app/src/com/google/android/DemoKit/ServoController.java diff --git a/demokit/app/src/com/google/android/DemoKit/Slider.java b/app/src/com/google/android/DemoKit/Slider.java index 3517bff..3517bff 100644 --- a/demokit/app/src/com/google/android/DemoKit/Slider.java +++ b/app/src/com/google/android/DemoKit/Slider.java diff --git a/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java b/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java index 9bf4079..9bf4079 100644 --- a/demokit/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java +++ b/app/src/com/google/android/DemoKit/UsbAccessoryActivity.java diff --git a/demokit/app/src/com/google/android/DemoKit/Utilities.java b/app/src/com/google/android/DemoKit/Utilities.java index 0e9679c..0e9679c 100644 --- a/demokit/app/src/com/google/android/DemoKit/Utilities.java +++ b/app/src/com/google/android/DemoKit/Utilities.java diff --git a/demokit/app/src/com/google/android/DemoKit/VerticalSlider.java b/app/src/com/google/android/DemoKit/VerticalSlider.java index 4cbb768..4cbb768 100644 --- a/demokit/app/src/com/google/android/DemoKit/VerticalSlider.java +++ b/app/src/com/google/android/DemoKit/VerticalSlider.java diff --git a/demokit/demokit.pde b/firmware/demokit/demokit.pde index 888aabc..888aabc 100644 --- a/demokit/demokit.pde +++ b/firmware/demokit/demokit.pde diff --git a/labyrinth/labyrinth.pde b/labyrinth/labyrinth.pde deleted file mode 100644 index a5e759a..0000000 --- a/labyrinth/labyrinth.pde +++ /dev/null @@ -1,519 +0,0 @@ -#include <Max3421e.h> -#include <Usb.h> -#include <Wire.h> -#include <Servo.h> - -#define USB_ACCESSORY_VENDOR_ID 0x18D1 -#define USB_ACCESSORY_PRODUCT_ID 0x2D00 - -#define USB_ACCESSORY_ADB_PRODUCT_ID 0x2D01 -#define ACCESSORY_STRING_MANUFACTURER 0 -#define ACCESSORY_STRING_MODEL 1 -#define ACCESSORY_STRING_TYPE 2 -#define ACCESSORY_STRING_VERSION 3 - -#define ACCESSORY_SEND_STRING 52 -#define ACCESSORY_START 53 - - -#define LED3_RED 2 -#define LED3_GREEN 3 -#define LED3_BLUE 4 - -#define LED2_RED 5 -#define LED2_GREEN 6 -#define LED2_BLUE 7 - -#define LED1_RED 8 -#define LED1_GREEN 9 -#define LED1_BLUE 10 - -#define SERVO1 11 -#define SERVO2 12 -#define SERVO3 13 - -#define TOUCH 14 - -#define RELAY1 A0 -#define RELAY2 A1 - -#define LIGHT_SENSOR A2 -#define TEMP_SENSOR A3 - -#define BUTTON1 A6 -#define BUTTON2 A7 -#define BUTTON3 A8 - -#define JOY_SWITCH A9 // pulls line down when pressed -#define JOY_nINT A10 // active low interrupt input -#define JOY_nRESET A11 // active low reset output - - -MAX3421E Max; -USB Usb; -Servo servos[3]; - - -void setup(); -void loop(); - -uint8_t usbBuff[256]; - - -void init_buttons() -{ - pinMode( BUTTON1, INPUT ); - pinMode( BUTTON2, INPUT ); - pinMode( BUTTON3, INPUT ); - - digitalWrite( BUTTON1, HIGH ); // enable the internal pullups - digitalWrite( BUTTON2, HIGH ); - digitalWrite( BUTTON3, HIGH ); -} - - -void init_relays() -{ - pinMode( RELAY1, OUTPUT ); - pinMode( RELAY2, OUTPUT ); -} - - -void init_leds() -{ - digitalWrite( LED1_RED, 1 ); - digitalWrite( LED1_GREEN, 1 ); - digitalWrite( LED1_BLUE, 1 ); - - pinMode( LED1_RED, OUTPUT ); - pinMode( LED1_GREEN, OUTPUT ); - pinMode( LED1_BLUE, OUTPUT ); - - digitalWrite( LED2_RED, 1 ); - digitalWrite( LED2_GREEN, 1 ); - digitalWrite( LED2_BLUE, 1 ); - - pinMode( LED2_RED, OUTPUT ); - pinMode( LED2_GREEN, OUTPUT ); - pinMode( LED2_BLUE, OUTPUT ); - - digitalWrite( LED3_RED, 1 ); - digitalWrite( LED3_GREEN, 1 ); - digitalWrite( LED3_BLUE, 1 ); - - pinMode( LED3_RED, OUTPUT ); - pinMode( LED3_GREEN, OUTPUT ); - pinMode( LED3_BLUE, OUTPUT ); -} - -void init_joystick( int threshold ); - -void setup() -{ - Serial.begin( 115200 ); - Serial.print("\r\nStart"); - - init_leds(); - init_relays(); - init_buttons(); - init_joystick( 5 ); // initialize with thresholding enabled, dead zone of 5 units - - - servos[0].attach(SERVO1); - servos[0].write(90); - servos[1].attach(SERVO2); - servos[1].write(90); - servos[2].attach(SERVO3); - servos[2].write(90); - - Max.powerOn(); - delay( 200 ); -} - -bool isAndroidVendor(USB_DEVICE_DESCRIPTOR *desc) -{ - return desc->idVendor == 0x18d1 || desc->idVendor == 0x22B8; -} - -bool isAccessoryDevice(USB_DEVICE_DESCRIPTOR *desc) -{ - return desc->idProduct == 0x2D00 || desc->idProduct == 0x2D01; -} - -void sendString(byte addr, int index, char *str) -{ - Usb.ctrlReq(addr, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_VENDOR | USB_SETUP_RECIPIENT_DEVICE, - ACCESSORY_SEND_STRING, 0, 0, index, strlen(str) + 1, str); - -} - -void switchDevice(byte addr) -{ - sendString(addr, ACCESSORY_STRING_MANUFACTURER, "Google, Inc."); - sendString(addr, ACCESSORY_STRING_MODEL, "DemoKit"); - sendString(addr, ACCESSORY_STRING_TYPE, "Sample Program"); - sendString(addr, ACCESSORY_STRING_VERSION, "1.0"); - - Usb.ctrlReq(addr, 0, USB_SETUP_HOST_TO_DEVICE | USB_SETUP_TYPE_VENDOR | USB_SETUP_RECIPIENT_DEVICE, - ACCESSORY_START, 0, 0, 0, 0, NULL); -} - -bool findEndpoints(byte addr, EP_RECORD *inEp, EP_RECORD *outEp) -{ - int len; - byte err; - uint8_t *p; - - err = Usb.getConfDescr(addr, 0, 4, 0, (char *)usbBuff); - if (err) { - Serial.print("Can't get config descriptor length\n"); - return false; - } - - len = usbBuff[2] | ((int)usbBuff[3] << 8); - Serial.print("Config Desc Length: "); - Serial.println(len, DEC); - if (len > sizeof(usbBuff)) { - Serial.print("config descriptor too large\n"); - /* might want to truncate here */ - return false; - } - - err = Usb.getConfDescr(addr, 0, len, 0, (char *)usbBuff); - if (err) { - Serial.print("Can't get config descriptor\n"); - return false; - } - - p = usbBuff; - inEp->epAddr = 0; - outEp->epAddr = 0; - while (p < (usbBuff + len)){ - uint8_t descLen = p[0]; - uint8_t descType = p[1]; - USB_ENDPOINT_DESCRIPTOR *epDesc; - EP_RECORD *ep; - - switch (descType) { - case USB_DESCRIPTOR_CONFIGURATION: - Serial.print("config desc\n"); - break; - - case USB_DESCRIPTOR_INTERFACE: - Serial.print("interface desc\n"); - break; - - case USB_DESCRIPTOR_ENDPOINT: - epDesc = (USB_ENDPOINT_DESCRIPTOR *)p; - if (!inEp->epAddr && (epDesc->bEndpointAddress & 0x80)) - ep = inEp; - else if (!outEp->epAddr) - ep = outEp; - else - ep = NULL; - - if (ep) { - ep->epAddr = epDesc->bEndpointAddress & 0x7f; - ep->Attr = epDesc->bmAttributes; - ep->MaxPktSize = epDesc->wMaxPacketSize; - ep->sndToggle = bmSNDTOG0; - ep->rcvToggle = bmRCVTOG0; - } - break; - - default: - Serial.print("unkown desc type "); - Serial.println( descType, HEX); - break; - } - - p += descLen; - } - - return inEp->epAddr && outEp->epAddr; -} - -EP_RECORD ep_record[ 8 ]; //endpoint record structure for the mouse - - -void doAndroid(void) -{ - byte err; - byte idle; - byte b1, b2, b3, c; - EP_RECORD inEp, outEp; - byte count = 0; - - if (findEndpoints(1, &inEp, &outEp)) { - - ep_record[inEp.epAddr] = inEp; - if (outEp.epAddr != inEp.epAddr) - ep_record[outEp.epAddr] = outEp; - - Serial.print("inEp: "); - Serial.println(inEp.epAddr, HEX); - Serial.print("outEp: "); - Serial.println(outEp.epAddr, HEX); - - ep_record[0] = *(Usb.getDevTableEntry(0,0)); - Usb.setDevTableEntry(1, ep_record); - - err = Usb.setConf( 1, 0, 1 ); - if (err) - Serial.print("Can't set config to 1\n"); - - Usb.setUsbTaskState( USB_STATE_RUNNING ); - - b1 = digitalRead(BUTTON1); - b2 = digitalRead(BUTTON2); - b3 = digitalRead(BUTTON3); - c = captouched(); - - while(1) { - int len = Usb.newInTransfer(1, inEp.epAddr, sizeof(usbBuff), - (char *)usbBuff); - /* int i; */ - /* byte b; */ - /* byte msg[3]; */ - /* msg[0] = 0x1; */ - - if (len > 0) { - // XXX: assumes only one command per packet - if (usbBuff[0] == 0x2) { - if (usbBuff[1] == 0x0) - analogWrite( LED1_RED, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x1) - analogWrite( LED1_GREEN, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x2) - analogWrite( LED1_BLUE, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x3) - analogWrite( LED2_RED, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x4) - analogWrite( LED2_GREEN, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x5) - analogWrite( LED2_BLUE, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x6) - analogWrite( LED3_RED, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x7) - analogWrite( LED3_GREEN, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x8) - analogWrite( LED3_BLUE, 255 - usbBuff[2]); - else if (usbBuff[1] == 0x10) - servos[0].write(map(usbBuff[2], 0, 255, 0, 180)); - else if (usbBuff[1] == 0x11) - servos[1].write(map(usbBuff[2], 0, 255, 0, 180)); - else if (usbBuff[1] == 0x12) - servos[2].write(map(usbBuff[2], 0, 255, 0, 180)); - } else if (usbBuff[0] == 0x3) { - if (usbBuff[1] == 0x0) - digitalWrite( RELAY1, usbBuff[2] ? HIGH : LOW ); - else if (usbBuff[1] == 0x1) - digitalWrite( RELAY2, usbBuff[2] ? HIGH : LOW ); - - } - -// for (i = 0; i < len; i++) -// Serial.print('\n'); - } - - - } - - } - -} - - -void loop() -{ - USB_DEVICE_DESCRIPTOR *devDesc = (USB_DEVICE_DESCRIPTOR *) usbBuff; - byte err; - - Max.Task(); - Usb.Task(); - if( Usb.getUsbTaskState() >= USB_STATE_CONFIGURING ) { - Serial.print("\nDevice addressed... "); - Serial.print("Requesting device descriptor."); - - err = Usb.getDevDescr(1, 0, 0x12, (char *) devDesc); - if (err) { - Serial.print("\nDevice descriptor cannot be retrieved. Program Halted\n"); - while(1); - } - - if (isAndroidVendor(devDesc)) { - Serial.print("found android device\n"); - - if (isAccessoryDevice(devDesc)) { - Serial.print("found android acessory device\n"); - doAndroid(); - } else { - Serial.print("found possible device. swithcing to serial mode\n"); - switchDevice(1); - } - } - - while (Usb.getUsbTaskState() != USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE) { - Max.Task(); - Usb.Task(); - - - } - - Serial.print("detached\n"); - - } - -} - -// ============================================================================== -// Austria Microsystems i2c Joystick - -/* - If a threshold is provided, the dead zone will be programmed such that interrupts will not - be generated unless the threshold is exceeded. - - Note that if you use that mode, you will have to use passage of time with no new interrupts - to detect that the stick has been released and has returned to center. - - If you need to explicitly track return to center, pass 0 as the threshold. "Center" will - still bounce around a little -*/ - - -void init_joystick( int threshold ) -{ - byte status = 0; - - pinMode( JOY_SWITCH, INPUT ); - digitalWrite( JOY_SWITCH, HIGH ); // enable the internal pullup - - pinMode( JOY_nINT, INPUT ); - digitalWrite( JOY_nINT, HIGH ); // enable the internal pullup - - pinMode( JOY_nRESET, OUTPUT ); - - digitalWrite( JOY_nRESET, 1 ); - delay(1); - digitalWrite( JOY_nRESET, 0 ); - delay(1); - digitalWrite( JOY_nRESET, 1 ); - - Wire.begin(); - - do { - status = read_joy_reg( 0x0f ); // XXX need timeout - } while ((status & 0xf0) != 0xf0); - - write_joy_reg( 0x2e, 0x86 ); // invert magnet polarity setting, per datasheet - - calibrate_joystick( threshold ); // calibrate & set up dead zone area -} - - -int offset_X, offset_Y; - -void calibrate_joystick( int dz ) -{ - char iii; - int x_cal = 0; - int y_cal = 0; - - write_joy_reg( 0x0f, 0x00 ); // Low Power Mode, 20ms auto wakeup - // INTn output enabled - // INTn active after each measurement - // Normal (non-Reset) mode - delay(1); - - read_joy_reg( 0x11 ); // dummy read of Y_reg to reset interrupt - - for( iii = 0; iii != 16; iii++ ) { // read coords 16 times & average - while( !joystick_interrupt() ) // poll for interrupt - ; - x_cal += read_joy_reg( 0x10 ); // X pos - y_cal += read_joy_reg( 0x11 ); // Y pos - } - - offset_X = -(x_cal>>4); // divide by 16 to get average - offset_Y = -(y_cal>>4); - - //sprintf(msgbuf, "offsets = %d, %d\n", offset_X, offset_Y); - //Serial.print(msgbuf); - - write_joy_reg( 0x12, dz - offset_X ); // Xp, LEFT threshold for INTn - write_joy_reg( 0x13, -dz - offset_X ); // Xn, RIGHT threshold for INTn - write_joy_reg( 0x14, dz - offset_Y ); // Yp, UP threshold for INTn - write_joy_reg( 0x15, -dz - offset_Y ); // Yn, DOWN threshold for INTn - - if ( dz ) // dead zone threshold detect requested? - write_joy_reg( 0x0f, 0x04 ); // Low Power Mode, 20ms auto wakeup - // INTn output enabled - // INTn active when movement exceeds dead zone - // Normal (non-Reset) mode -} - - -void read_joystick( int *x, int *y ) -{ - *x = read_joy_reg( 0x10 ) + offset_X; - *y = read_joy_reg( 0x11 ) + offset_Y; // reading Y clears the interrupt -} - -char joystick_interrupt() -{ - return ( digitalRead( JOY_nINT ) == 0 ); -} - - -#define JOY_I2C_ADDR 0x40 - -char read_joy_reg( char reg_addr ) -{ - char c; - - Wire.beginTransmission( JOY_I2C_ADDR ); - Wire.send( reg_addr ); - Wire.endTransmission(); - - Wire.requestFrom( JOY_I2C_ADDR, 1 ); - - while(Wire.available()) - c = Wire.receive(); - - return c; -} - -void write_joy_reg( char reg_addr, char val ) -{ - Wire.beginTransmission( JOY_I2C_ADDR ); - Wire.send( reg_addr ); - 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; -} |