Merge branch 'master' of https://github.com/LowPowerLab/RFM69
This commit is contained in:
commit
6925db5df6
|
|
@ -498,7 +498,9 @@ void RFM69::select() {
|
||||||
// set RFM69 SPI settings explicitly
|
// set RFM69 SPI settings explicitly
|
||||||
_spi->setDataMode(SPI_MODE0);
|
_spi->setDataMode(SPI_MODE0);
|
||||||
_spi->setBitOrder(MSBFIRST);
|
_spi->setBitOrder(MSBFIRST);
|
||||||
#if defined(__arm__)
|
#if defined(__STM32F1__)
|
||||||
|
_spi->setClockDivider(SPI_CLOCK_DIV8);
|
||||||
|
#elif defined(__arm__)
|
||||||
_spi->setClockDivider(SPI_CLOCK_DIV16);
|
_spi->setClockDivider(SPI_CLOCK_DIV16);
|
||||||
#else
|
#else
|
||||||
_spi->setClockDivider(SPI_CLOCK_DIV2);
|
_spi->setClockDivider(SPI_CLOCK_DIV2);
|
||||||
|
|
|
||||||
2
RFM69.h
2
RFM69.h
|
|
@ -204,7 +204,7 @@ class RFM69 {
|
||||||
bool initialize(uint8_t freqBand, uint16_t ID, uint8_t networkID=1);
|
bool initialize(uint8_t freqBand, uint16_t ID, uint8_t networkID=1);
|
||||||
void setAddress(uint16_t addr);
|
void setAddress(uint16_t addr);
|
||||||
void setNetwork(uint8_t networkID);
|
void setNetwork(uint8_t networkID);
|
||||||
bool canSend();
|
virtual bool canSend();
|
||||||
virtual void send(uint16_t toAddress, const void* buffer, uint8_t bufferSize, bool requestACK=false);
|
virtual void send(uint16_t toAddress, const void* buffer, uint8_t bufferSize, bool requestACK=false);
|
||||||
virtual bool sendWithRetry(uint16_t toAddress, const void* buffer, uint8_t bufferSize, uint8_t retries=2, uint8_t retryWaitTime=RFM69_ACK_TIMEOUT);
|
virtual bool sendWithRetry(uint16_t toAddress, const void* buffer, uint8_t bufferSize, uint8_t retries=2, uint8_t retryWaitTime=RFM69_ACK_TIMEOUT);
|
||||||
virtual bool receiveDone();
|
virtual bool receiveDone();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue