Skip to content

Commit e35b44b

Browse files
ladyadaladyada
committed
Merge branch 'master' of github.com:adafruit/ArduinoCore-samd
2 parents 39b6213 + bc8d8b8 commit e35b44b

File tree

32 files changed

+212
-72
lines changed

32 files changed

+212
-72
lines changed

‎boards.txt

+170-30
Large diffs are not rendered by default.

‎cores/arduino/startup.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ void SystemInit( void )
160160
//PLL0 is 120MHz
161161
GCLK->PCHCTRL[OSCCTRL_GCLK_ID_FDPLL0].reg = (1 << GCLK_PCHCTRL_CHEN_Pos) | GCLK_PCHCTRL_GEN(GCLK_PCHCTRL_GEN_GCLK5_Val);
162162

163-
OSCCTRL->Dpll[0].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0x00) | OSCCTRL_DPLLRATIO_LDR(119); //120 Mhz
163+
// This rounds to nearest full-MHz increment; not currently using frac
164+
OSCCTRL->Dpll[0].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0x00) | OSCCTRL_DPLLRATIO_LDR((F_CPU - 500000) / 1000000);
164165

165166
while(OSCCTRL->Dpll[0].DPLLSYNCBUSY.bit.DPLLRATIO);
166167

‎cores/arduino/wiring.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ extern "C" {
2525

2626

2727
#if defined(__SAMD51__)
28-
//CHANGE THIS IF YOU CHANGE THE CLOCK SPEED
29-
uint32_t SystemCoreClock=120000000ul ;
28+
uint32_t SystemCoreClock=F_CPU;
3029
#else
3130
/*
3231
* System Core Clock is at 1MHz (8MHz/8) at Reset.

‎variants/arduino_mzero/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/arduino_zero/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/circuitplay/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define VARIANT_MAINOSC (32768ul)
3232

3333
// Master clock frequency
34-
#define VARIANT_MCK (48000000ul)
34+
#define VARIANT_MCK (F_CPU)
3535

3636
// Pins
3737
// ----

‎variants/crickit_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/feather_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/feather_m0_express/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/feather_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/gemma_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/grand_central_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/hallowing_m0_express/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/itsybitsy_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/itsybitsy_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/metro_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/metro_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/metro_m4_airlift/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/mkr1000/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/mkrfox1200/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/mkrgsm1400/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----
@@ -196,4 +196,4 @@ extern Uart Serial2;
196196
#define SerialGSM Serial2
197197

198198
#define ARDUINO_GSM_COMPATIBILITY_WRAPPER
199-
#define GSM_DEFAULT_STREAM SerialGSM
199+
#define GSM_DEFAULT_STREAM SerialGSM

‎variants/mkrnb1500/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/mkrwan1300/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/mkrwifi1010/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/mkrzero/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
// Master clock frequency
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
// Pins
3636
// ----

‎variants/pirkey/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/pybadge_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/pygamer_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/pyportal_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/trellis_m4/variant.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (120000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

35-
#define VARIANT_GCLK0_FREQ (120000000UL)
35+
#define VARIANT_GCLK0_FREQ (F_CPU)
3636
#define VARIANT_GCLK1_FREQ (48000000UL)
3737
#define VARIANT_GCLK2_FREQ (100000000UL)
3838

‎variants/trinket_m0/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

‎variants/zero_radio/variant.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define VARIANT_MAINOSC (32768ul)
3131

3232
/** Master clock frequency */
33-
#define VARIANT_MCK (48000000ul)
33+
#define VARIANT_MCK (F_CPU)
3434

3535
/*----------------------------------------------------------------------------
3636
* Headers

0 commit comments

Comments
 (0)