m4 compiles, pwmout implemented

This commit is contained in:
Scott Shawcroft 2018-02-09 16:37:18 -08:00
parent 190e7d629e
commit 0398f308fa
5 changed files with 533 additions and 413 deletions

View File

@ -40,12 +40,9 @@ typedef struct {
} pin_sercom_t;
typedef struct {
union {
Tc *const tc;
Tcc *const tcc;
};
uint8_t index;
bool is_tc:1;
uint8_t wave_output:4;
uint8_t wave_output:7;
} pin_timer_t;
#ifdef SAMD21

View File

@ -30,13 +30,17 @@
#include "py/runtime.h"
#include "common-hal/pulseio/PWMOut.h"
#include "shared-bindings/pulseio/PWMOut.h"
#include "shared-bindings/microcontroller/Processor.h"
#include "atmel_start_pins.h"
#include "hal/utils/include/utils_repeat_macro.h"
#include "samd21_pins.h"
#undef ENABLE
# define _TCC_SIZE(n,unused) TPASTE3(TCC,n,_SIZE),
# define TCC_SIZES { MREPEAT(TCC_INST_NUM, _TCC_SIZE, 0) }
# define _TCC_SIZE(unused, n) TCC ## n ## _SIZE,
# define TCC_SIZES { REPEAT_MACRO(_TCC_SIZE, 0, TCC_INST_NUM) }
static uint32_t tcc_periods[TCC_INST_NUM];
static uint32_t tc_periods[TC_INST_NUM];
@ -48,19 +52,42 @@ const uint16_t prescaler[8] = {1, 2, 4, 8, 16, 64, 256, 1024};
// This bitmask keeps track of which channels of a TCC are currently claimed.
#ifdef SAMD21
uint8_t tcc_channels[3] = {0xf0, 0xfc, 0xfc};
uint8_t tcc_cc_num[3] = {4, 2, 2};
const uint8_t tcc_cc_num[3] = {4, 2, 2};
const uint8_t tc_gclk_ids[] = {};
const uint8_t tc_gclk_ids[5] = {TC3_GCLK_ID, TC4_GCLK_ID, TC5_GCLK_ID, TC6_GCLK_ID, TC7_GCLK_ID};
const uint8_t tcc_gclk_ids[3] = {TCC0_GCLK_ID, TCC1_GCLK_ID, TCC2_GCLK_ID};
#endif
#ifdef SAMD51
uint8_t tcc_channels[5] = {0xc0, 0xf0, 0xf8, 0xfc, 0xfc};
uint8_t tcc_cc_num[5] = {6, 4, 3, 2, 2};
Tcc* tcc_insts[TCC_INST_NUM] = TCC_INSTS;
static const uint8_t tcc_cc_num[5] = {6, 4, 3, 2, 2};
const uint8_t tc_gclk_ids[TC_INST_NUM] = {TC0_GCLK_ID,
TC1_GCLK_ID,
TC2_GCLK_ID,
TC3_GCLK_ID
#ifdef TC4_GCLK_ID
, TC4_GCLK_ID
#endif
#ifdef TC5_GCLK_ID
, TC5_GCLK_ID
#endif
#ifdef TC6_GCLK_ID
, TC6_GCLK_ID
#endif
#ifdef TC7_GCLK_ID
, TC7_GCLK_ID
#endif
};
const uint8_t tcc_gclk_ids[5] = {TCC0_GCLK_ID, TCC1_GCLK_ID, TCC2_GCLK_ID, TCC3_GCLK_ID,
TCC4_GCLK_ID};
#endif
static Tc* const tc_insts[TC_INST_NUM] = TC_INSTS;
static Tcc* const tcc_insts[TCC_INST_NUM] = TCC_INSTS;
void pwmout_reset(void) {
// Reset all timers
for (int i = 0; i < TCC_INST_NUM; i++) {
target_timer_frequencies[i] = 0;
timer_refcount[i] = 0;
target_tcc_frequencies[i] = 0;
tcc_refcount[i] = 0;
}
Tcc *tccs[TCC_INST_NUM] = TCC_INSTS;
for (int i = 0; i < TCC_INST_NUM; i++) {
@ -85,29 +112,105 @@ void pwmout_reset(void) {
}
}
static uint8_t tcc_channel(uint8_t timer_index, uint8_t wave_output) {
static uint8_t tcc_channel(const pin_timer_t* t) {
// For the SAMD51 this hardcodes the use of OTMX == 0x0, the output matrix mapping, which uses
// SAMD21-style modulo mapping.
return t->wave_output % tcc_cc_num[index];
return t->wave_output % tcc_cc_num[t->index];
}
bool channel_ok(const pin_timer_t* t, uint8_t index) {
uint8_t channel_bit = 1 << tcc_channel(index, t->wave_output);
return (!t->is_tc && ((tcc_channels[index] & channel_bit) == 0)) ||
static void tc_set_enable(Tc* tc, bool enable) {
tc->COUNT16.CTRLA.bit.ENABLE = enable;
while (tc->COUNT16.SYNCBUSY.bit.ENABLE != 0) {
/* Wait for sync */
}
}
static void tcc_set_enable(Tcc* tcc, bool enable) {
tcc->CTRLA.bit.ENABLE = enable;
while (tcc->SYNCBUSY.bit.ENABLE != 0) {
/* Wait for sync */
}
}
bool channel_ok(const pin_timer_t* t) {
uint8_t channel_bit = 1 << tcc_channel(t);
return (!t->is_tc && ((tcc_channels[t->index] & channel_bit) == 0)) ||
t->is_tc;
}
static uint8_t timer_index(Tcc* base_timer_address) {
#ifdef SAMD21
return (base_timer_address - ((uint32_t) TCC0)) / 0x400;
#endif
// TCCs are scattered through the memory map of the SAMD51 so use a loop.
void turn_on_clocks(const pin_timer_t* timer) {
uint8_t gclk_id;
if (timer->is_tc) {
gclk_id = tc_gclk_ids[timer->index];
} else {
gclk_id = tcc_gclk_ids[timer->index];
}
// Turn on the clocks for the peripherals.
#ifdef SAMD51
for (uint8_t i = 0; i < TCC_INST_NUM; i++) {
if (base_timer_address == tcc_insts[i]) {
return i;
if (timer->is_tc) {
switch (timer->index) {
case 0:
MCLK->APBAMASK.reg |= MCLK_APBAMASK_TC0;
break;
case 1:
MCLK->APBAMASK.reg |= MCLK_APBAMASK_TC1;
break;
case 2:
MCLK->APBBMASK.reg |= MCLK_APBBMASK_TC2;
break;
case 3:
MCLK->APBBMASK.reg |= MCLK_APBBMASK_TC3;
break;
case 4:
MCLK->APBCMASK.reg |= MCLK_APBCMASK_TC4;
break;
case 5:
MCLK->APBCMASK.reg |= MCLK_APBCMASK_TC5;
break;
case 6:
MCLK->APBDMASK.reg |= MCLK_APBDMASK_TC6;
break;
case 7:
MCLK->APBDMASK.reg |= MCLK_APBDMASK_TC7;
break;
default:
break;
}
} else {
switch (timer->index) {
case 0:
MCLK->APBBMASK.reg |= MCLK_APBBMASK_TCC0;
break;
case 1:
MCLK->APBBMASK.reg |= MCLK_APBBMASK_TCC1;
break;
case 2:
MCLK->APBCMASK.reg |= MCLK_APBCMASK_TCC2;
break;
case 3:
MCLK->APBCMASK.reg |= MCLK_APBCMASK_TCC3;
break;
case 4:
MCLK->APBDMASK.reg |= MCLK_APBDMASK_TCC4;
break;
default:
break;
}
}
hri_gclk_write_PCHCTRL_reg(GCLK, gclk_id,
GCLK_PCHCTRL_GEN_GCLK0_Val | (1 << GCLK_PCHCTRL_CHEN_Pos));
#endif
#ifdef SAMD21
// Determine the clock slot on the APBC bus. TCC0 is the first and 8 slots in.
uint8_t clock_slot = 8 + timer->index;
// We index TCs starting at zero but in memory they begin at three so we have to add three.
if (timer->is_tc) {
clock_slot += 3;
}
PM->APBCMASK.reg |= 1 << clock_slot;
_gclk_enable_channel(gclk_id, GCLK_CLKCTRL_GEN_GCLK0_Val);
#endif
}
@ -119,7 +222,12 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
self->pin = pin;
self->variable_frequency = variable_frequency;
if (pin->primary_timer.tc == 0 && pin->secondary_timer.tc == 0) {
if (pin->timer[0].index >= TC_INST_NUM &&
pin->timer[1].index >= TCC_INST_NUM
#ifdef SAMD51
&& pin->timer[2].index >= TCC_INST_NUM
#endif
) {
mp_raise_ValueError("Invalid pin");
}
@ -127,72 +235,78 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
mp_raise_ValueError("Invalid PWM frequency");
}
uint16_t primary_timer_index = 0xff;
uint16_t secondary_timer_index = 0xff;
if (pin->primary_timer.tc != NULL) {
primary_timer_index = timer_index((uint32_t) pin->primary_timer.tcc);
}
if (pin->secondary_timer.tc != NULL) {
secondary_timer_index = timer_index((uint32_t) pin->secondary_timer.tcc);
}
// Figure out which timer we are using.
// First see if a timer is already going with the frequency we want and our
// channel is unused.
// NOTE(shawcroft): The enable bit is in the same position for TC and TCC so
// we treat them all as TCC for checking ENABLE.
const pin_timer_t* t = NULL;
uint8_t index = 0;
if (!variable_frequency &&
primary_timer_index != 0xff &&
target_timer_frequencies[primary_timer_index] == frequency &&
pin->primary_timer.tcc->CTRLA.bit.ENABLE == 1 &&
channel_ok(&pin->primary_timer, primary_timer_index)) {
t = &pin->primary_timer;
index = primary_timer_index;
self->tcc_instance.hw = t->tcc;
self->tcc_instance.double_buffering_enabled = true;
} else if (!variable_frequency &&
secondary_timer_index != 0xff &&
target_timer_frequencies[secondary_timer_index] == frequency &&
pin->secondary_timer.tcc->CTRLA.bit.ENABLE == 1 &&
channel_ok(&pin->secondary_timer, secondary_timer_index)) {
t = &pin->secondary_timer;
index = secondary_timer_index;
self->tcc_instance.hw = t->tcc;
self->tcc_instance.double_buffering_enabled = true;
} else {
// Pick an unused timer if available.
// Check the secondary timer first since its always a nicer TCC (when it
// exists)
if (pin->secondary_timer.tc != 0 &&
timer_refcount[secondary_timer_index] == 0 &&
pin->secondary_timer.tcc->CTRLA.bit.ENABLE == 0) {
t = &pin->secondary_timer;
index = secondary_timer_index;
} else if (pin->primary_timer.tc != 0 &&
(!pin->primary_timer.is_tc || pin->primary_timer.channel == 1) &&
timer_refcount[primary_timer_index] == 0) {
t = &pin->primary_timer;
index = primary_timer_index;
// First see if a tcc is already going with the frequency we want and our
// channel is unused. tc's don't have neough channels to share.
const pin_timer_t* timer = NULL;
uint8_t mux_position = 0;
if (!variable_frequency) {
for (uint8_t i = 0; i < TCC_INST_NUM && timer == NULL; i++) {
if (target_tcc_frequencies[i] != frequency) {
continue;
}
for (uint8_t j = 0; j < NUM_TIMERS_PER_PIN && timer == NULL; j++) {
const pin_timer_t* t = &pin->timer[j];
if (t->index != i || t->is_tc || t->index >= TCC_INST_NUM) {
continue;
}
Tcc* tcc = tcc_insts[t->index];
if (tcc->CTRLA.bit.ENABLE == 1 && channel_ok(t)) {
timer = t;
mux_position = j;
}
}
}
if (t == NULL) {
}
// No existing timer has been found, so find a new one to use and set it up.
if (timer == NULL) {
// By default, with fixed frequency we want to share a TCC because its likely we'll have
// other outputs at the same frequency. If the frequency is variable then we'll only have
// one output so we start with the TCs to see if they work.
int8_t direction = -1;
uint8_t start = NUM_TIMERS_PER_PIN - 1;
if (variable_frequency) {
direction = 1;
start = 0;
}
for (uint8_t i = start; i >= 0 && i < NUM_TIMERS_PER_PIN && timer == NULL; i += direction) {
const pin_timer_t* t = &pin->timer[i];
if ((!t->is_tc && t->index >= TCC_INST_NUM) ||
(t->is_tc && t->index >= TC_INST_NUM)) {
continue;
}
if (t->is_tc) {
Tc* tc = tc_insts[t->index];
if (tc->COUNT16.CTRLA.bit.ENABLE == 0 && t->wave_output == 1) {
timer = t;
mux_position = i;
}
} else {
Tcc* tcc = tcc_insts[t->index];
if (tcc->CTRLA.bit.ENABLE == 0 && channel_ok(t)) {
timer = t;
mux_position = i;
}
}
}
if (timer == NULL) {
mp_raise_RuntimeError("All timers in use");
return;
}
uint8_t resolution = 0;
if (t->is_tc) {
if (timer->is_tc) {
resolution = 16;
} else {
// TCC resolution varies so look it up.
const uint8_t _tcc_sizes[TCC_INST_NUM] = TCC_SIZES;
resolution = _tcc_sizes[index];
resolution = _tcc_sizes[timer->index];
}
// First determine the divisor that gets us the highest resolution.
uint32_t system_clock = system_cpu_clock_get_hz();
uint32_t system_clock = common_hal_mcu_processor_get_frequency();
uint32_t top;
uint8_t divisor;
for (divisor = 0; divisor < 8; divisor++) {
@ -201,57 +315,48 @@ void common_hal_pulseio_pwmout_construct(pulseio_pwmout_obj_t* self,
break;
}
}
timer_periods[index] = top;
if (t->is_tc) {
// struct tc_config config_tc;
// tc_get_config_defaults(&config_tc);
//
// config_tc.counter_size = TC_COUNTER_SIZE_16BIT;
// config_tc.clock_prescaler = TC_CTRLA_PRESCALER(divisor);
// config_tc.wave_generation = TC_WAVE_GENERATION_MATCH_PWM;
// config_tc.counter_16_bit.compare_capture_channel[0] = top;
// enum status_code status = tc_init(&self->tc_instance, t->tc, &config_tc);
// if (status != STATUS_OK) {
// mp_raise_RuntimeError("Failed to init timer");
// }
// tc_enable(&self->tc_instance);
turn_on_clocks(timer);
if (timer->is_tc) {
tc_periods[timer->index] = top;
Tc* tc = tc_insts[timer->index];
#ifdef SAMD21
tc->COUNT16.CTRLA.reg = TC_CTRLA_MODE_COUNT16 |
TC_CTRLA_PRESCALER(divisor) |
TC_CTRLA_WAVEGEN_MPWM;
tc->COUNT16.CC[0].reg = top;
#endif
#ifdef SAMD51
tc->COUNT16.CTRLA.reg = TC_CTRLA_MODE_COUNT16 | TC_CTRLA_PRESCALER(divisor);
tc->COUNT16.CTRLBSET.bit.LUPD = true;
tc->COUNT16.WAVE.reg = TC_WAVE_WAVEGEN_MPWM;
tc->COUNT16.CCBUF[0].reg = top;
#endif
tc_set_enable(tc, true);
} else {
// struct tcc_config config_tcc;
// tcc_get_config_defaults(&config_tcc, t->tcc);
//
// config_tcc.counter.clock_prescaler = divisor;
// config_tcc.counter.period = top;
// config_tcc.compare.wave_generation = TCC_WAVE_GENERATION_SINGLE_SLOPE_PWM;
//
// enum status_code status = tcc_init(&self->tcc_instance, t->tcc, &config_tcc);
// if (status != STATUS_OK) {
// mp_raise_RuntimeError("Failed to init timer");
// }
// tcc_enable(&self->tcc_instance);
}
target_timer_frequencies[index] = frequency;
timer_refcount[index]++;
}
if (!t->is_tc) {
if (variable_frequency) {
// We're changing frequency so claim all of the channels.
tcc_channels[index] = 0xff;
} else {
tcc_channels[index] |= (1 << tcc_channel(index, t->channel));
tcc_periods[timer->index] = top;
Tcc* tcc = tcc_insts[timer->index];
tcc->CTRLA.bit.PRESCALER = divisor;
tcc->CTRLBSET.bit.LUPD = true;
tcc->PER.bit.PER = top;
tcc->WAVE.bit.WAVEGEN = TCC_WAVE_WAVEGEN_NPWM_Val;
tcc_set_enable(tcc, true);
target_tcc_frequencies[timer->index] = frequency;
tcc_refcount[timer->index]++;
if (variable_frequency) {
// We're changing frequency so claim all of the channels.
tcc_channels[timer->index] = 0xff;
} else {
tcc_channels[timer->index] |= (1 << tcc_channel(timer));
}
}
}
self->timer = t;
self->timer = timer;
// Connect the wave output to the outside world.
//struct system_pinmux_config pin_config;
//system_pinmux_get_config_defaults(&pin_config);
//pin_config.mux_position = &self->pin->primary_timer == t ? MUX_E : MUX_F;
//pin_config.direction = SYSTEM_PINMUX_PIN_DIR_OUTPUT;
//system_pinmux_pin_set_config(pin->pin, &pin_config);
gpio_set_pin_function(pin->pin, GPIO_PIN_FUNCTION_E + mux_position);
common_hal_pulseio_pwmout_set_duty_cycle(self, duty);
}
@ -265,23 +370,24 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
return;
}
const pin_timer_t* t = self->timer;
uint8_t index = (((uint32_t) t->tcc) - ((uint32_t) TCC0)) / 0x400;
timer_refcount[index]--;
if (!t->is_tc) {
tcc_channels[index] &= ~(1 << tcc_channel(index, t->wave_output));
}
if (timer_refcount[index] == 0) {
target_timer_frequencies[index] = 0;
if (t->is_tc) {
//tc_disable(&self->tc_instance);
} else {
if (t->tcc == TCC0) {
tcc_channels[index] = 0xf0;
} else {
tcc_channels[index] = 0xfc;
if (t->is_tc) {
Tc* tc = tc_insts[t->index];
tc_set_enable(tc, false);
tc->COUNT16.CTRLA.bit.SWRST = true;
while (tc->COUNT16.SYNCBUSY.bit.SWRST != 0) {
/* Wait for sync */
}
} else {
tcc_refcount[t->index]--;
tcc_channels[t->index] &= ~(1 << tcc_channel(t));
if (tcc_refcount[t->index] == 0) {
target_tcc_frequencies[t->index] = 0;
Tcc* tcc = tcc_insts[t->index];
tcc_set_enable(tcc, false);
tcc->CTRLA.bit.SWRST = true;
while (tcc->SYNCBUSY.bit.SWRST != 0) {
/* Wait for sync */
}
//tcc_disable(&self->tcc_instance);
//tcc_reset(&self->tcc_instance);
}
}
reset_pin(self->pin->pin);
@ -290,36 +396,50 @@ void common_hal_pulseio_pwmout_deinit(pulseio_pwmout_obj_t* self) {
extern void common_hal_pulseio_pwmout_set_duty_cycle(pulseio_pwmout_obj_t* self, uint16_t duty) {
const pin_timer_t* t = self->timer;
uint8_t index;
if (t->is_tc) {
index = timer_index((uint32_t) self->timer->tc);
uint16_t adjusted_duty = timer_periods[index] * duty / 0xffff;
//tc_set_compare_value(&self->tc_instance, t->channel, adjusted_duty);
uint16_t adjusted_duty = tc_periods[t->index] * duty / 0xffff;
#ifdef SAMD21
tc_insts[t->index]->COUNT16.CC[t->wave_output].reg = adjusted_duty;
#endif
#ifdef SAMD51
tc_insts[t->index]->COUNT16.CCBUF[t->wave_output].reg = adjusted_duty;
#endif
} else {
index = timer_index((uint32_t) self->timer->tcc);
uint32_t adjusted_duty = ((uint64_t) timer_periods[index]) * duty / 0xffff;
//tcc_set_compare_value(&self->tcc_instance, t->channel, adjusted_duty);
uint32_t adjusted_duty = ((uint64_t) tcc_periods[t->index]) * duty / 0xffff;
uint8_t channel = tcc_channel(t);
tcc_insts[t->index]->CCBUF[channel].reg = adjusted_duty;
}
}
uint16_t common_hal_pulseio_pwmout_get_duty_cycle(pulseio_pwmout_obj_t* self) {
const pin_timer_t* t = self->timer;
if (t->is_tc) {
// while (tc_is_syncing(&self->tc_instance)) {
// /* Wait for sync */
// }
uint16_t cv = t->tc->COUNT16.CC[t->wave_output].reg;
return cv * 0xffff / timer_periods[timer_index((uint32_t) self->timer->tc)];
} else {
uint8_t channel = tcc_channel(timer_index(t->tcc), t->wave_output);
uint32_t cv = 0;
if ((t->tcc->STATUS.vec.CCBV & (1 << channel)) != 0) {
cv = t->tcc->CCB[channel].reg;
} else {
cv = t->tcc->CC[channel].reg;
Tc* tc = tc_insts[t->index];
while (tc->COUNT16.SYNCBUSY.reg != 0) {
/* Wait for sync */
}
uint16_t cv = tc->COUNT16.CC[t->wave_output].reg;
return cv * 0xffff / tc_periods[t->index];
} else {
Tcc* tcc = tcc_insts[t->index];
uint8_t channel = tcc_channel(t);
uint32_t cv = 0;
#ifdef SAMD21
if ((tcc->STATUS.vec.CCBV & (1 << channel)) != 0) {
cv = tcc->CCB[channel].reg;
} else {
cv = tcc->CC[channel].reg;
}
#endif
#ifdef SAMD51
if ((tcc->STATUS.vec.CCBUFV & (1 << channel)) != 0) {
cv = tcc->CCBUF[channel].reg;
} else {
cv = tcc->CC[channel].reg;
}
#endif
uint32_t duty_cycle = ((uint64_t) cv) * 0xffff / timer_periods[timer_index(t->tcc)];
uint32_t duty_cycle = ((uint64_t) cv) * 0xffff / tcc_periods[t->index];
return duty_cycle;
}
@ -338,7 +458,7 @@ void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self,
} else {
resolution = 24;
}
uint32_t system_clock = system_cpu_clock_get_hz();
uint32_t system_clock = common_hal_mcu_processor_get_frequency();
uint32_t new_top;
uint8_t new_divisor;
for (new_divisor = 0; new_divisor < 8; new_divisor++) {
@ -348,52 +468,60 @@ void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self,
}
}
uint16_t old_duty = common_hal_pulseio_pwmout_get_duty_cycle(self);
uint8_t old_divisor;
uint8_t index;
if (t->is_tc) {
index = timer_index(t->tc);
old_divisor = t->tc->COUNT16.CTRLA.bit.PRESCALER;
} else {
index = timer_index(t->tcc);
old_divisor = t->tcc->CTRLA.bit.PRESCALER;
}
if (new_divisor != old_divisor) {
if (t->is_tc) {
//tc_disable(&self->tc_instance);
t->tc->COUNT16.CTRLA.bit.PRESCALER = new_divisor;
//tc_enable(&self->tc_instance);
} else {
//tcc_disable(&self->tcc_instance);
t->tcc->CTRLA.bit.PRESCALER = new_divisor;
//tcc_enable(&self->tcc_instance);
Tc* tc = tc_insts[t->index];
uint8_t old_divisor = tc->COUNT16.CTRLA.bit.PRESCALER;
if (new_divisor != old_divisor) {
tc->COUNT16.CTRLA.bit.ENABLE = false;
while (tc->COUNT16.SYNCBUSY.bit.ENABLE != 0) {
/* Wait for sync */
}
tc->COUNT16.CTRLA.bit.PRESCALER = new_divisor;
tc->COUNT16.CTRLA.bit.ENABLE = true;
}
}
timer_periods[index] = new_top;
if (t->is_tc) {
// while (tc_is_syncing(&self->tc_instance)) {
// /* Wait for sync */
// }
t->tc->COUNT16.CC[0].reg = new_top;
tc_periods[t->index] = new_top;
while (tc->COUNT16.SYNCBUSY.reg != 0) {
/* Wait for sync */
}
#ifdef SAMD21
tc->COUNT16.CC[0].reg = new_top;
#endif
#ifdef SAMD51
tc->COUNT16.CCBUF[0].reg = new_top;
#endif
} else {
//tcc_set_top_value(&self->tcc_instance, new_top);
Tcc* tcc = tcc_insts[t->index];
uint8_t old_divisor = tcc->CTRLA.bit.PRESCALER;
if (new_divisor != old_divisor) {
tcc->CTRLA.bit.ENABLE = false;
while (tcc->SYNCBUSY.bit.ENABLE != 0) {
/* Wait for sync */
}
tcc->CTRLA.bit.PRESCALER = new_divisor;
tcc->CTRLA.bit.ENABLE = true;
}
tcc_periods[t->index] = new_top;
while (tcc->SYNCBUSY.reg != 0) {
/* Wait for sync */
}
tcc->PERBUF.bit.PERBUF = new_top;
}
common_hal_pulseio_pwmout_set_duty_cycle(self, old_duty);
}
uint32_t common_hal_pulseio_pwmout_get_frequency(pulseio_pwmout_obj_t* self) {
uint32_t system_clock = system_cpu_clock_get_hz();
uint32_t system_clock = common_hal_mcu_processor_get_frequency();
const pin_timer_t* t = self->timer;
uint8_t index;
uint8_t divisor;
uint32_t top;
if (t->is_tc) {
index = timer_index((uint32_t) self->timer->tc);
divisor = t->tc->COUNT16.CTRLA.bit.PRESCALER;
divisor = tc_insts[t->index]->COUNT16.CTRLA.bit.PRESCALER;
top = tc_periods[t->index];
} else {
index = timer_index((uint32_t) self->timer->tcc);
divisor = t->tcc->CTRLA.bit.PRESCALER;
divisor = tcc_insts[t->index]->CTRLA.bit.PRESCALER;
top = tcc_periods[t->index];
}
uint32_t top = timer_periods[index];
return (system_clock / prescaler[divisor]) / (top + 1);
}

View File

@ -112,7 +112,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
self->pin = carrier->pin->pin;
PortGroup *const port_base = PORT->GROUP[GPIO_PORT(self->pin)];
PortGroup *const port_base = &PORT->Group[GPIO_PORT(self->pin)];
self->pincfg = &port_base->PINCFG[self->pin % 32];
// Set the port to output a zero.
@ -131,7 +131,7 @@ void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self) {
if (common_hal_pulseio_pulseout_deinited(self)) {
return;
}
PortGroup *const port_base = port_get_group_from_gpio_pin(self->pin);
PortGroup *const port_base = &PORT->Group[GPIO_PORT(self->pin)];
port_base->DIRCLR.reg = 1 << (self->pin % 32);
turn_on(self->pincfg);
@ -139,8 +139,7 @@ void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self) {
refcount--;
if (refcount == 0) {
//tc_reset(MP_STATE_VM(pulseout_tc_instance));
m_free(MP_STATE_VM(pulseout_tc_instance));
MP_STATE_VM(pulseout_tc_instance) = NULL;
pulseout_tc_instance = NULL;
}
self->pin = NO_PIN;
}

View File

@ -43,16 +43,16 @@
}
#define TCC(p_tcc, p_wave_output) \
#define TCC(p_index, p_wave_output) \
{ \
.tcc = p_tcc, \
.index = p_index, \
.is_tc = false, \
.wave_output = p_wave_output \
}
#define TC(p_tc, p_wave_output) \
#define TC(p_index, p_wave_output) \
{ \
.tc = p_tc, \
.index = p_index - 3, \
.is_tc = true, \
.wave_output = p_wave_output \
}
@ -101,14 +101,14 @@ const mcu_pin_obj_t pin_## p_name = { \
PIN(PA00, EXTINT_CHANNEL(0), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(1, 0),
TCC(TCC2, 0),
TCC(2, 0),
NO_TIMER);
#endif
#ifdef PIN_PA01
PIN(PA01, EXTINT_CHANNEL(1), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(1, 1),
TCC(TCC2, 1),
TCC(2, 1),
NO_TIMER);
#endif
#ifdef PIN_PA02
@ -163,105 +163,105 @@ PIN(PB07, EXTINT_CHANNEL(7), ADC_INPUT(15), TOUCH(13),
PIN(PB08, EXTINT_CHANNEL(8), ADC_INPUT(2), TOUCH(14),
NO_SERCOM,
SERCOM(4, 0),
TC(TC4, 0),
TC(4, 0),
NO_TIMER);
#endif
#ifdef PIN_PB09
PIN(PB09, EXTINT_CHANNEL(9), ADC_INPUT(3), TOUCH(15),
NO_SERCOM,
SERCOM(4, 1),
TC(TC4, 1),
TC(4, 1),
NO_TIMER);
#endif
#ifdef PIN_PA04
PIN(PA04, EXTINT_CHANNEL(4), ADC_INPUT(4), TOUCH(2),
NO_SERCOM,
SERCOM(0, 0),
TCC(TCC0, 0),
TCC(0, 0),
NO_TIMER);
#endif
#ifdef PIN_PA05
PIN(PA05, EXTINT_CHANNEL(5), ADC_INPUT(5), TOUCH(3),
NO_SERCOM,
SERCOM(0, 1),
TCC(TCC0, 1),
TCC(0, 1),
NO_TIMER);
#endif
#ifdef PIN_PA06
PIN(PA06, EXTINT_CHANNEL(6), ADC_INPUT(6), TOUCH(4),
NO_SERCOM,
SERCOM(0, 2),
TCC(TCC1, 0),
TCC(1, 0),
NO_TIMER);
#endif
#ifdef PIN_PA07
PIN(PA07, EXTINT_CHANNEL(7), ADC_INPUT(7), TOUCH(5),
NO_SERCOM,
SERCOM(0, 3),
TCC(TCC1, 1),
TCC(1, 1),
NO_TIMER);
#endif
#ifdef PIN_PA08
PIN(PA08, NO_EXTINT, ADC_INPUT(16), NO_TOUCH,
SERCOM(0, 0),
SERCOM(2, 0),
TCC(TCC0, 0),
TCC(TCC1, 2));
TCC(0, 0),
TCC(1, 2));
#endif
#ifdef PIN_PA09
PIN(PA09, EXTINT_CHANNEL(9), ADC_INPUT(17), NO_TOUCH,
SERCOM(0, 1),
SERCOM(2, 1),
TCC(TCC0, 1),
TCC(TCC1, 3));
TCC(0, 1),
TCC(1, 3));
#endif
#ifdef PIN_PA10
PIN(PA10, EXTINT_CHANNEL(10), ADC_INPUT(18), NO_TOUCH,
SERCOM(0, 2),
SERCOM(2, 2),
TCC(TCC1, 0),
TCC(TCC0, 2));
TCC(1, 0),
TCC(0, 2));
#endif
#ifdef PIN_PA11
PIN(PA11, EXTINT_CHANNEL(11), ADC_INPUT(19), NO_TOUCH,
SERCOM(0, 3),
SERCOM(2, 3),
TCC(TCC1, 1),
TCC(TCC0, 3));
TCC(1, 1),
TCC(0, 3));
#endif
#ifdef PIN_PB10
PIN(PB10, EXTINT_CHANNEL(10), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(4, 2),
TC(TC5, 0),
TCC(TCC0, 4));
TC(5, 0),
TCC(0, 4));
#endif
#ifdef PIN_PB11
PIN(PB11, EXTINT_CHANNEL(11), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(4, 3),
TC(TC5, 1),
TCC(TCC0, 5));
TC(5, 1),
TCC(0, 5));
#endif
#ifdef PIN_PB12
PIN(PB12, EXTINT_CHANNEL(12), NO_ADC, NO_TOUCH,
SERCOM(4, 0),
NO_SERCOM,
TC(TC4, 0),
TCC(TCC0, 6));
TC(4, 0),
TCC(0, 6));
#endif
#ifdef PIN_PB13
PIN(PB13, EXTINT_CHANNEL(13), NO_ADC, NO_TOUCH,
SERCOM(4, 1),
NO_SERCOM,
TC(TC4, 1),
TCC(TCC0, 7));
TC(4, 1),
TCC(0, 7));
#endif
#ifdef PIN_PB14
PIN(PB14, EXTINT_CHANNEL(14), NO_ADC, NO_TOUCH,
SERCOM(4, 2),
NO_SERCOM,
TC(TC5, 0),
TC(5, 0),
NO_TIMER);
#endif
@ -270,22 +270,22 @@ PIN(PB14, EXTINT_CHANNEL(14), NO_ADC, NO_TOUCH,
PIN(PB15, EXTINT_CHANNEL(15), NO_ADC, NO_TOUCH,
SERCOM(4, 3),
NO_SERCOM,
TC(TC5, 1),
TC(5, 1),
NO_TIMER);
#endif
#ifdef PIN_PA12
PIN(PA12, EXTINT_CHANNEL(12), NO_ADC, NO_TOUCH,
SERCOM(2, 0),
SERCOM(4, 0),
TCC(TCC2, 0),
TCC(TCC0, 6));
TCC(2, 0),
TCC(0, 6));
#endif
#ifdef PIN_PA13
PIN(PA13, EXTINT_CHANNEL(13), NO_ADC, NO_TOUCH,
SERCOM(2, 1),
SERCOM(4, 1),
TCC(TCC2, 1),
TCC(TCC0, 7));
TCC(2, 1),
TCC(0, 7));
#endif
#ifdef PIN_PA14
PIN(PA14, EXTINT_CHANNEL(14), NO_ADC, NO_TOUCH,
@ -295,8 +295,8 @@ PIN(PA14, EXTINT_CHANNEL(14), NO_ADC, NO_TOUCH,
#else
NO_SERCOM,
#endif
TC(TC3, 0),
TCC(TCC0, 4));
TC(3, 0),
TCC(0, 4));
#endif
#ifdef PIN_PA15
PIN(PA15, EXTINT_CHANNEL(15), NO_ADC, NO_TOUCH,
@ -306,91 +306,87 @@ PIN(PA15, EXTINT_CHANNEL(15), NO_ADC, NO_TOUCH,
#else
NO_SERCOM,
#endif
TC(TC3, 1),
TCC(TCC0, 5));
TC(3, 1),
TCC(0, 5));
#endif
#ifdef PIN_PA16
PIN(PA16, EXTINT_CHANNEL(0), NO_ADC, NO_TOUCH,
SERCOM(1, 0),
SERCOM(3, 0),
TCC(TCC2, 0),
TCC(TCC0, 6));
TCC(2, 0),
TCC(0, 6));
#endif
#ifdef PIN_PA17
PIN(PA17, EXTINT_CHANNEL(1), NO_ADC, NO_TOUCH,
SERCOM(1, 1),
SERCOM(3, 1),
TCC(TCC2, 1),
TCC(TCC0, 7));
TCC(2, 1),
TCC(0, 7));
#endif
#ifdef PIN_PA18
PIN(PA18, EXTINT_CHANNEL(2), NO_ADC, NO_TOUCH,
SERCOM(1, 2),
SERCOM(3, 2),
TC(TC3, 0),
TCC(TCC0, 2));
TC(3, 0),
TCC(0, 2));
#endif
#ifdef PIN_PA19
PIN(PA19, EXTINT_CHANNEL(3), NO_ADC, NO_TOUCH,
SERCOM(1, 3),
SERCOM(3, 3),
TC(TC3, 1),
TCC(TCC0, 3));
TC(3, 1),
TCC(0, 3));
#endif
#ifdef PIN_PB16
PIN(PB16, EXTINT_CHANNEL(0), NO_ADC, NO_TOUCH,
SERCOM(5, 0),
NO_SERCOM,
#ifdef TC6
TC(TC6, 0),
TC(6, 0),
#else
NO_TIMER,
#endif
TCC(TCC0, 4));
TCC(0, 4));
#endif
#ifdef PIN_PB17
PIN(PB17, EXTINT_CHANNEL(1), NO_ADC, NO_TOUCH,
SERCOM(5, 1),
NO_SERCOM,
#ifdef TC6
TC(TC6, 1),
TC(6, 1),
#else
NO_TIMER,
#endif
TCC(TCC0, 5));
TCC(0, 5));
#endif
#ifdef PIN_PA20
PIN(PA20, EXTINT_CHANNEL(4), NO_ADC, NO_TOUCH,
SERCOM(5, 2),
SERCOM(3, 2),
#ifdef TC7
TC(TC7, 0),
TC(7, 0),
#else
NO_TIMER,
#endif
TCC(TCC0, 6));
TCC(0, 6));
#endif
#ifdef PIN_PA21
PIN(PA21, EXTINT_CHANNEL(5), NO_ADC, NO_TOUCH,
SERCOM(5, 3),
SERCOM(3, 3),
#ifdef TC7
TC(TC7, 1),
TC(7, 1),
#else
NO_TIMER,
#endif
TCC(TCC0, 7));
TCC(0, 7));
#endif
#ifdef PIN_PA22
PIN(PA22, EXTINT_CHANNEL(6), NO_ADC, NO_TOUCH,
SERCOM(3, 0),
#ifdef SERCOM5
SERCOM(5, 0),
#else
NO_SERCOM,
#endif,
TC(TC4, 0),
TCC(TCC0, 4));
#els0, 4));
#endif
#ifdef PIN_PA23
PIN(PA23, EXTINT_CHANNEL(7), NO_ADC, NO_TOUCH,
@ -400,8 +396,8 @@ PIN(PA23, EXTINT_CHANNEL(7), NO_ADC, NO_TOUCH,
#else
NO_SERCOM,
#endif
TC(TC4, 1),
TCC(TCC0, 5));
TC(4, 1),
TCC(0, 5));
#endif
#ifdef PIN_PA24
PIN(PA24, EXTINT_CHANNEL(12), NO_ADC, NO_TOUCH,
@ -411,8 +407,8 @@ PIN(PA24, EXTINT_CHANNEL(12), NO_ADC, NO_TOUCH,
#else
NO_SERCOM,
#endif
TC(TC5, 0),
TCC(TCC0, 2));
TC(5, 0),
TCC(0, 2));
#endif
#ifdef PIN_PA25
PIN(PA25, EXTINT_CHANNEL(13), NO_ADC, NO_TOUCH,
@ -422,15 +418,15 @@ PIN(PA25, EXTINT_CHANNEL(13), NO_ADC, NO_TOUCH,
#else
NO_SERCOM,
#endif
TC(TC5, 1),
TCC(TCC1, 3));
TC(5, 1),
TCC(1, 3));
#endif
#ifdef PIN_PB22
PIN(PB22, EXTINT_CHANNEL(6), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(5, 2),
#ifdef TC7
TC(TC7, 0, 0),
TC(7, 0, 0),
#else
NO_TIMER,
#endif
@ -441,7 +437,7 @@ PIN(PB23, EXTINT_CHANNEL(7), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(5, 3),
#ifdef TC7
TC(TC7, 1, 1),
TC(7, 1, 1),
#else
NO_TIMER,
#endif
@ -465,36 +461,36 @@ PIN(PA28, EXTINT_CHANNEL(8), NO_ADC, NO_TOUCH,
PIN(PA30, EXTINT_CHANNEL(10), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(1, 2),
TCC(TCC1, 0),
TCC(1, 0),
NO_TIMER);
#endif
#ifdef PIN_PA31
PIN(PA31, EXTINT_CHANNEL(11), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(1, 3),
TCC(TCC1, 1),
TCC(1, 1),
NO_TIMER);
#endif
#ifdef PIN_PB30
PIN(PB30, EXTINT_CHANNEL(14), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(5, 0),
TCC(TCC0, 0),
TCC(TCC1, 2));
TCC(0, 0),
TCC(1, 2));
#endif
#ifdef PIN_PB31
PIN(PB31, EXTINT_CHANNEL(15), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(5, 1),
TCC(TCC0, 1),
TCC(TCC1, 3));
TCC(0, 1),
TCC(1, 3));
#endif
#ifdef PIN_PB00
PIN(PB00, EXTINT_CHANNEL(0), ADC_INPUT(8), TOUCH(6),
NO_SERCOM,
SERCOM(5, 2),
#ifdef TC7
TC(TC7, 0, 0),
TC(7, 0, 0),
#else
NO_TIMER,
#endif
@ -505,7 +501,7 @@ PIN(PB01, EXTINT_CHANNEL(1), ADC_INPUT(9), TOUCH(7),
NO_SERCOM,
SERCOM(5, 3)),
#ifdef TC7
TC(TC7, 1),
TC(7, 1),
#else
NO_TIMER,
#endif
@ -516,7 +512,7 @@ PIN(PB02, EXTINT_CHANNEL(2), ADC_INPUT(10), TOUCH(8),
NO_SERCOM,
SERCOM(5, 0),
#ifdef TC6
TC(TC6, 0),
TC(6, 0),
#else
NO_TIMER,
#endif
@ -527,7 +523,7 @@ PIN(PB03, EXTINT_CHANNEL(3), ADC_INPUT(11), TOUCH(9),
NO_SERCOM,
SERCOM(5, 1),
#ifdef TC6
TC(TC6, 1),
TC(6, 1),
#else
NO_TIMER,
#endif

View File

@ -42,21 +42,21 @@
.pad = 0 \
}
#define TCC(p_tcc, p_wave_output) \
#define TCC(p_index, p_wave_output) \
{ \
.tcc = p_tcc, \
.index = p_index, \
.is_tc = false, \
.wave_output = p_wave_output \
}
#define TC(p_tc, p_wave_output) \
#define TC(p_index, p_wave_output) \
{ \
.tc = p_tc, \
.index = p_index, \
.is_tc = true, \
.wave_output = p_wave_output \
}
#define NO_TIMER TCC(0, 0)
#define NO_TIMER TCC(0xff, 0)
#define TOUCH(y_line) \
.has_touch = true, \
@ -102,7 +102,7 @@ PIN(PB03, EXTINT_CHANNEL(3), ADC_INPUT(15), NO_ADC,
NO_SERCOM,
SERCOM(5, 1),
#ifdef TC6
TC(TC6, 1),
TC(6, 1),
#else
NO_TIMER,
#endif
@ -114,7 +114,7 @@ PIN(PA00, EXTINT_CHANNEL(0), NO_ADC, NO_ADC,
NO_TOUCH,
NO_SERCOM,
SERCOM(1, 0),
TC(TC2, 0),
TC(2, 0),
NO_TIMER,
NO_TIMER);
#endif
@ -123,7 +123,7 @@ PIN(PA01, EXTINT_CHANNEL(1), NO_ADC, NO_ADC,
NO_TOUCH,
NO_SERCOM,
SERCOM(1, 1),
TC(TC2, 0),
TC(2, 0),
NO_TIMER,
NO_TIMER);
#endif
@ -254,7 +254,7 @@ PIN(PB08, EXTINT_CHANNEL(8), ADC_INPUT(2), ADC_INPUT(0), TOUCH(1),
NO_SERCOM,
SERCOM(4, 0),
#ifdef TC4
TC(TC4, 0),
TC(4, 0),
#else
NO_TIMER,
#endif
@ -266,7 +266,7 @@ PIN(PB09, EXTINT_CHANNEL(9), ADC_INPUT(3), ADC_INPUT(1), TOUCH(2),
NO_SERCOM,
SERCOM(4, 1),
#ifdef TC4
TC(TC4, 1),
TC(4, 1),
#else
NO_TIMER,
#endif
@ -277,7 +277,7 @@ PIN(PB09, EXTINT_CHANNEL(9), ADC_INPUT(3), ADC_INPUT(1), TOUCH(2),
PIN(PA04, EXTINT_CHANNEL(4), ADC_INPUT(4), NO_ADC, TOUCH(3),
NO_SERCOM,
SERCOM(0, 0),
TC(TC0, 0),
TC(0, 0),
NO_TIMER,
NO_TIMER);
#endif
@ -285,7 +285,7 @@ PIN(PA04, EXTINT_CHANNEL(4), ADC_INPUT(4), NO_ADC, TOUCH(3),
PIN(PA05, EXTINT_CHANNEL(5), ADC_INPUT(5), NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(0, 1),
TC(TC0, 1),
TC(0, 1),
NO_TIMER,
NO_TIMER);
#endif
@ -293,7 +293,7 @@ PIN(PA05, EXTINT_CHANNEL(5), ADC_INPUT(5), NO_ADC, NO_TOUCH,
PIN(PA06, EXTINT_CHANNEL(6), ADC_INPUT(6), NO_ADC, TOUCH(4),
NO_SERCOM,
SERCOM(0, 2),
TC(TC1, 0),
TC(1, 0),
NO_TIMER,
NO_TIMER);
#endif
@ -303,7 +303,7 @@ PIN(PA06, EXTINT_CHANNEL(6), ADC_INPUT(6), NO_ADC, TOUCH(4),
PIN(PA07, EXTINT_CHANNEL(7), ADC_INPUT(7), NO_ADC, TOUCH(5),
NO_SERCOM,
SERCOM(0, 3),
TC(TC1, 1),
TC(1, 1),
NO_TIMER,
NO_TIMER);
#endif
@ -316,7 +316,7 @@ PIN(PC04, EXTINT_CHANNEL(4), NO_ADC, NO_ADC, NO_TOUCH,
#endif
NO_SERCOM,
NO_TIMER,
TCC(TCC0, 0),
TCC(0, 0),
NO_TIMER);
#endif
#ifdef PIN_PC05
@ -359,57 +359,57 @@ PIN(PC07, EXTINT_CHANNEL(7), NO_ADC, NO_ADC, NO_TOUCH,
PIN(PA08, NO_EXTINT, ADC_INPUT(8), ADC_INPUT(2), TOUCH(6),
SERCOM(0, 0),
SERCOM(2, 1),
TC(TC0, 0),
TCC(TCC0, 0),
TCC(TCC1, 4));
TC(0, 0),
TCC(0, 0),
TCC(1, 4));
#endif
#ifdef PIN_PA09
PIN(PA09, EXTINT_CHANNEL(9), ADC_INPUT(9), ADC_INPUT(3), TOUCH(7),
SERCOM(0, 1),
SERCOM(2, 0),
TC(TC0, 1),
TCC(TCC0, 1),
TCC(TCC1, 5));
TC(0, 1),
TCC(0, 1),
TCC(1, 5));
#endif
#ifdef PIN_PA10
PIN(PA10, EXTINT_CHANNEL(10), ADC_INPUT(10), NO_ADC, TOUCH(8),
SERCOM(0, 2),
SERCOM(2, 2),
TC(TC1, 0),
TCC(TCC0, 2),
TCC(TCC1, 6));
TC(1, 0),
TCC(0, 2),
TCC(1, 6));
#endif
#ifdef PIN_PA11
PIN(PA11, EXTINT_CHANNEL(11), ADC_INPUT(11), NO_ADC, TOUCH(9),
SERCOM(0, 3),
SERCOM(2, 3),
TC(TC1, 0),
TCC(TCC0, 3),
TCC(TCC1, 7));
TC(1, 0),
TCC(0, 3),
TCC(1, 7));
#endif
#ifdef PIN_PB10
PIN(PB10, EXTINT_CHANNEL(10), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(4, 2),
#ifdef TC5
TC(TC5, 0),
TC(5, 0),
#else
NO_TIMER,
#endif
TCC(TCC0, 4),
TCC(TCC1, 0));
TCC(0, 4),
TCC(1, 0));
#endif
#ifdef PIN_PB11
PIN(PB11, EXTINT_CHANNEL(11), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
SERCOM(4, 3),
#ifdef TC5
TC(TC5, 1),
TC(5, 1),
#else
NO_TIMER,
#endif
TCC(TCC0, 5),
TCC(TCC1, 1));
TCC(0, 5),
TCC(1, 1));
#endif
#ifdef PIN_PB12
PIN(PB12, EXTINT_CHANNEL(12), NO_ADC, NO_ADC,
@ -421,16 +421,16 @@ PIN(PB12, EXTINT_CHANNEL(12), NO_ADC, NO_ADC,
SERCOM(4, 0),
NO_SERCOM,
#ifdef TC4
TC(TC4, 0),
TC(4, 0),
#else
NO_TIMER,
#endif
#ifdef TCC3
TCC(TCC3, 0),
TCC(3, 0),
#else
NO_TIMER,
#endif
TCC(TCC0, 0));
TCC(0, 0));
#endif
#ifdef PIN_PB13
PIN(PB13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC,
@ -442,16 +442,16 @@ PIN(PB13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC,
SERCOM(4, 1),
NO_SERCOM,
#ifdef TC4
TC(TC4, 1),
TC(4, 1),
#else
NO_TIMER,
#endif
#ifdef TCC3
TCC(TCC3, 1),
TCC(3, 1),
#else
NO_TIMER,
#endif
TCC(TCC0, 1));
TCC(0, 1));
#endif
#ifdef PIN_PB14
PIN(PB14, EXTINT_CHANNEL(14), NO_ADC, NO_ADC,
@ -463,16 +463,16 @@ PIN(PB14, EXTINT_CHANNEL(14), NO_ADC, NO_ADC,
SERCOM(4, 2),
NO_SERCOM,
#ifdef TC5
TC(TC5, 0),
TC(5, 0),
#else
NO_TIMER,
#endif
#ifdef TCC4
TCC(TCC4, 0),
TCC(4, 0),
#else
NO_TIMER,
#endif
TCC(TCC0, 2));
TCC(0, 2));
#endif
#ifdef PIN_PB15
PIN(PB15, EXTINT_CHANNEL(15), NO_ADC, NO_ADC,
@ -484,16 +484,16 @@ PIN(PB15, EXTINT_CHANNEL(15), NO_ADC, NO_ADC,
SERCOM(4, 3),
NO_SERCOM,
#ifdef TC5
TC(TC5, 1),
TC(5, 1),
#else
NO_TIMER,
#endif
#ifdef TCC4
TCC(TCC4, 1),
TCC(4, 1),
#else
NO_TIMER,
#endif
TCC(TCC0, 3));
TCC(0, 3));
#endif
#ifdef PIN_PD08
PIN(PD08, EXTINT_CHANNEL(3), NO_ADC, NO_ADC,
@ -509,7 +509,7 @@ PIN(PD08, EXTINT_CHANNEL(3), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 1),
TCC(0, 1),
NO_TIMER);
#endif
#ifdef PIN_PD09
@ -526,7 +526,7 @@ PIN(PD09, EXTINT_CHANNEL(4), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 2),
TCC(0, 2),
NO_TIMER);
#endif
#ifdef PIN_PD10
@ -543,7 +543,7 @@ PIN(PD10, EXTINT_CHANNEL(5), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 3),
TCC(0, 3),
NO_TIMER);
#endif
#ifdef PIN_PD11
@ -560,7 +560,7 @@ PIN(PD11, EXTINT_CHANNEL(6), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 4),
TCC(0, 4),
NO_TIMER);
#endif
#ifdef PIN_PD12
@ -569,7 +569,7 @@ PIN(PD12, EXTINT_CHANNEL(7), NO_ADC, NO_ADC,
NO_SERCOM,
NO_SERCOM,
NO_TIMER,
TCC(TCC0, 5),
TCC(0, 5),
NO_TIMER);
#endif
#ifdef PIN_PC10
@ -586,8 +586,8 @@ PIN(PC10, EXTINT_CHANNEL(10), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 0),
TCC(TCC1, 4));
TCC(0, 0),
TCC(1, 4));
#endif
#ifdef PIN_PC11
PIN(PC11, EXTINT_CHANNEL(11), NO_ADC, NO_ADC,
@ -603,8 +603,8 @@ PIN(PC11, EXTINT_CHANNEL(11), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 1),
TCC(TCC1, 5));
TCC(0, 1),
TCC(1, 5));
#endif
#ifdef PIN_PC12
PIN(PC12, EXTINT_CHANNEL(12), NO_ADC, NO_ADC,
@ -620,8 +620,8 @@ PIN(PC12, EXTINT_CHANNEL(12), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 2),
TCC(TCC1, 6));
TCC(0, 2),
TCC(1, 6));
#endif
#ifdef PIN_PC13
PIN(PC13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC,
@ -637,8 +637,8 @@ PIN(PC13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 3),
TCC(TCC1, 7));
TCC(0, 3),
TCC(1, 7));
#endif
#ifdef PIN_PC14
PIN(PC14, EXTINT_CHANNEL(14), NO_ADC, NO_ADC,
@ -654,8 +654,8 @@ PIN(PC14, EXTINT_CHANNEL(14), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 4),
TCC(TCC1, 0));
TCC(0, 4),
TCC(1, 0));
#endif
#ifdef PIN_PC15
PIN(PC15, EXTINT_CHANNEL(15), NO_ADC, NO_ADC,
@ -671,24 +671,24 @@ PIN(PC15, EXTINT_CHANNEL(15), NO_ADC, NO_ADC,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC0, 5),
TCC(TCC1, 1));
TCC(0, 5),
TCC(1, 1));
#endif
#ifdef PIN_PA12
PIN(PA12, EXTINT_CHANNEL(12), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 0),
SERCOM(4, 1),
TC(TC2, 0),
TCC(TCC0, 6),
TCC(TCC1, 2));
TC(2, 0),
TCC(0, 6),
TCC(1, 2));
#endif
#ifdef PIN_PA13
PIN(PA13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 1),
SERCOM(4, 0),
TC(TC2, 1),
TCC(TCC0, 7),
TCC(TCC1, 3));
TC(2, 1),
TCC(0, 7),
TCC(1, 3));
#endif
// Third page
@ -696,49 +696,49 @@ PIN(PA13, EXTINT_CHANNEL(13), NO_ADC, NO_ADC, NO_TOUCH,
PIN(PA14, EXTINT_CHANNEL(14), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 2),
SERCOM(4, 2),
TC(TC3, 0),
TCC(TCC2, 0),
TCC(TCC1, 2));
TC(3, 0),
TCC(2, 0),
TCC(1, 2));
#endif
#ifdef PIN_PA15
PIN(PA15, EXTINT_CHANNEL(15), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 3),
SERCOM(4, 3),
TC(TC3, 1),
TCC(TCC2, 1),
TCC(TCC1, 3));
TC(3, 1),
TCC(2, 1),
TCC(1, 3));
#endif
#ifdef PIN_PA16
PIN(PA16, EXTINT_CHANNEL(0), NO_ADC, NO_ADC, TOUCH(10),
SERCOM(1, 0),
SERCOM(3, 1),
TC(TC2, 0),
TCC(TCC1, 0),
TCC(TCC0, 4));
TC(2, 0),
TCC(1, 0),
TCC(0, 4));
#endif
#ifdef PIN_PA17
PIN(PA17, EXTINT_CHANNEL(1), NO_ADC, NO_ADC, TOUCH(11),
SERCOM(1, 1),
SERCOM(3, 0),
TC(TC2, 1),
TCC(TCC1, 1),
TCC(TCC0, 5));
TC(2, 1),
TCC(1, 1),
TCC(0, 5));
#endif
#ifdef PIN_PA18
PIN(PA18, EXTINT_CHANNEL(2), NO_ADC, NO_ADC, TOUCH(12),
SERCOM(1, 2),
SERCOM(3, 2),
TC(TC3, 0),
TCC(TCC1, 2),
TCC(TCC0, 6));
TC(3, 0),
TCC(1, 2),
TCC(0, 6));
#endif
#ifdef PIN_PA19
PIN(PA19, EXTINT_CHANNEL(3), NO_ADC, NO_ADC, TOUCH(13),
SERCOM(1, 3),
SERCOM(3, 3),
TC(TC3, 1),
TCC(TCC1, 3),
TCC(TCC0, 7));
TC(3, 1),
TCC(1, 3),
TCC(0, 7));
#endif
#ifdef PIN_PC16
PIN(PC16, EXTINT_CHANNEL(0), NO_ADC, NO_ADC,
@ -763,7 +763,7 @@ PIN(PC17, EXTINT_CHANNEL(1), NO_ADC, NO_ADC,
#endif
SERCOM(0, 0),
NO_TIMER,
TCC(TCC0, 1),
TCC(0, 1),
NO_TIMER);
#endif
#ifdef PIN_PC18
@ -776,7 +776,7 @@ PIN(PC18, EXTINT_CHANNEL(2), NO_ADC, NO_ADC,
#endif
SERCOM(0, 2),
NO_TIMER,
TCC(TCC0, 2),
TCC(0, 2),
NO_TIMER);
#endif
#ifdef PIN_PC19
@ -789,7 +789,7 @@ PIN(PC19, EXTINT_CHANNEL(3), NO_ADC, NO_ADC,
#endif
SERCOM(0, 3),
NO_TIMER,
TCC(TCC0, 3),
TCC(0, 3),
NO_TIMER);
#endif
#ifdef PIN_PC20
@ -798,7 +798,7 @@ PIN(PC20, EXTINT_CHANNEL(4), NO_ADC, NO_ADC,
NO_SERCOM,
NO_SERCOM,
NO_TIMER,
TCC(TCC0, 4),
TCC(0, 4),
NO_TIMER);
#endif
#ifdef PIN_PC21
@ -807,7 +807,7 @@ PIN(PC21, EXTINT_CHANNEL(5), NO_ADC, NO_ADC,
NO_SERCOM,
NO_SERCOM,
NO_TIMER,
TCC(TCC0, 5),
TCC(0, 5),
NO_TIMER);
#endif
#ifdef PIN_PC22
@ -816,7 +816,7 @@ PIN(PC22, EXTINT_CHANNEL(6), NO_ADC, NO_ADC,
SERCOM(1, 0),
SERCOM(3, 1),
NO_TIMER,
TCC(TCC0, 6),
TCC(0, 6),
NO_TIMER);
#endif
#ifdef PIN_PC23
@ -825,7 +825,7 @@ PIN(PC23, EXTINT_CHANNEL(7), NO_ADC, NO_ADC,
SERCOM(1, 1),
SERCOM(3, 0),
NO_TIMER,
TCC(TCC0, 7),
TCC(0, 7),
NO_TIMER);
#endif
#ifdef PIN_PD20
@ -834,7 +834,7 @@ PIN(PD20, EXTINT_CHANNEL(10), NO_ADC, NO_ADC,
SERCOM(1, 2),
SERCOM(3, 2),
NO_TIMER,
TCC(TCC1, 0),
TCC(1, 0),
NO_TIMER);
#endif
#ifdef PIN_PD21
@ -843,7 +843,7 @@ PIN(PD21, EXTINT_CHANNEL(11), NO_ADC, NO_ADC,
SERCOM(1, 3),
SERCOM(3, 3),
NO_TIMER,
TCC(TCC1, 1),
TCC(1, 1),
NO_TIMER);
#endif
@ -855,24 +855,24 @@ PIN(PB16, EXTINT_CHANNEL(0), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(5, 0),
NO_SERCOM,
#ifdef TC6
TC(TC6, 0),
TC(6, 0),
#else
NO_TIMER,
#endif
TCC(TCC3, 0),
TCC(TCC0, 4));
TCC(3, 0),
TCC(0, 4));
#endif
#ifdef PIN_PB17
PIN(PB17, EXTINT_CHANNEL(1), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(5, 1),
NO_SERCOM,
#ifdef TC6
TC(TC6, 1),
TC(6, 1),
#else
NO_TIMER,
#endif
TCC(TCC3, 1),
TCC(TCC0, 5));
TCC(3, 1),
TCC(0, 5));
#endif
#ifdef PIN_PB18
PIN(PB18, EXTINT_CHANNEL(2), NO_ADC, NO_ADC, NO_TOUCH,
@ -883,7 +883,7 @@ PIN(PB18, EXTINT_CHANNEL(2), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC1, 0),
TCC(1, 0),
NO_TIMER);
#endif
#ifdef PIN_PB19
@ -895,7 +895,7 @@ PIN(PB19, EXTINT_CHANNEL(3), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC1, 1),
TCC(1, 1),
NO_TIMER);
#endif
#ifdef PIN_PB20
@ -907,7 +907,7 @@ PIN(PB20, EXTINT_CHANNEL(4), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC1, 2),
TCC(1, 2),
NO_TIMER);
#endif
#ifdef PIN_PB21
@ -919,7 +919,7 @@ PIN(PB21, EXTINT_CHANNEL(5), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
NO_TIMER,
TCC(TCC1, 3),
TCC(1, 3),
NO_TIMER);
#endif
#ifdef PIN_PA20
@ -927,59 +927,59 @@ PIN(PA20, EXTINT_CHANNEL(4), NO_ADC, NO_ADC, TOUCH(14),
SERCOM(5, 2),
SERCOM(3, 2),
#ifdef TC7
TC(TC7, 0),
TC(7, 0),
#else
NO_TIMER,
#endif
TCC(TCC1, 4),
TCC(TCC0, 0));
TCC(1, 4),
TCC(0, 0));
#endif
#ifdef PIN_PA21
PIN(PA21, EXTINT_CHANNEL(5), NO_ADC, NO_ADC, TOUCH(15),
SERCOM(5, 3),
SERCOM(3, 3),
#ifdef TC7
TC(TC7, 1),
TC(7, 1),
#else
NO_TIMER,
#endif
TCC(TCC1, 5),
TCC(TCC0, 1));
TCC(1, 5),
TCC(0, 1));
#endif
#ifdef PIN_PA22
PIN(PA22, EXTINT_CHANNEL(6), NO_ADC, NO_ADC, TOUCH(16),
SERCOM(3, 0),
SERCOM(5, 1),
#ifdef TC4
TC(TC4, 0),
TC(4, 0),
#else
NO_TIMER,
#endif
TCC(TCC1, 6),
TCC(TCC0, 2));
TCC(1, 6),
TCC(0, 2));
#endif
#ifdef PIN_PA23
PIN(PA23, EXTINT_CHANNEL(7), NO_ADC, NO_ADC, TOUCH(17),
SERCOM(3, 1),
SERCOM(5, 0),
#ifdef TC4
TC(TC4, 1),
TC(4, 1),
#else
NO_TIMER,
#endif
TCC(TCC1, 7),
TCC(TCC0, 3));
TCC(1, 7),
TCC(0, 3));
#endif
#ifdef PIN_PA24
PIN(PA24, EXTINT_CHANNEL(8), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(3, 2),
SERCOM(5, 2),
#ifdef TC5
TC(TC5, 0),
TC(5, 0),
#else
NO_TIMER,
#endif
TCC(TCC2, 2),
TCC(2, 2),
NO_TIMER);
#endif
#ifdef PIN_PA25
@ -987,7 +987,7 @@ PIN(PA25, EXTINT_CHANNEL(9), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(3, 3),
SERCOM(5, 3),
#ifdef TC5
TC(TC5, 1),
TC(5, 1),
#else
NO_TIMER,
#endif
@ -1001,7 +1001,7 @@ PIN(PB22, EXTINT_CHANNEL(6), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(1, 2),
SERCOM(5, 2),
#ifdef TC7
TC(TC7, 0),
TC(7, 0),
#else
NO_TIMER,
#endif
@ -1013,7 +1013,7 @@ PIN(PB23, EXTINT_CHANNEL(7), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(1, 3),
SERCOM(5, 3),
#ifdef TC7
TC(TC7, 1),
TC(7, 1),
#else
NO_TIMER,
#endif
@ -1049,7 +1049,7 @@ PIN(PB27, EXTINT_CHANNEL(13), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 1),
SERCOM(4, 0),
NO_TIMER,
TCC(TCC1, 3),
TCC(1, 3),
NO_TIMER);
#endif
#ifdef PIN_PB28
@ -1057,7 +1057,7 @@ PIN(PB28, EXTINT_CHANNEL(14), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 2),
SERCOM(4, 2),
NO_TIMER,
TCC(TCC1, 4),
TCC(1, 4),
NO_TIMER);
#endif
#ifdef PIN_PB29
@ -1065,7 +1065,7 @@ PIN(PB29, EXTINT_CHANNEL(15), NO_ADC, NO_ADC, NO_TOUCH,
SERCOM(2, 3),
SERCOM(4, 3),
NO_TIMER,
TCC(TCC1, 5),
TCC(1, 5),
NO_TIMER);
#endif
#ifdef PIN_PC24
@ -1125,11 +1125,11 @@ PIN(PA30, EXTINT_CHANNEL(14), NO_ADC, NO_ADC, TOUCH(19),
#endif
SERCOM(1, 2),
#ifdef TC6
TC(TC6, 0),
TC(6, 0),
#else
NO_TIMER,
#endif
TCC(TCC2, 0),
TCC(2, 0),
NO_TIMER);
#endif
#ifdef PIN_PA31
@ -1141,11 +1141,11 @@ PIN(PA31, EXTINT_CHANNEL(15), NO_ADC, NO_ADC, NO_TOUCH,
#endif
SERCOM(1, 23),
#ifdef TC6
TC(TC6, 1),
TC(6, 1),
#else
NO_TIMER,
#endif
TCC(TCC2, 1),
TCC(2, 1),
NO_TIMER);
#endif
#ifdef PIN_PB30
@ -1156,9 +1156,9 @@ PIN(PB30, EXTINT_CHANNEL(14), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
SERCOM(5, 1),
TC(TC0, 0),
TCC(TCC4, 0),
TCC(TCC0, 6));
TC(0, 0),
TCC(4, 0),
TCC(0, 6));
#endif
#ifdef PIN_PB31
PIN(PB31, EXTINT_CHANNEL(15), NO_ADC, NO_ADC, NO_TOUCH,
@ -1168,9 +1168,9 @@ PIN(PB31, EXTINT_CHANNEL(15), NO_ADC, NO_ADC, NO_TOUCH,
NO_SERCOM,
#endif
SERCOM(5, 0),
TC(TC0, 1),
TCC(TCC4, 1),
TCC(TCC0, 7));
TC(0, 1),
TCC(4, 1),
TCC(0, 7));
#endif
#ifdef PIN_PC30
PIN(PC30, EXTINT_CHANNEL(14), NO_ADC, ADC_INPUT(12), NO_TOUCH,
@ -1200,7 +1200,7 @@ PIN(PB00, EXTINT_CHANNEL(0), ADC_INPUT(12), NO_ADC,
NO_SERCOM,
SERCOM(5, 2),
#ifdef TC7
TC(TC7, 0),
TC(7, 0),
#else
NO_TIMER,
#endif
@ -1217,7 +1217,7 @@ PIN(PB01, EXTINT_CHANNEL(1), ADC_INPUT(13), NO_ADC,
NO_SERCOM,
SERCOM(5, 3),
#ifdef TC7
TC(TC7, 1),
TC(7, 1),
#else
NO_TIMER,
#endif
@ -1229,10 +1229,10 @@ PIN(PB02, EXTINT_CHANNEL(2), ADC_INPUT(14), NO_ADC, TOUCH(20),
NO_SERCOM,
SERCOM(5, 0),
#ifdef TC6
TC(TC6, 0),
TC(6, 0),
#else
NO_TIMER,
#endif
TCC(TCC2, 2),
TCC(2, 2),
NO_TIMER);
#endif