David Eisner
Port of lowpowerlab RFM69 Packet radio library for HopeRF RFM69H with hacks from debugging with a FRDM-KL25Z
Diff: RFM69.cpp
- Revision:
- 5:dd8ff3ab5e2a
- Parent:
- 4:a6b314434ab4
- Child:
- 7:ad10455a9b7b
diff -r a6b314434ab4 -r dd8ff3ab5e2a RFM69.cpp
--- a/RFM69.cpp Mon Jun 06 13:11:58 2016 +0000
+++ b/RFM69.cpp Fri Jun 10 06:17:14 2016 +0000
@@ -45,7 +45,6 @@
#include <RFM69registers.h>
#include <SPI.h>
-extern Serial pc;
volatile uint8_t RFM69::DATA[RF69_MAX_DATA_LEN];
volatile uint8_t RFM69::_mode; // current transceiver state
volatile uint8_t RFM69::DATALEN;
@@ -57,12 +56,12 @@
volatile int16_t RFM69::RSSI; // most accurate RSSI during reception (closest to the reception)
RFM69::RFM69(PinName mosi, PinName miso, PinName sclk, PinName slaveSelectPin, PinName interrupt):
- _slaveSelectPin(slaveSelectPin) , _spi(mosi, miso, sclk)/*, _interrupt(interrupt)*/ {
+ _slaveSelectPin(slaveSelectPin) , _spi(mosi, miso, sclk), _interrupt(interrupt) {
// Setup the spi for 8 bit data, high steady state clock,
// second edge capture, with a 1MHz clock rate
_spi.format(8,0);
- _spi.frequency(1000000);
+ _spi.frequency(4000000);
_mode = RF69_MODE_STANDBY;
_promiscuousMode = false;
_powerLevel = 31;
@@ -89,15 +88,17 @@
// +13dBm formula: Pout = -18 + OutputPower (with PA0 or PA1**)
// +17dBm formula: Pout = -14 + OutputPower (with PA1 and PA2)**
// +20dBm formula: Pout = -11 + OutputPower (with PA1 and PA2)** and high power PA settings (section 3.3.7 in datasheet)
+ ///* 0x11 */ { REG_PALEVEL, RF_PALEVEL_PA0_ON | RF_PALEVEL_PA1_OFF | RF_PALEVEL_PA2_OFF | RF_PALEVEL_OUTPUTPOWER_11111},
+ ///* 0x13 */ { REG_OCP, RF_OCP_ON | RF_OCP_TRIM_95 }, // over current protection (default is 95mA)
/* 0x11 */ { REG_PALEVEL, RF_PALEVEL_PA0_ON | RF_PALEVEL_PA1_ON | RF_PALEVEL_PA2_ON | RF_PALEVEL_OUTPUTPOWER_11111},
/* 0x13 */ { REG_OCP, RF_OCP_ON | RF_OCP_TRIM_95 }, // over current protection (default is 95mA)
// RXBW defaults are { REG_RXBW, RF_RXBW_DCCFREQ_010 | RF_RXBW_MANT_24 | RF_RXBW_EXP_5} (RxBw: 10.4KHz)
/* 0x19 */ { REG_RXBW, RF_RXBW_DCCFREQ_010 | RF_RXBW_MANT_16 | RF_RXBW_EXP_2 }, // (BitRate < 2 * RxBw)
//for BR-19200: /* 0x19 */ { REG_RXBW, RF_RXBW_DCCFREQ_010 | RF_RXBW_MANT_24 | RF_RXBW_EXP_3 },
- ///* 0x25 */ { REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_01 }, // DIO0 is the only IRQ we're using
+ /* 0x25 */ { REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_01 }, // DIO0 is the only IRQ we're using
///* 0x26 */ { REG_DIOMAPPING2, RF_DIOMAPPING2_CLKOUT_OFF }, // DIO5 ClkOut disable for power saving
- ///* 0x28 */ { REG_IRQFLAGS2, RF_IRQFLAGS2_FIFOOVERRUN }, // writing to this bit ensures that the FIFO & status flags are reset
+ /* 0x28 */ { REG_IRQFLAGS2, RF_IRQFLAGS2_FIFOOVERRUN }, // writing to this bit ensures that the FIFO & status flags are reset
/* 0x29 */ { REG_RSSITHRESH, 220 }, // must be set to dBm = (-Sensitivity / 2), default is 0xE4 = 228 so -114dBm
/* 0x2D */ { REG_PREAMBLELSB, RF_PREAMBLESIZE_LSB_VALUE }, // default 3 preamble bytes 0xAAAAAA
/* 0x2E */ { REG_SYNCCONFIG, RF_SYNC_ON | RF_SYNC_FIFOFILL_AUTO | RF_SYNC_SIZE_2 | RF_SYNC_TOL_0 },
@@ -119,18 +120,18 @@
// Setup the spi for 8 bit data : 1RW-bit 7 adressbit and 8 databit
// second edge capture, with a 10MHz clock rate
_spi.format(8,0);
- _spi.frequency(1000000);
+ _spi.frequency(4000000);
#define TIME_OUT 50
start_to = t.read_ms() ;
- do writeReg(REG_SYNCVALUE1, 0xaa); while (readReg(REG_SYNCVALUE1) != 0xaa);// && t.read_ms()-start_to < TIME_OUT);
+ do writeReg(REG_SYNCVALUE1, 0xaa); while (readReg(REG_SYNCVALUE1) != 0xaa && t.read_ms()-start_to < TIME_OUT);
if (t.read_ms()-start_to >= TIME_OUT) return (false);
// Set time out
start_to = t.read_ms() ;
- do writeReg(REG_SYNCVALUE1, 0x55); while (readReg(REG_SYNCVALUE1) != 0x55);// && t.read_ms()-start_to < TIME_OUT);
+ do writeReg(REG_SYNCVALUE1, 0x55); while (readReg(REG_SYNCVALUE1) != 0x55 && t.read_ms()-start_to < TIME_OUT);
if (t.read_ms()-start_to >= TIME_OUT) return (false);
for (uint8_t i = 0; CONFIG[i][0] != 255; i++)
writeReg(CONFIG[i][0], CONFIG[i][1]);
@@ -139,14 +140,14 @@
// Disable it during initialization so we always start from a known state.
encrypt(0);
- //setHighPower(_isRFM69HW); // called regardless if it's a RFM69W or RFM69HW
+ setHighPower(_isRFM69HW); // called regardless if it's a RFM69W or RFM69HW
setMode(RF69_MODE_STANDBY);
// Set up interrupt handler
start_to = t.read_ms() ;
- while (((readReg(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00));// && t.read_ms()-start_to < TIME_OUT); // Wait for ModeReady
+ while (((readReg(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00) && t.read_ms()-start_to < TIME_OUT); // Wait for ModeReady
if (t.read_ms()-start_to >= TIME_OUT) return (false);
- //_interrupt.rise(this, &RFM69::isr0);
+ _interrupt.rise(this, &RFM69::isr0);
_address = nodeID;
return true;
@@ -243,8 +244,8 @@
void RFM69::send(uint8_t toAddress, const void* buffer, uint8_t bufferSize, bool requestACK)
{
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
- //uint32_t now = t.read_ms();
- //while (!canSend() && t.read_ms() - now < RF69_CSMA_LIMIT_MS) receiveDone();
+ uint32_t now = t.read_ms();
+ while (!canSend() && t.read_ms() - now < RF69_CSMA_LIMIT_MS) receiveDone();
sendFrame(toAddress, buffer, bufferSize, requestACK, false);
}
@@ -300,7 +301,7 @@
{
setMode(RF69_MODE_STANDBY); // turn off receiver to prevent reception while filling fifo
while ((readReg(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00); // wait for ModeReady
- //writeReg(REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_00); // DIO0 is "Packet Sent"
+ writeReg(REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_00); // DIO0 is "Packet Sent"
if (bufferSize > RF69_MAX_DATA_LEN) bufferSize = RF69_MAX_DATA_LEN;
// control byte
@@ -324,8 +325,8 @@
// no need to wait for transmit mode to be ready since its handled by the radio
setMode(RF69_MODE_TX);
uint32_t txStart = t.read_ms();
- //while (_interrupt == 0 && t.read_ms() - txStart < RF69_TX_LIMIT_MS); // wait for DIO0 to turn HIGH signalling transmission finish
- while ((readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PACKETSENT) == 0x00); // wait for ModeReady
+ while (_interrupt == 0 && t.read_ms() - txStart < RF69_TX_LIMIT_MS); // wait for DIO0 to turn HIGH signalling transmission finish
+ //while (readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PACKETSENT == 0x00); // wait for ModeReady
setMode(RF69_MODE_STANDBY);
}
// ON = disable filtering to capture all frames on network
@@ -355,7 +356,6 @@
_slaveSelectPin = 1;
}
*/
-
// for debugging
void RFM69::readAllRegs()
{
@@ -367,7 +367,11 @@
_spi.write(regAddr & 0x7F); // send address + r/w bit
regVal = _spi.write(0);
- pc.printf("%d - %d - %d\r\n", regAddr, regVal, regVal);
+ /* Serial.print(regAddr, HEX);
+ Serial.print(" - ");
+ Serial.print(regVal,HEX);
+ Serial.print(" - ");
+ Serial.println(regVal,BIN);*/
}
unselect();
}
@@ -446,11 +450,11 @@
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
writeReg(REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_01); // set DIO0 to "PAYLOADREADY" in receive mode
setMode(RF69_MODE_RX);
- //_interrupt.enable_irq();
+ _interrupt.enable_irq();
}
bool RFM69::receiveDone() {
- //_interrupt.disable_irq(); // re-enabled in unselect() via setMode() or via receiveBegin()
+ _interrupt.disable_irq(); // re-enabled in unselect() via setMode() or via receiveBegin()
if (_mode == RF69_MODE_RX && PAYLOADLEN > 0)
{
setMode(RF69_MODE_STANDBY); // enables interrupts
@@ -458,84 +462,13 @@
}
else if (_mode == RF69_MODE_RX) // already in RX no payload yet
{
- //_interrupt.enable_irq(); // explicitly re-enable interrupts
+ _interrupt.enable_irq(); // explicitly re-enable interrupts
return false;
}
receiveBegin();
return false;
}
-void RFM69::receive() {
- unsigned long timeout = 10000;
- char i;
-
- DATALEN = 0;
- SENDERID = 0;
- TARGETID = 0;
- PAYLOADLEN = 0;
- ACK_REQUESTED = 0;
- ACK_RECEIVED = 0;
- RSSI = 0;
- for(i = 0; i < 63; i++) DATA[i] = 0;
-
- // Receive Data until timeout or valid data
- while(1) {
- if (readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PAYLOADREADY)
- writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
- ////writeReg(REG_DIOMAPPING1, RF_DIOMAPPING1_DIO0_01); //set DIO0 to "PAYLOADREADY" in receive mode
- setMode(RF69_MODE_RX);
-
- //printf("Ya estoy en modo RX\n\r");
-
- // Receive Data until timeout (aprox 2s)
- while((readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PAYLOADREADY) == 0) {
- timeout--;
- if(timeout == 0) {
- //printf("Timeout!\n\r");
- setMode(RF69_MODE_STANDBY);
- return;
- }
- //usleep(1);
- }
-
- //printf("He recibido algo!!\n\r");
-
- // Received any packet!
- setMode(RF69_MODE_STANDBY);
- select();
-
- _spi.write(REG_FIFO & 0x7F);
- PAYLOADLEN = _spi.write(0);
- PAYLOADLEN = PAYLOADLEN > 66 ? 66 : PAYLOADLEN; // precaution
- TARGETID = _spi.write(0);
-
- //printf("Payload length: %i\n\r", PAYLOADLEN);
- //printf("Target id: %i\n\r", TARGETID);
-
- if(!(_promiscuousMode || TARGETID==_address || TARGETID==RF69_BROADCAST_ADDR) //match this node's address, or $
- || PAYLOADLEN < 3) { // address situation could receive packets that are malformed and don't fit this libraries extra fields
- PAYLOADLEN = 0;
- unselect();
- } else {
- DATALEN = PAYLOADLEN - 3;
- SENDERID = _spi.write(0);
- uint8_t CTLbyte = _spi.write(0);
-
- ACK_RECEIVED = CTLbyte & 0x80; // extract ACK-received flag
- ACK_REQUESTED = CTLbyte & 0x40; // extract ACK-requested flag
-
- for (uint8_t i = 0; i < DATALEN; i++)
- {
- DATA[i] = _spi.write(0);
- }
- if (DATALEN < RF69_MAX_DATA_LEN) DATA[DATALEN] = 0; // add null at end of string
- unselect();
- setMode(RF69_MODE_RX);
- }
- RSSI = readRSSI(0);
- }
-}
-
// To enable encryption: radio.encrypt("ABCDEFGHIJKLMNOP");
// To disable encryption: radio.encrypt(null) or radio.encrypt(0)
// KEY HAS TO BE 16 bytes !!!
@@ -584,7 +517,7 @@
// select the transceiver
void RFM69::select() {
- //_interrupt.disable_irq(); // Disable Interrupts
+ _interrupt.disable_irq(); // Disable Interrupts
/* // set RFM69 SPI settings
SPI.setDataMode(SPI_MODE0);
SPI.setBitOrder(MSBFIRST);
@@ -595,5 +528,5 @@
// UNselect the transceiver chip
void RFM69::unselect() {
_slaveSelectPin = 1;
- //_interrupt.enable_irq(); // Enable Interrupts
+ _interrupt.enable_irq(); // Enable Interrupts
}