Skip to content

Commit

Permalink
Merge pull request #66 from GMagician/fix
Browse files Browse the repository at this point in the history
Address #21
  • Loading branch information
ladyada authored Jun 13, 2019
2 parents 49723b4 + fc07de0 commit 926fb6e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/init_samd51.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ void system_init(void) {
NVMCTRL->CTRLA.reg |= NVMCTRL_CTRLA_RWS(0);

// Output GCLK0 to Metro M4 D5. This way we can see if/when we mess it up.
PORT->Group[1].PINCFG[14].bit.PMUXEN = true;
PORT->Group[1].PMUX[7].bit.PMUXE = 12;
//PORT->Group[1].PINCFG[14].bit.PMUXEN = true;
//PORT->Group[1].PMUX[7].bit.PMUXE = 12;

/* Software reset the module to ensure it is re-initialized correctly */
/* Note: Due to synchronization, there is a delay from writing CTRL.SWRST until the reset is complete.
Expand Down
7 changes: 3 additions & 4 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,9 @@
* SAM-BA code will be located at 0x0 and executed before any applicative code.
*
* Applications compiled to be executed along with the bootloader will start at
* 0x2000
* Before jumping to the application, the bootloader changes the VTOR register
* to use the interrupt vectors of the application @0x2000.<- not required as
* application code is taking care of this
* 0x2000 (samd21) or 0x4000 (samd51)
* The bootloader doesn't changes the VTOR register, application code is
* taking care of this.
*
*/

Expand Down

0 comments on commit 926fb6e

Please sign in to comment.