Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Arduino Core for SAMD21 CPU
- Activity
- Members
- Labels

Snippets Groups Projects

78f2dde1

Commit 78f2dde1 authored 10 years ago by Jonathan BAUDIN

Downloads
- Plain Diff

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

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

parents e4ab3ba3 c3f91a6e

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

boards.txt 2 additions, 2 deletions

boards.txt
cores/arduino/WVariant.h 18 additions, 12 deletions

cores/arduino/WVariant.h
cores/arduino/wiring_analog.c 50 additions, 54 deletions

cores/arduino/wiring_analog.c
cores/validation/validation_core/test - Copy.cpp 0 additions, 100 deletions

cores/validation/validation_core/test - Copy.cpp
cores/validation/validation_core/test.cpp 30 additions, 45 deletions

cores/validation/validation_core/test.cpp
platform.txt 6 additions, 6 deletions

platform.txt
variants/arduino_zero/variant.cpp 2 additions, 1 deletion

variants/arduino_zero/variant.cpp

with 108 additions and 220 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