From 2ebd47ab534c723ad30a8bb2e87b126eda2f579e Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 3 Sep 2013 14:50:33 +0200 Subject: [PATCH] [sam] fixed SPI initialization Fixes #1561 --- build/shared/revisions.txt | 5 +++++ libraries/SPI/arch/sam/SPI.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index d854326bd..a2db0fd73 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -1,4 +1,9 @@ +ARDUINO 1.5.4 BETA + +[libraries] +* sam: fixed wrong SPI initialization (noblepepper) + ARDUINO 1.5.3 BETA 2013.08.30 [ide] diff --git a/libraries/SPI/arch/sam/SPI.cpp b/libraries/SPI/arch/sam/SPI.cpp index 7494c21e2..f07b94eb3 100644 --- a/libraries/SPI/arch/sam/SPI.cpp +++ b/libraries/SPI/arch/sam/SPI.cpp @@ -30,6 +30,10 @@ void SPIClass::begin() { } void SPIClass::begin(uint8_t _pin) { + initCb(); + SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS); + SPI_Enable(spi); + uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin); PIO_Configure( g_APinDescription[spiPin].pPort,