Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Arduino Core for SAMD21 CPU
- Activity
- Members
- Labels

Snippets Groups Projects

83cf1c0b

Commit 83cf1c0b authored 10 years ago by Thibaut VIARD

Downloads
- Plain Diff

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

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

parents ab89e9e4 86b6f106

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cores/arduino/Arduino.h 1 addition, 0 deletions

cores/arduino/Arduino.h
cores/arduino/Reset.cpp 1 addition, 1 deletion

cores/arduino/Reset.cpp
cores/arduino/SERCOM.cpp 109 additions, 38 deletions

cores/arduino/SERCOM.cpp
cores/arduino/SERCOM.h 19 additions, 10 deletions

cores/arduino/SERCOM.h
cores/arduino/Uart.cpp 42 additions, 24 deletions

cores/arduino/Uart.cpp
cores/arduino/Uart.h 9 additions, 6 deletions

cores/arduino/Uart.h
libraries/SPI/SPI.cpp 13 additions, 31 deletions

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

libraries/SPI/SPI.h
libraries/Wire/Wire.cpp 18 additions, 40 deletions

libraries/Wire/Wire.cpp
libraries/Wire/Wire.h 55 additions, 59 deletions

libraries/Wire/Wire.h
variants/arduino_zero/variant.cpp 36 additions, 7 deletions

variants/arduino_zero/variant.cpp
variants/arduino_zero/variant.h 5 additions, 3 deletions

variants/arduino_zero/variant.h

with 316 additions and 221 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