Skip to content

Upstreammerge 150304 #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 26 commits into from
Closed

Conversation

ladyada
Copy link
Contributor

@ladyada ladyada commented Mar 20, 2016

tested!

ladyada and others added 26 commits October 28, 2015 18:32
add subver so we can find it!
- Instead of removing it in favor of ARDUINO_SAMD_FEATHER_M0 have both
  flags present to increase chances of compatibility with libraries.
…into upstreammerge_150304

Conflicts:
	boards.txt
	cores/arduino/USB/CDC.cpp
	libraries/USBHost/src/Usb.cpp
	platform.txt
@ladyada
Copy link
Contributor Author

ladyada commented Mar 20, 2016

gah that was not the button i meant to press

@ladyada ladyada closed this Mar 20, 2016
@ladyada ladyada deleted the upstreammerge_150304 branch May 14, 2016 00:18
boseji pushed a commit to go-ut/combined-ArduinoCore-samd that referenced this pull request May 30, 2020
…lPin

Fix analogInputToDigitalPin for Grand Central M4
boseji pushed a commit to go-ut/combined-ArduinoCore-samd that referenced this pull request May 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants