Skip to content

Add missing 20 MHz clock option #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2019
Merged

Add missing 20 MHz clock option #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9456950
Add missing 20 MHz clock option
MCUdude Feb 18, 2019
9e3d38b
Fix incorrect if elif
MCUdude Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions cores/arduino/wiring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,13 @@ void init()

int64_t cpu_freq;

#if (F_CPU == 16000000)
#if (F_CPU == 20000000)
cpu_freq = 20000000;

/* No division on clock */
_PROTECTED_WRITE(CLKCTRL_MCLKCTRLB, 0x00);

#elif (F_CPU == 16000000)
cpu_freq = 16000000;

/* No division on clock */
Expand Down Expand Up @@ -321,19 +327,21 @@ void init()

#if defined(ADC0)

/* ADC clock between 50-200KHz */
/* ADC clock between 50-200 kHz */

#if F_CPU >= 16000000 // 16 MHz / 128 = 125 KHz
#if F_CPU >= 20000000 // 20 MHz / 128 = 156.250 kHz
ADC0.CTRLC |= ADC_PRESC_DIV128_gc;
#elif F_CPU >= 16000000 // 16 MHz / 128 = 125 kHz
ADC0.CTRLC |= ADC_PRESC_DIV128_gc;
#elif F_CPU >= 8000000 // 8 MHz / 64 = 125 KHz
#elif F_CPU >= 8000000 // 8 MHz / 64 = 125 kHz
ADC0.CTRLC |= ADC_PRESC_DIV64_gc;
#elif F_CPU >= 4000000 // 4 MHz / 32 = 125 KHz
#elif F_CPU >= 4000000 // 4 MHz / 32 = 125 kHz
ADC0.CTRLC |= ADC_PRESC_DIV32_gc;
#elif F_CPU >= 2000000 // 2 MHz / 16 = 125 KHz
#elif F_CPU >= 2000000 // 2 MHz / 16 = 125 kHz
ADC0.CTRLC |= ADC_PRESC_DIV16_gc;
#elif F_CPU >= 1000000 // 1 MHz / 8 = 125 KHz
#elif F_CPU >= 1000000 // 1 MHz / 8 = 125 kHz
ADC0.CTRLC |= ADC_PRESC_DIV8_gc;
#else // 128 kHz / 2 = 64 KHz -> This is the closest you can get, the prescaler is 2
#else // 128 kHz / 2 = 64 kHz -> This is the closest you can get, the prescaler is 2
ADC0.CTRLC |= ADC_PRESC_DIV2_gc;
#endif

Expand Down Expand Up @@ -374,4 +382,4 @@ void init()
sei();
}

void setup_timers(void) __attribute__((weak));
void setup_timers(void) __attribute__((weak));