djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #403 from tannewt/fix_swclk51 

atmel-samd: Fix SAMD51 SWCLK reset so we can connect the JLink
This commit is contained in:
Dan Halbert 2017-11-02 17:56:34 -04:00 committed by GitHub
parent e267b2c666 c90a2d9b42
commit e7d6df7f7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/atmel-samd/common-hal/microcontroller/Pin.c
View File

@ -52,12 +52,9 @@ void reset_all_pins(void) {
uint32_t pin_mask[PORT_BITS / 32 + 1] = PORT_OUT_IMPLEMENTED; uint32_t pin_mask[PORT_BITS / 32 + 1] = PORT_OUT_IMPLEMENTED;
// Do not full reset USB or SWD lines. // Do not full reset USB or SWD lines.
pin_mask[0] &= ~(PORT_PA24 | PORT_PA25 | PORT_PA30); pin_mask[0] &= ~(PORT_PA24 | PORT_PA25 | PORT_PA30 | PORT_PA31);
// The SWO pin changes between the 21 and 51. #ifdef SAMD21
#ifdef PORT_PB30H_CM4_SWO
pin_mask[1] &= ~(PORT_PB30);
#else
pin_mask[0] &= ~(PORT_PA31); pin_mask[0] &= ~(PORT_PA31);
#endif #endif
@ -71,11 +68,10 @@ void reset_all_pins(void) {
#endif #endif
// Configure SWD // Configure SWD
gpio_set_pin_direction(PIN_PA30, GPIO_DIRECTION_OUT);
#ifdef SAMD51 #ifdef SAMD51
gpio_set_pin_function(PIN_PB30, MUX_PB30H_CM4_SWO); gpio_set_pin_function(PIN_PA30, MUX_PA30H_CM4_SWCLK);
gpio_set_pin_direction(PIN_PB30, GPIO_DIRECTION_OUT); // SWDIO will be automatically switched on PA31 when a signal is input on
gpio_set_pin_function(PIN_PB30, MUX_PB30H_CM4_SWO); // SWCLK.
#endif #endif
#ifdef SAMD21 #ifdef SAMD21
//gpio_set_pin_function(PIN_PA30, GPIO_PIN_FUNCTION_G); //gpio_set_pin_function(PIN_PA30, GPIO_PIN_FUNCTION_G);
@ -126,7 +122,7 @@ void reset_pin(uint8_t pin) {
if (pin == PIN_PA30 if (pin == PIN_PA30
#ifdef SAMD51 #ifdef SAMD51
|| pin == PIN_PB30) { ) {
gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_H); gpio_set_pin_function(pin, GPIO_PIN_FUNCTION_H);
#endif #endif
#ifdef SAMD21 #ifdef SAMD21