Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

Arduino Core for SAMD21 CPU
- Activity
- Members
- Labels

Snippets Groups Projects

e7d9d285

Commit e7d9d285 authored 10 years ago by Cristian Maglie Committed by Cristian Maglie 10 years ago

Downloads
- Plain Diff

Merge branch 'zero' into adc-dac-fix

Conflicts:
	hardware/arduino/samd/cores/arduino/wiring.c
	hardware/arduino/samd/cores/arduino/wiring_analog.c

parents df015207 56c096bd

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cores/arduino/delay.h 31 additions, 28 deletions

cores/arduino/delay.h
cores/arduino/wiring.c 4 additions, 8 deletions

cores/arduino/wiring.c
cores/arduino/wiring_analog.c 15 additions, 3 deletions

cores/arduino/wiring_analog.c
cores/arduino/wiring_analog.h 1 addition, 1 deletion

cores/arduino/wiring_analog.h
cores/validation/validation_firmata/build_as6/test.atsln 20 additions, 0 deletions

cores/validation/validation_firmata/build_as6/test.atsln
cores/validation/validation_firmata/build_as6/test.cppproj 458 additions, 0 deletions

cores/validation/validation_firmata/build_as6/test.cppproj
cores/validation/validation_firmata/test.cpp 668 additions, 0 deletions

cores/validation/validation_firmata/test.cpp
variants/arduino_zero/variant.cpp 31 additions, 31 deletions

variants/arduino_zero/variant.cpp

with 1228 additions and 71 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