Cansat
/
RFM69_LowPowerLab
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "add SPI transaction support" 

This reverts commit c38928ecb4.
This commit is contained in:
LowPowerLab 2016-02-29 21:21:52 -05:00
parent c38928ecb4
commit ec90680e00
2 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
RFM69.cpp
View File

@ -90,9 +90,6 @@ bool RFM69::initialize(uint8_t freqBand, uint8_t nodeID, uint8_t networkID)
digitalWrite(_slaveSelectPin, HIGH); digitalWrite(_slaveSelectPin, HIGH);
pinMode(_slaveSelectPin, OUTPUT); pinMode(_slaveSelectPin, OUTPUT);
SPI.begin(); SPI.begin();
#ifdef SPI_HAS_TRANSACTION
_settings = SPISettings(4000000, MSBFIRST, SPI_MODE0);
#endif
unsigned long start = millis(); unsigned long start = millis();
uint8_t timeout = 50; uint8_t timeout = 50;
do writeReg(REG_SYNCVALUE1, 0xAA); while (readReg(REG_SYNCVALUE1) != 0xaa && millis()-start < timeout); do writeReg(REG_SYNCVALUE1, 0xAA); while (readReg(REG_SYNCVALUE1) != 0xaa && millis()-start < timeout);
@ -377,27 +374,18 @@ void RFM69::receiveBegin() {
bool RFM69::receiveDone() { bool RFM69::receiveDone() {
//ATOMIC_BLOCK(ATOMIC_FORCEON) //ATOMIC_BLOCK(ATOMIC_FORCEON)
//{ //{
uint8_t rd_SREG = SREG; noInterrupts(); // re-enabled in unselect() via setMode() or via receiveBegin()
noInterrupts();
// Note: New SPI library prefers to use EIMSK (external interrupt mask) if available
// to mask (only) interrupts registered via SPI::usingInterrupt(). It only
// falls back to disabling ALL interrupts SREG if EIMSK cannot be used.
// Hence We cannot assume that methods calls below that call select() unselect()
// will result in a call to reenable interrupts().
// Thus the code below needs to explicitly do this to be safe.
if (_mode == RF69_MODE_RX && PAYLOADLEN > 0) if (_mode == RF69_MODE_RX && PAYLOADLEN > 0)
{ {
setMode(RF69_MODE_STANDBY); setMode(RF69_MODE_STANDBY); // enables interrupts
SREG = rd_SREG; // restore interrupts
return true; return true;
} }
else if (_mode == RF69_MODE_RX) // already in RX no payload yet else if (_mode == RF69_MODE_RX) // already in RX no payload yet
{ {
SREG = rd_SREG; // restore interrupts interrupts(); // explicitly re-enable interrupts
return false; return false;
} }
receiveBegin(); receiveBegin();
SREG = rd_SREG; // restore interrupts
return false; return false;
//} //}
} }
@ -451,48 +439,28 @@ void RFM69::writeReg(uint8_t addr, uint8_t value)
// select the RFM69 transceiver (save SPI settings, set CS low) // select the RFM69 transceiver (save SPI settings, set CS low)
void RFM69::select() { void RFM69::select() {
#ifdef SPI_HAS_TRANSACTION
#if defined (SPCR) && defined (SPSR)
_SPCR = SPCR;
_SPSR = SPSR;
#endif
SPI.beginTransaction(_settings);
#else
_SREG = SREG;
noInterrupts(); noInterrupts();
#if defined (SPCR) && defined (SPSR) #if defined (SPCR) && defined (SPSR)
// save current SPI settings // save current SPI settings
_SPCR = SPCR; _SPCR = SPCR;
_SPSR = SPSR; _SPSR = SPSR;
#endif #endif
// set RFM69 SPI settings // set RFM69 SPI settings
SPI.setDataMode(SPI_MODE0); SPI.setDataMode(SPI_MODE0);
SPI.setBitOrder(MSBFIRST); SPI.setBitOrder(MSBFIRST);
SPI.setClockDivider(SPI_CLOCK_DIV4); // decided to slow down from DIV2 after SPI stalling in some instances, especially visible on mega1284p when RFM69 and FLASH chip both present SPI.setClockDivider(SPI_CLOCK_DIV4); // decided to slow down from DIV2 after SPI stalling in some instances, especially visible on mega1284p when RFM69 and FLASH chip both present
#endif
digitalWrite(_slaveSelectPin, LOW); digitalWrite(_slaveSelectPin, LOW);
} }
// unselect the RFM69 transceiver (set CS high, restore SPI settings) // unselect the RFM69 transceiver (set CS high, restore SPI settings)
void RFM69::unselect() { void RFM69::unselect() {
digitalWrite(_slaveSelectPin, HIGH); digitalWrite(_slaveSelectPin, HIGH);
#ifdef SPI_HAS_TRANSACTION
SPI.endTransaction();
// restore SPI settings to what they were before talking to RFM69 // restore SPI settings to what they were before talking to RFM69
#if defined (SPCR) && defined (SPSR) #if defined (SPCR) && defined (SPSR)
SPCR = _SPCR; SPCR = _SPCR;
SPSR = _SPSR; SPSR = _SPSR;
#endif
#else
// restore SPI settings to what they were before talking to RFM69
#if defined (SPCR) && defined (SPSR)
SPCR = _SPCR;
SPSR = _SPSR;
#endif
// restore the prior interrupt state
SREG = _SREG;
#endif #endif
interrupts();
} }
// true = disable filtering to capture all frames on network // true = disable filtering to capture all frames on network

4
RFM69.h
View File

@ -142,10 +142,6 @@ class RFM69 {
uint8_t _SPCR; uint8_t _SPCR;
uint8_t _SPSR; uint8_t _SPSR;
#endif #endif
#ifndef SPI_HAS_TRANSACTION
uint8_t _SREG; // Saves the Interrupt state before disabling
SPISettings _settings;
#endif
virtual void receiveBegin(); virtual void receiveBegin();
virtual void setMode(uint8_t mode); virtual void setMode(uint8_t mode);