Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Arduino Core for SAMD21 CPU
- Activity
- Members
- Labels

Snippets Groups Projects

435f4a33

Commit 435f4a33 authored 10 years ago by Thibaut VIARD

Downloads
- Plain Diff

Merge branch 'zero' of github.com:arduino/ArduinoZero into zero_int

Conflicts:
	hardware/arduino/samd/variants/arduino_zero/variant.cpp

parents 022cfa11 12277e08

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cores/arduino/SERCOM.cpp 18 additions, 51 deletions

cores/arduino/SERCOM.cpp
cores/arduino/SERCOM.h 1 addition, 10 deletions

cores/arduino/SERCOM.h
cores/arduino/Uart.cpp 2 additions, 13 deletions

cores/arduino/Uart.cpp
libraries/SPI/SPI.cpp 9 additions, 1 deletion

libraries/SPI/SPI.cpp
libraries/SPI/SPI.h 0 additions, 2 deletions

libraries/SPI/SPI.h
variants/arduino_zero/variant.cpp 12 additions, 1 deletion

variants/arduino_zero/variant.cpp
variants/arduino_zero/variant.h 21 additions, 9 deletions

variants/arduino_zero/variant.h

with 63 additions and 87 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment