Skip to content

Commit b0dc317

Browse files
committed
Fix in sam SPI library initialization when using multiple CS (extended API).
http://forum.arduino.cc/index.php?topic=189682.0
1 parent ca90bf7 commit b0dc317

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

build/shared/revisions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ ARDUINO 1.5.5 BETA
44
[libraries]
55
* avr: Fixed buffer overflow in File::doBuffer() (dreggy)
66
* avr: Fixed timeout in Bridge::transfer()
7+
* sam: Fixed SPI initialization (when using extended API and multiple CS)
78

89
ARDUINO 1.5.4 BETA 2013.09.10
910

libraries/SPI/arch/sam/SPI.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
#include "SPI_Class.h"
1212

1313
SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) :
14-
spi(_spi), id(_id), initCb(_initCb)
14+
spi(_spi), id(_id), initCb(_initCb), initialized(false)
1515
{
1616
// Empty
1717
}
1818

1919
void SPIClass::begin() {
20-
initCb();
21-
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
22-
SPI_Enable(spi);
20+
init();
2321

2422
// NPCS control is left to the user
2523

@@ -30,9 +28,7 @@ void SPIClass::begin() {
3028
}
3129

3230
void SPIClass::begin(uint8_t _pin) {
33-
initCb();
34-
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
35-
SPI_Enable(spi);
31+
init();
3632

3733
uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin);
3834
PIO_Configure(
@@ -47,6 +43,15 @@ void SPIClass::begin(uint8_t _pin) {
4743
setBitOrder(_pin, MSBFIRST);
4844
}
4945

46+
void SPIClass::init() {
47+
if (initialized)
48+
return;
49+
initCb();
50+
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
51+
SPI_Enable(spi);
52+
initialized = true;
53+
}
54+
5055
void SPIClass::end(uint8_t _pin) {
5156
uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin);
5257
// Setting the pin as INPUT will disconnect it from SPI peripheral
@@ -55,6 +60,7 @@ void SPIClass::end(uint8_t _pin) {
5560

5661
void SPIClass::end() {
5762
SPI_Disable(spi);
63+
initialized = false;
5864
}
5965

6066
void SPIClass::setBitOrder(uint8_t _pin, BitOrder _bitOrder) {

libraries/SPI/arch/sam/SPI_Class.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,15 @@ class SPIClass {
5454
void setClockDivider(uint8_t _div) { setClockDivider(BOARD_SPI_DEFAULT_SS, _div); };
5555

5656
private:
57+
void init();
58+
5759
Spi *spi;
5860
uint32_t id;
5961
BitOrder bitOrder[SPI_CHANNELS_NUM];
6062
uint32_t divider[SPI_CHANNELS_NUM];
6163
uint32_t mode[SPI_CHANNELS_NUM];
6264
void (*initCb)(void);
65+
bool initialized;
6366
};
6467

6568
#if SPI_INTERFACES_COUNT > 0

0 commit comments

Comments
 (0)