arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Fix in sam SPI library initialization when using multiple CS (extended API).

Browse Source 
http://forum.arduino.cc/index.php?topic=189682.0
This commit is contained in:
Cristian Maglie
2013-09-24 14:20:23 +02:00
parent ca90bf75cb
commit b0dc317422
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/shared/revisions.txt
View File

@ -4,6 +4,7 @@ ARDUINO 1.5.5 BETA
[libraries] [libraries]
* avr: Fixed buffer overflow in File::doBuffer() (dreggy) * avr: Fixed buffer overflow in File::doBuffer() (dreggy)
* avr: Fixed timeout in Bridge::transfer() * avr: Fixed timeout in Bridge::transfer()
* sam: Fixed SPI initialization (when using extended API and multiple CS)
ARDUINO 1.5.4 BETA 2013.09.10 ARDUINO 1.5.4 BETA 2013.09.10

20
libraries/SPI/arch/sam/SPI.cpp
View File

@ -11,15 +11,13 @@
#include "SPI_Class.h" #include "SPI_Class.h"
SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) : SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) :
spi(_spi), id(_id), initCb(_initCb) spi(_spi), id(_id), initCb(_initCb), initialized(false)
{ {
// Empty // Empty
} }
void SPIClass::begin() { void SPIClass::begin() {
initCb(); init();
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
SPI_Enable(spi);
// NPCS control is left to the user // NPCS control is left to the user
@ -30,9 +28,7 @@ void SPIClass::begin() {
} }
void SPIClass::begin(uint8_t _pin) { void SPIClass::begin(uint8_t _pin) {
initCb(); init();
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); uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin);
PIO_Configure( PIO_Configure(
@ -47,6 +43,15 @@ void SPIClass::begin(uint8_t _pin) {
setBitOrder(_pin, MSBFIRST); setBitOrder(_pin, MSBFIRST);
} }
void SPIClass::init() {
if (initialized)
return;
initCb();
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
SPI_Enable(spi);
initialized = true;
}
void SPIClass::end(uint8_t _pin) { void SPIClass::end(uint8_t _pin) {
uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin); uint32_t spiPin = BOARD_PIN_TO_SPI_PIN(_pin);
// Setting the pin as INPUT will disconnect it from SPI peripheral // Setting the pin as INPUT will disconnect it from SPI peripheral
@ -55,6 +60,7 @@ void SPIClass::end(uint8_t _pin) {
void SPIClass::end() { void SPIClass::end() {
SPI_Disable(spi); SPI_Disable(spi);
initialized = false;
} }
void SPIClass::setBitOrder(uint8_t _pin, BitOrder _bitOrder) { void SPIClass::setBitOrder(uint8_t _pin, BitOrder _bitOrder) {

3
libraries/SPI/arch/sam/SPI_Class.h
View File

@ -54,12 +54,15 @@ class SPIClass {
void setClockDivider(uint8_t _div) { setClockDivider(BOARD_SPI_DEFAULT_SS, _div); }; void setClockDivider(uint8_t _div) { setClockDivider(BOARD_SPI_DEFAULT_SS, _div); };
private: private:
void init();
Spi *spi; Spi *spi;
uint32_t id; uint32_t id;
BitOrder bitOrder[SPI_CHANNELS_NUM]; BitOrder bitOrder[SPI_CHANNELS_NUM];
uint32_t divider[SPI_CHANNELS_NUM]; uint32_t divider[SPI_CHANNELS_NUM];
uint32_t mode[SPI_CHANNELS_NUM]; uint32_t mode[SPI_CHANNELS_NUM];
void (*initCb)(void); void (*initCb)(void);
bool initialized;
}; };
#if SPI_INTERFACES_COUNT > 0 #if SPI_INTERFACES_COUNT > 0