Skip to content

Commit 5a215c8

Browse files
committed
Fixed the copyright notices. Streamlined some code.
1 parent 74683a8 commit 5a215c8

10 files changed

Lines changed: 13 additions & 11 deletions

File tree

cores/arduino/Arduino.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
Arduino.h - Main include file for the Arduino SDK
3+
Copyright (c) 2017 MattairTech LLC. All right reserved.
34
Copyright (c) 2014 Arduino LLC. All right reserved.
45
56
This library is free software; you can redistribute it and/or

cores/arduino/SERCOM.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2014 Arduino. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/SERCOM.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2014 Arduino. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/Tone.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2015 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/WInterrupts.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2015 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/WVariant.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2015 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/cortex_handlers.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2015 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/startup.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/*
2+
Copyright (c) 2017 Scott Price. All right reserved.
3+
Copyright (c) 2017 MattairTech LLC. All right reserved.
24
Copyright (c) 2015 Arduino LLC. All right reserved.
35
46
This library is free software; you can redistribute it and/or
@@ -49,7 +51,7 @@ void SystemInit( void )
4951
#if SAMC_SERIES
5052

5153

52-
/* Set 1 Flash Wait State for 48MHz (2 for the L21 and C21), cf tables 20.9 and 35.27 in SAMD21 Datasheet */
54+
/* Set 2 Flash Wait States for the C21, cf table 45-34 in SAMC21 Datasheet */
5355
NVMCTRL->CTRLB.reg |= NVMCTRL_CTRLB_RWS_DUAL ; // two wait states
5456

5557
/* Turn on the digital interface clock */
@@ -161,20 +163,11 @@ void SystemInit( void )
161163
GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
162164
while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
163165

164-
#elif (defined(CLOCKCONFIG_INTERNAL) || defined(CLOCKCONFIG_INTERNAL_USB))
165-
/* ----------------------------------------------------------------------------------------------
166-
* Enable DFLL48M clock (D21/L21) or RC oscillator (C21)
167-
*/
168-
#if defined(CLOCKCONFIG_INTERNAL_USB)
169-
#error "startup.c: CLOCKCONFIG_INTERNAL_USB setting invalid for C21 chips as they lack USB."
170-
#endif
171-
166+
#else // Internal Clock
172167
/* Change OSC48M divider to /1. CPU will run at 48MHz */
173168
OSCCTRL->OSC48MDIV.reg = OSCCTRL_OSC48MDIV_DIV(0);
174169
while ( OSCCTRL->OSC48MSYNCBUSY.reg & OSCCTRL_OSC48MSYNCBUSY_OSC48MDIV );
175170

176-
#else
177-
#error "startup.c: Clock source must be selected in the boards.txt file"
178171
#endif
179172

180173

cores/arduino/wiring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2015 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

cores/arduino/wiring_analog.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/*
2+
Copyright (c) 2017 MattairTech LLC. All right reserved.
23
Copyright (c) 2014 Arduino LLC. All right reserved.
34
45
This library is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)