merge from 2.2.0 + fix up board defs #510
Conversation
1. bidirectional SPI support (@microbuilder please check) 2. slight changes in DigitalIO types 3. placeholders (not implemented yet) for single/double-click bootloader support
|
@tannewt Fixed up things that broke the build. @microbuilder, note that there are a few changes in the nrf/ dir to make things compile, and I implemented bidirectional SPI by implementing one new routine (you can check that -- it was a guess based on the the read and write routines). |
|
FYI - I was able to merge this PR into master and build/load the code into my feather52 - Seems to be working as expected. |
| */ | ||
| /* | ||
| * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a> | ||
| */ |
There was a problem hiding this comment.
I don't think all of these conf_* files are needed with ASF4.
There was a problem hiding this comment.
cleaned up (+more).
| #LD_FILE = boards/samd21x18-bootloader.ld | ||
| USB_VID = 0x239A | ||
| USB_PID = 0x801F | ||
| USB_PRODUCT = "UGame" |
There was a problem hiding this comment.
Small u here because its for micro.
|
ready to re-review |
|
Hi Dan, sorry just saw the email alert for this. :( Looks good to me though! |
|
@microbuilder Feel free to add comments to PRs after they are merged. The author can always follow up with an additional PR. |
|
All atmel-samd builds are going into safe mode on ctrl-D after this merge (tnx @jerryneedell). So some issue somewhere. |
Merge bugfixes and additions from 2.2.0 to master.
Difficult merge. Checked a number of merges by hand. Non-Adafruit boards added but I did not try to build them.
Merged in 2.2 double-tap support in .ld files (@tannewt: you might double-check these).
CPX SPI flash support added, but not tested.