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

Changed byte etc. to standard types for compatibility 

binary compatible - only source changed
This commit is contained in:
Daniel A. Maierhofer 2015-01-12 11:34:16 +01:00
parent 4767945f7f
commit 5832c173fe
2 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
RFM69.cpp
View File

@ -32,20 +32,20 @@
#include <RFM69registers.h> #include <RFM69registers.h>
#include <SPI.h> #include <SPI.h>
volatile byte RFM69::DATA[RF69_MAX_DATA_LEN]; volatile uint8_t RFM69::DATA[RF69_MAX_DATA_LEN];
volatile byte RFM69::_mode; // current transceiver state volatile uint8_t RFM69::_mode; // current transceiver state
volatile byte RFM69::DATALEN; volatile uint8_t RFM69::DATALEN;
volatile byte RFM69::SENDERID; volatile uint8_t RFM69::SENDERID;
volatile byte RFM69::TARGETID; // should match _address volatile uint8_t RFM69::TARGETID; // should match _address
volatile byte RFM69::PAYLOADLEN; volatile uint8_t RFM69::PAYLOADLEN;
volatile byte RFM69::ACK_REQUESTED; volatile uint8_t RFM69::ACK_REQUESTED;
volatile byte RFM69::ACK_RECEIVED; // should be polled immediately after sending a packet with ACK request volatile uint8_t RFM69::ACK_RECEIVED; // should be polled immediately after sending a packet with ACK request
volatile int RFM69::RSSI; // most accurate RSSI during reception (closest to the reception) volatile int16_t RFM69::RSSI; // most accurate RSSI during reception (closest to the reception)
RFM69* RFM69::selfPointer; RFM69* RFM69::selfPointer;
bool RFM69::initialize(byte freqBand, byte nodeID, byte networkID) bool RFM69::initialize(uint8_t freqBand, uint8_t nodeID, uint8_t networkID)
{ {
const byte CONFIG[][2] = const uint8_t CONFIG[][2] =
{ {
/* 0x01 */ { REG_OPMODE, RF_OPMODE_SEQUENCER_ON | RF_OPMODE_LISTEN_OFF | RF_OPMODE_STANDBY }, /* 0x01 */ { REG_OPMODE, RF_OPMODE_SEQUENCER_ON | RF_OPMODE_LISTEN_OFF | RF_OPMODE_STANDBY },
/* 0x02 */ { REG_DATAMODUL, RF_DATAMODUL_DATAMODE_PACKET | RF_DATAMODUL_MODULATIONTYPE_FSK | RF_DATAMODUL_MODULATIONSHAPING_00 }, // no shaping /* 0x02 */ { REG_DATAMODUL, RF_DATAMODUL_DATAMODE_PACKET | RF_DATAMODUL_MODULATIONTYPE_FSK | RF_DATAMODUL_MODULATIONSHAPING_00 }, // no shaping
@ -92,7 +92,7 @@ bool RFM69::initialize(byte freqBand, byte nodeID, byte networkID)
do writeReg(REG_SYNCVALUE1, 0xAA); while (readReg(REG_SYNCVALUE1) != 0xAA); do writeReg(REG_SYNCVALUE1, 0xAA); while (readReg(REG_SYNCVALUE1) != 0xAA);
do writeReg(REG_SYNCVALUE1, 0x55); while (readReg(REG_SYNCVALUE1) != 0x55); do writeReg(REG_SYNCVALUE1, 0x55); while (readReg(REG_SYNCVALUE1) != 0x55);
for (byte i = 0; CONFIG[i][0] != 255; i++) for (uint8_t i = 0; CONFIG[i][0] != 255; i++)
writeReg(CONFIG[i][0], CONFIG[i][1]); writeReg(CONFIG[i][0], CONFIG[i][1]);
// Encryption is persistent between resets and can trip you up during debugging. // Encryption is persistent between resets and can trip you up during debugging.
@ -125,7 +125,7 @@ void RFM69::setFrequency(uint32_t freqHz)
writeReg(REG_FRFLSB, freqHz); writeReg(REG_FRFLSB, freqHz);
} }
void RFM69::setMode(byte newMode) void RFM69::setMode(uint8_t newMode)
{ {
if (newMode == _mode) return; // TODO: can remove this? if (newMode == _mode) return; // TODO: can remove this?
@ -161,20 +161,20 @@ void RFM69::sleep() {
setMode(RF69_MODE_SLEEP); setMode(RF69_MODE_SLEEP);
} }
void RFM69::setAddress(byte addr) void RFM69::setAddress(uint8_t addr)
{ {
_address = addr; _address = addr;
writeReg(REG_NODEADRS, _address); writeReg(REG_NODEADRS, _address);
} }
void RFM69::setNetwork(byte networkID) void RFM69::setNetwork(uint8_t networkID)
{ {
writeReg(REG_SYNCVALUE2, networkID); writeReg(REG_SYNCVALUE2, networkID);
} }
// set output power: 0 = min, 31 = max // set output power: 0 = min, 31 = max
// this results in a "weaker" transmitted signal, and directly results in a lower RSSI at the receiver // this results in a "weaker" transmitted signal, and directly results in a lower RSSI at the receiver
void RFM69::setPowerLevel(byte powerLevel) void RFM69::setPowerLevel(uint8_t powerLevel)
{ {
_powerLevel = powerLevel; _powerLevel = powerLevel;
writeReg(REG_PALEVEL, (readReg(REG_PALEVEL) & 0xE0) | (_powerLevel > 31 ? 31 : _powerLevel)); writeReg(REG_PALEVEL, (readReg(REG_PALEVEL) & 0xE0) | (_powerLevel > 31 ? 31 : _powerLevel));
@ -190,10 +190,10 @@ bool RFM69::canSend()
return false; return false;
} }
void RFM69::send(byte toAddress, const void* buffer, byte bufferSize, bool requestACK) 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 writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
unsigned long now = millis(); uint32_t now = millis();
while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone(); while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone();
sendFrame(toAddress, buffer, bufferSize, requestACK, false); sendFrame(toAddress, buffer, bufferSize, requestACK, false);
} }
@ -204,9 +204,9 @@ void RFM69::send(byte toAddress, const void* buffer, byte bufferSize, bool reque
// The reason for the semi-automaton is that the lib is interrupt driven and // The reason for the semi-automaton is that the lib is interrupt driven and
// requires user action to read the received data and decide what to do with it // requires user action to read the received data and decide what to do with it
// replies usually take only 5..8ms at 50kbps@915MHz // replies usually take only 5..8ms at 50kbps@915MHz
bool RFM69::sendWithRetry(byte toAddress, const void* buffer, byte bufferSize, byte retries, byte retryWaitTime) { bool RFM69::sendWithRetry(uint8_t toAddress, const void* buffer, uint8_t bufferSize, uint8_t retries, uint8_t retryWaitTime) {
unsigned long sentTime; uint32_t sentTime;
for (byte i = 0; i <= retries; i++) for (uint8_t i = 0; i <= retries; i++)
{ {
send(toAddress, buffer, bufferSize, true); send(toAddress, buffer, bufferSize, true);
sentTime = millis(); sentTime = millis();
@ -224,7 +224,7 @@ bool RFM69::sendWithRetry(byte toAddress, const void* buffer, byte bufferSize, b
} }
// should be polled immediately after sending a packet with ACK request // should be polled immediately after sending a packet with ACK request
bool RFM69::ACKReceived(byte fromNodeID) { bool RFM69::ACKReceived(uint8_t fromNodeID) {
if (receiveDone()) if (receiveDone())
return (SENDERID == fromNodeID || fromNodeID == RF69_BROADCAST_ADDR) && ACK_RECEIVED; return (SENDERID == fromNodeID || fromNodeID == RF69_BROADCAST_ADDR) && ACK_RECEIVED;
return false; return false;
@ -236,17 +236,17 @@ bool RFM69::ACKRequested() {
} }
// should be called immediately after reception in case sender wants ACK // should be called immediately after reception in case sender wants ACK
void RFM69::sendACK(const void* buffer, byte bufferSize) { void RFM69::sendACK(const void* buffer, uint8_t bufferSize) {
byte sender = SENDERID; uint8_t sender = SENDERID;
int _RSSI = RSSI; // save payload received RSSI value int16_t _RSSI = RSSI; // save payload received RSSI value
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
unsigned long now = millis(); uint32_t now = millis();
while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone(); while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone();
sendFrame(sender, buffer, bufferSize, false, true); sendFrame(sender, buffer, bufferSize, false, true);
RSSI = _RSSI; // restore payload RSSI RSSI = _RSSI; // restore payload RSSI
} }
void RFM69::sendFrame(byte toAddress, const void* buffer, byte bufferSize, bool requestACK, bool sendACK) void RFM69::sendFrame(uint8_t toAddress, const void* buffer, uint8_t bufferSize, bool requestACK, bool sendACK)
{ {
setMode(RF69_MODE_STANDBY); // turn off receiver to prevent reception while filling fifo setMode(RF69_MODE_STANDBY); // turn off receiver to prevent reception while filling fifo
while ((readReg(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00); // wait for ModeReady while ((readReg(REG_IRQFLAGS1) & RF_IRQFLAGS1_MODEREADY) == 0x00); // wait for ModeReady
@ -267,13 +267,13 @@ void RFM69::sendFrame(byte toAddress, const void* buffer, byte bufferSize, bool
SPI.transfer(0x40); SPI.transfer(0x40);
else SPI.transfer(0x00); else SPI.transfer(0x00);
for (byte i = 0; i < bufferSize; i++) for (uint8_t i = 0; i < bufferSize; i++)
SPI.transfer(((byte*) buffer)[i]); SPI.transfer(((uint8_t*) buffer)[i]);
unselect(); unselect();
// no need to wait for transmit mode to be ready since its handled by the radio // no need to wait for transmit mode to be ready since its handled by the radio
setMode(RF69_MODE_TX); setMode(RF69_MODE_TX);
unsigned long txStart = millis(); uint32_t txStart = millis();
while (digitalRead(_interruptPin) == 0 && millis() - txStart < RF69_TX_LIMIT_MS); // wait for DIO0 to turn HIGH signalling transmission finish while (digitalRead(_interruptPin) == 0 && millis() - 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 (readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PACKETSENT == 0x00); // wait for ModeReady
setMode(RF69_MODE_STANDBY); setMode(RF69_MODE_STANDBY);
@ -303,12 +303,12 @@ void RFM69::interruptHandler() {
DATALEN = PAYLOADLEN - 3; DATALEN = PAYLOADLEN - 3;
SENDERID = SPI.transfer(0); SENDERID = SPI.transfer(0);
byte CTLbyte = SPI.transfer(0); uint8_t CTLbyte = SPI.transfer(0);
ACK_RECEIVED = CTLbyte & 0x80; // extract ACK-received flag ACK_RECEIVED = CTLbyte & 0x80; // extract ACK-received flag
ACK_REQUESTED = CTLbyte & 0x40; // extract ACK-requested flag ACK_REQUESTED = CTLbyte & 0x40; // extract ACK-requested flag
for (byte i = 0; i < DATALEN; i++) for (uint8_t i = 0; i < DATALEN; i++)
{ {
DATA[i] = SPI.transfer(0); DATA[i] = SPI.transfer(0);
} }
@ -364,15 +364,15 @@ void RFM69::encrypt(const char* key) {
{ {
select(); select();
SPI.transfer(REG_AESKEY1 | 0x80); SPI.transfer(REG_AESKEY1 | 0x80);
for (byte i = 0; i < 16; i++) for (uint8_t i = 0; i < 16; i++)
SPI.transfer(key[i]); SPI.transfer(key[i]);
unselect(); unselect();
} }
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFE) | (key ? 1 : 0)); writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFE) | (key ? 1 : 0));
} }
int RFM69::readRSSI(bool forceTrigger) { int16_t RFM69::readRSSI(bool forceTrigger) {
int rssi = 0; int16_t rssi = 0;
if (forceTrigger) if (forceTrigger)
{ {
// RSSI trigger not needed if DAGC is in continuous mode // RSSI trigger not needed if DAGC is in continuous mode
@ -384,16 +384,16 @@ int RFM69::readRSSI(bool forceTrigger) {
return rssi; return rssi;
} }
byte RFM69::readReg(byte addr) uint8_t RFM69::readReg(uint8_t addr)
{ {
select(); select();
SPI.transfer(addr & 0x7F); SPI.transfer(addr & 0x7F);
byte regval = SPI.transfer(0); uint8_t regval = SPI.transfer(0);
unselect(); unselect();
return regval; return regval;
} }
void RFM69::writeReg(byte addr, byte value) void RFM69::writeReg(uint8_t addr, uint8_t value)
{ {
select(); select();
SPI.transfer(addr | 0x80); SPI.transfer(addr | 0x80);
@ -444,7 +444,7 @@ void RFM69::setHighPowerRegs(bool onOff) {
writeReg(REG_TESTPA2, onOff ? 0x7C : 0x70); writeReg(REG_TESTPA2, onOff ? 0x7C : 0x70);
} }
void RFM69::setCS(byte newSPISlaveSelect) { void RFM69::setCS(uint8_t newSPISlaveSelect) {
_slaveSelectPin = newSPISlaveSelect; _slaveSelectPin = newSPISlaveSelect;
pinMode(_slaveSelectPin, OUTPUT); pinMode(_slaveSelectPin, OUTPUT);
} }
@ -452,9 +452,9 @@ void RFM69::setCS(byte newSPISlaveSelect) {
// for debugging // for debugging
void RFM69::readAllRegs() void RFM69::readAllRegs()
{ {
byte regVal; uint8_t regVal;
for (byte regAddr = 1; regAddr <= 0x4F; regAddr++) for (uint8_t regAddr = 1; regAddr <= 0x4F; regAddr++)
{ {
select(); select();
SPI.transfer(regAddr & 0x7F); // send address + r/w bit SPI.transfer(regAddr & 0x7F); // send address + r/w bit
@ -470,7 +470,7 @@ void RFM69::readAllRegs()
unselect(); unselect();
} }
byte RFM69::readTemperature(byte calFactor) // returns centigrade uint8_t RFM69::readTemperature(uint8_t calFactor) // returns centigrade
{ {
setMode(RF69_MODE_STANDBY); setMode(RF69_MODE_STANDBY);
writeReg(REG_TEMP1, RF_TEMP1_MEAS_START); writeReg(REG_TEMP1, RF_TEMP1_MEAS_START);

62
RFM69.h
View File

@ -70,17 +70,17 @@
class RFM69 { class RFM69 {
public: public:
static volatile byte DATA[RF69_MAX_DATA_LEN]; // recv/xmit buf, including header & crc bytes static volatile uint8_t DATA[RF69_MAX_DATA_LEN]; // recv/xmit buf, including header & crc bytes
static volatile byte DATALEN; static volatile uint8_t DATALEN;
static volatile byte SENDERID; static volatile uint8_t SENDERID;
static volatile byte TARGETID; // should match _address static volatile uint8_t TARGETID; // should match _address
static volatile byte PAYLOADLEN; static volatile uint8_t PAYLOADLEN;
static volatile byte ACK_REQUESTED; static volatile uint8_t ACK_REQUESTED;
static volatile byte ACK_RECEIVED; // should be polled immediately after sending a packet with ACK request static volatile uint8_t ACK_RECEIVED; // should be polled immediately after sending a packet with ACK request
static volatile int RSSI; // most accurate RSSI during reception (closest to the reception) static volatile int16_t RSSI; // most accurate RSSI during reception (closest to the reception)
static volatile byte _mode; // should be protected? static volatile uint8_t _mode; // should be protected?
RFM69(byte slaveSelectPin=RF69_SPI_CS, byte interruptPin=RF69_IRQ_PIN, bool isRFM69HW=false, byte interruptNum=RF69_IRQ_NUM) { RFM69(uint8_t slaveSelectPin=RF69_SPI_CS, uint8_t interruptPin=RF69_IRQ_PIN, bool isRFM69HW=false, uint8_t interruptNum=RF69_IRQ_NUM) {
_slaveSelectPin = slaveSelectPin; _slaveSelectPin = slaveSelectPin;
_interruptPin = interruptPin; _interruptPin = interruptPin;
_interruptNum = interruptNum; _interruptNum = interruptNum;
@ -90,51 +90,51 @@ class RFM69 {
_isRFM69HW = isRFM69HW; _isRFM69HW = isRFM69HW;
} }
bool initialize(byte freqBand, byte ID, byte networkID=1); bool initialize(uint8_t freqBand, uint8_t ID, uint8_t networkID=1);
void setAddress(byte addr); void setAddress(uint8_t addr);
void setNetwork(byte networkID); void setNetwork(uint8_t networkID);
bool canSend(); bool canSend();
void send(byte toAddress, const void* buffer, byte bufferSize, bool requestACK=false); void send(uint8_t toAddress, const void* buffer, uint8_t bufferSize, bool requestACK=false);
bool sendWithRetry(byte toAddress, const void* buffer, byte bufferSize, byte retries=2, byte retryWaitTime=40); // 40ms roundtrip req for 61byte packets bool sendWithRetry(uint8_t toAddress, const void* buffer, uint8_t bufferSize, uint8_t retries=2, uint8_t retryWaitTime=40); // 40ms roundtrip req for 61byte packets
bool receiveDone(); bool receiveDone();
bool ACKReceived(byte fromNodeID); bool ACKReceived(uint8_t fromNodeID);
bool ACKRequested(); bool ACKRequested();
void sendACK(const void* buffer = "", uint8_t bufferSize=0); void sendACK(const void* buffer = "", uint8_t bufferSize=0);
uint32_t getFrequency(); uint32_t getFrequency();
void setFrequency(uint32_t freqHz); void setFrequency(uint32_t freqHz);
void encrypt(const char* key); void encrypt(const char* key);
void setCS(byte newSPISlaveSelect); void setCS(uint8_t newSPISlaveSelect);
int readRSSI(bool forceTrigger=false); int16_t readRSSI(bool forceTrigger=false);
void promiscuous(bool onOff=true); void promiscuous(bool onOff=true);
void setHighPower(bool onOFF=true); // has to be called after initialize() for RFM69HW void setHighPower(bool onOFF=true); // has to be called after initialize() for RFM69HW
void setPowerLevel(byte level); // reduce/increase transmit power level void setPowerLevel(uint8_t level); // reduce/increase transmit power level
void sleep(); void sleep();
byte readTemperature(byte calFactor=0); // get CMOS temperature (8bit) uint8_t readTemperature(uint8_t calFactor=0); // get CMOS temperature (8bit)
void rcCalibration(); // calibrate the internal RC oscillator for use in wide temperature variations - see datasheet section [4.3.5. RC Timer Accuracy] void rcCalibration(); // calibrate the internal RC oscillator for use in wide temperature variations - see datasheet section [4.3.5. RC Timer Accuracy]
// allow hacking registers by making these public // allow hacking registers by making these public
byte readReg(byte addr); uint8_t readReg(uint8_t addr);
void writeReg(byte addr, byte val); void writeReg(uint8_t addr, uint8_t val);
void readAllRegs(); void readAllRegs();
protected: protected:
static void isr0(); static void isr0();
void virtual interruptHandler(); void virtual interruptHandler();
void sendFrame(byte toAddress, const void* buffer, byte size, bool requestACK=false, bool sendACK=false); void sendFrame(uint8_t toAddress, const void* buffer, uint8_t size, bool requestACK=false, bool sendACK=false);
static RFM69* selfPointer; static RFM69* selfPointer;
byte _slaveSelectPin; uint8_t _slaveSelectPin;
byte _interruptPin; uint8_t _interruptPin;
byte _interruptNum; uint8_t _interruptNum;
byte _address; uint8_t _address;
bool _promiscuousMode; bool _promiscuousMode;
byte _powerLevel; uint8_t _powerLevel;
bool _isRFM69HW; bool _isRFM69HW;
byte _SPCR; uint8_t _SPCR;
byte _SPSR; uint8_t _SPSR;
void receiveBegin(); void receiveBegin();
void setMode(byte mode); void setMode(uint8_t mode);
void setHighPowerRegs(bool onOff); void setHighPowerRegs(bool onOff);
void select(); void select();
void unselect(); void unselect();