Commit graph

1138 commits

Author SHA1 Message Date
Kristian Sloth Lauszus cdc52a31f5 Merge branch 'SPI' into Galileo 2015-03-19 18:15:23 +01:00
Kristian Sloth Lauszus 31e1c258de Merge branch 'master' into SPI 2015-03-19 18:15:15 +01:00
Kristian Sloth Lauszus a2265ea0a9 All these files changes were changed in: bc8000f782
I suspect Andrew used force push to overwrite the history
2015-03-19 18:11:22 +01:00
Kristian Sloth Lauszus 73ce976198 Merge branch 'SPI' into Galileo
Conflicts:
	Usb.h
	avrpins.h
	usbhost.h
2015-03-19 16:36:51 +01:00
Kristian Sloth Lauszus cc14152c54 Slow SPI devices like the Galileo might actually read it as stabilised in the first go 2015-03-19 16:31:29 +01:00
Kristian Sloth Lauszus 585b357ee5 Merge branch 'master' into SPI
Conflicts:
	settings.h
	usbhost.h
2015-03-19 15:34:07 +01:00
Kristian Sloth Lauszus ceda6e18b5 Pin 13, 12 and 11 can still be used for SPI on Uno 2015-03-19 15:24:23 +01:00
Andrew J. Kroll 8c38426eab Merge branch 'master' of github.com:felis/USB_Host_Shield_2.0 2015-03-18 05:43:10 -04:00
Andrew J. Kroll 2301a07cfe XR21B1411 - add example 2015-03-18 05:41:20 -04:00
Andrew J. Kroll 3490c60ee6 XR21B1411 driver, initial commit 2015-03-18 05:37:42 -04:00
Andrew J. Kroll 32e2932c2c Expand cdc-acm with additional feature methods 2015-03-18 05:36:55 -04:00
Andrew J. Kroll da03f22741 fix pointer screwup that has been around for ages. 2015-03-18 05:35:44 -04:00
Kristian Sloth Lauszus de7ad5a066 Added a few more "LeftHatX: 0 LeftHatY: 0 RightHatX: 0 RightHatY: 0" and converted tabs to spaces 2015-03-15 00:06:18 +01:00
Kristian Sloth Lauszus 5b35d25138 Make 3b47fd03e3 show up correctly. 2015-03-15 00:04:19 +01:00
Kristian Sloth Lauszus 3b47fd03e3 Added typically error that people are getting when the dongle is not supporting 2.0+EDR. 2015-03-15 00:02:59 +01:00
Andrew J. Kroll 46dc4e6fec fix conflict, fix case on include for hid.h (regression?) 2015-03-14 04:54:28 -04:00
Andrew J. Kroll bc8000f782 manual merge 2015-03-12 18:56:15 -04:00
Andrew J. Kroll 2412be1bd9 Janitorial tab removal 2015-03-12 18:10:04 -04:00
Andrew J. Kroll 586ed62467 CRLF -> LF 2015-03-12 17:27:21 -04:00
Andrew J. Kroll ff3a1d6797 fix debug printing 2015-03-12 17:27:04 -04:00
Andrew J. Kroll 33474df0b5 fix CDC-ACM bug, ready not reset on ACM::Release() 2015-03-12 03:05:14 -04:00
Kristian Sloth Lauszus dd0296ca65 Replaced #if with #elif for MIPSEL 2015-03-03 23:11:45 +01:00
Kristian Sloth Lauszus 2dfca7d936 Update submodules 2015-03-03 20:00:28 +01:00
Kristian Sloth Lauszus 73f791c859 Merge branch 'SPI' into Galileo
Conflicts:
	avrpins.h
	settings.h
	usbhost.h
2015-03-03 19:57:35 +01:00
Kristian Sloth Lauszus d19d78f940 Always favour SPI library if it has transactions 2015-03-03 19:22:43 +01:00
Kristian Sloth Lauszus 5d3356c784 Set Arduino minimum version to 1.6.0, as SPI multibyte transfer were missing for sam until then
See: 6a5b82f062
2015-03-03 19:20:27 +01:00
Kristian Sloth Lauszus a9dd112502 Update submodules 2015-03-03 19:10:46 +01:00
Kristian Sloth Lauszus 22d82ecd0a SPI library was added twice after merge - see: c39e8a180c 2015-03-03 19:08:39 +01:00
Kristian Sloth Lauszus c39e8a180c Merge branch 'master' into SPI
Conflicts:
	examples/Bluetooth/SPPMulti/SPPMulti.ino
	examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino
	settings.h
	usbhost.h
2015-03-03 18:56:59 +01:00
Kristian Sloth Lauszus 7c2e6c1bcd Merge pull request #136 from felis/dev
Merge dev branch
2015-03-03 18:42:06 +01:00
Kristian Sloth Lauszus 13851a466f Merge pull request #98 from davidbkemp/master
Make the right shift key work in OemToAscii (only the left shift key was...
2015-03-03 18:31:15 +01:00
Kristian Sloth Lauszus 881c4df046 Merge branch 'master' into dev
Conflicts:
	BTD.h
	BTHID.h
	PS3BT.h
	SPP.h
	Wii.h
2015-02-24 01:28:28 +01:00
Kristian Sloth Lauszus 82f7088578 Removed content from merge conflict 2015-02-22 20:37:42 +01:00
Andrew J. Kroll d25f28109d all sources to LF 2015-02-22 13:18:45 -05:00
Andrew J. Kroll 56c0265fa8 attributes 2015-02-22 13:03:05 -05:00
Kristian Sloth Lauszus 86cb7f38ab Fixed some formatting 2015-02-22 18:27:30 +01:00
Kristian Sloth Lauszus 6047962d60 Merge branch 'xxxajk'
Conflicts:
	XBOXUSB.h
	examples/ftdi/USBFTDILoopback/USBFTDILoopback.ino
	hiduniversal.h
	settings.h
	usbhost.h
2015-02-22 18:25:22 +01:00
Andrew J. Kroll bd8c8e7404 Fix use of "bool" so ARM compiles correctly 2015-02-19 03:14:39 -05:00
Fred 199612e93e bug fix: would only detect first XBOX button press 2015-02-15 19:56:17 +00:00
Fred 9979e50426 LeftTrigger/RightTrigger => L2/R2 for consistency 2015-02-15 19:47:06 +00:00
Fred 519e2a5309 cleanup 2015-02-15 17:56:20 +00:00
Fred 2d4ab30005 Fixed tabbing... 2015-02-14 11:15:29 +00:00
Fred 7c475c91e0 Xbox ONE Controller support 2015-02-14 11:09:24 +00:00
Kristian Sloth Lauszus 96dfd7e37d Added support for Joytech wired controller
See: https://github.com/felis/USB_Host_Shield_2.0/issues/128
2015-01-03 10:52:17 +01:00
Kristian Sloth Lauszus 2b4a56de3d Added note about SPI pins used on Arduino Uno 2014-12-02 17:46:05 -08:00
Kristian Sloth Lauszus 3ba1c82cf4 Merge pull request #115 from sieren/master
Added support for RedBearLab nRF51822 Board
2014-11-23 23:55:09 -08:00
Matt Sieren 585e6b9df5 Updated comment
Updated comment to reflect including SPI.h on the RBL nRF as well.
2014-11-24 08:23:41 +01:00
Matt Sieren e0ac4eedad Revert "Updated instructions"
This reverts commit 904569278d.
2014-11-24 08:22:19 +01:00
Matt Sieren 904569278d Updated instructions
Added information about including SPI.h
2014-11-22 11:02:36 +01:00
Matt Sieren a88e9b44e7 Added Board
Added RedBearLab nRF51822 and instructions to the readme.
2014-11-22 09:56:15 +01:00