forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CC1011] Added missing packetMode method

Browse source
This commit is contained in:
jgromes 2019-05-24 21:24:51 +02:00
parent 88af8aeb12
commit da9c41d89f
2 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/modules/CC1101.cpp
View file

@ -158,6 +158,13 @@ int16_t CC1101::receiveDirect() {
return(ERR_NONE); return(ERR_NONE);
} }
int16_t CC1101::packetMode() {
int16_t state = SPIsetRegValue(CC1101_REG_PKTCTRL1, CC1101_CRC_AUTOFLUSH_OFF | CC1101_APPEND_STATUS_ON | CC1101_ADR_CHK_NONE, 3, 0);
state |= SPIsetRegValue(CC1101_REG_PKTCTRL0, CC1101_WHITE_DATA_OFF | CC1101_PKT_FORMAT_NORMAL, 6, 4);
state |= SPIsetRegValue(CC1101_REG_PKTCTRL0, CC1101_CRC_ON | CC1101_LENGTH_CONFIG_VARIABLE, 2, 0);
return(state);
}
void CC1101::setGdo0Action(void (*func)(void), uint8_t dir) { void CC1101::setGdo0Action(void (*func)(void), uint8_t dir) {
attachInterrupt(digitalPinToInterrupt(_mod->getInt0()), func, dir); attachInterrupt(digitalPinToInterrupt(_mod->getInt0()), func, dir);
} }
@ -359,13 +366,6 @@ int16_t CC1101::setFrequencyDeviation(float freqDev) {
return(state); return(state);
} }
int16_t CC1101::setSyncWord(uint8_t syncH, uint8_t syncL) {
// set sync word
int16_t state = SPIsetRegValue(CC1101_REG_SYNC1, syncH);
state |= SPIsetRegValue(CC1101_REG_SYNC0, syncL);
return(state);
}
int16_t CC1101::setOutputPower(int8_t power) { int16_t CC1101::setOutputPower(int8_t power) {
// round to the known frequency settings // round to the known frequency settings
uint8_t f; uint8_t f;
@ -427,6 +427,13 @@ int16_t CC1101::setOutputPower(int8_t power) {
return(SPIsetRegValue(CC1101_REG_PATABLE, powerRaw)); return(SPIsetRegValue(CC1101_REG_PATABLE, powerRaw));
} }
int16_t CC1101::setSyncWord(uint8_t syncH, uint8_t syncL) {
// set sync word
int16_t state = SPIsetRegValue(CC1101_REG_SYNC1, syncH);
state |= SPIsetRegValue(CC1101_REG_SYNC0, syncL);
return(state);
}
int16_t CC1101::setNodeAddress(uint8_t nodeAddr, uint8_t numBroadcastAddrs) { int16_t CC1101::setNodeAddress(uint8_t nodeAddr, uint8_t numBroadcastAddrs) {
if(!(numBroadcastAddrs > 0) && (numBroadcastAddrs <= 2)) { if(!(numBroadcastAddrs > 0) && (numBroadcastAddrs <= 2)) {
return(ERR_INVALID_NUM_BROAD_ADDRS); return(ERR_INVALID_NUM_BROAD_ADDRS);
@ -475,12 +482,7 @@ int16_t CC1101::config() {
} }
// set packet mode // set packet mode
state = SPIsetRegValue(CC1101_REG_PKTCTRL1, CC1101_CRC_AUTOFLUSH_OFF | CC1101_APPEND_STATUS_ON | CC1101_ADR_CHK_NONE, 3, 0); state = packetMode();
state |= SPIsetRegValue(CC1101_REG_PKTCTRL0, CC1101_WHITE_DATA_OFF | CC1101_PKT_FORMAT_NORMAL, 6, 4);
state |= SPIsetRegValue(CC1101_REG_PKTCTRL0, CC1101_CRC_ON | CC1101_LENGTH_CONFIG_VARIABLE, 2, 0);
if(state != ERR_NONE) {
return(state);
}
return(state); return(state);
} }

33
src/modules/CC1101.h
View file

@ -497,7 +497,7 @@
/*! /*!
\class CC1101 \class CC1101
\brief Control class for CC1101 module. \brief Control class for %CC1101 module.
*/ */
class CC1101: public PhysicalLayer { class CC1101: public PhysicalLayer {
public: public:
@ -525,9 +525,9 @@ class CC1101: public PhysicalLayer {
\param rxBw Receiver bandwidth in kHz. Defaults to 325.0 kHz. \param rxBw Receiver bandwidth in kHz. Defaults to 325.0 kHz.
\param freqDev Frequency deviation from carrier frequency in kHz Defaults to 48 kHz. \param freqDev Frequency deviation from carrier frequency in kHz Defaults to 48.0 kHz.
\param power Output power in dBm. Defaults to 0dBm. \param power Output power in dBm. Defaults to 0 dBm.
\returns \ref status_codes \returns \ref status_codes
*/ */
@ -567,7 +567,7 @@ class CC1101: public PhysicalLayer {
int16_t standby(); int16_t standby();
/*! /*!
\brief Start direct mode transmission. \brief Starts direct mode transmission.
\param frf Raw RF frequency value. Defaults to 0, required for quick frequency shifts in RTTY. \param frf Raw RF frequency value. Defaults to 0, required for quick frequency shifts in RTTY.
@ -576,12 +576,17 @@ class CC1101: public PhysicalLayer {
int16_t transmitDirect(uint32_t frf = 0); int16_t transmitDirect(uint32_t frf = 0);
/*! /*!
\brief Start direct mode reception. \brief Starts direct mode reception.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t receiveDirect(); int16_t receiveDirect();
/*!
\brief Stops direct mode. It is required to call this method to switch from direct transmissions to packet-based transmissions.
*/
int16_t packetMode();
// interrupt methods // interrupt methods
/*! /*!
@ -672,6 +677,15 @@ class CC1101: public PhysicalLayer {
*/ */
int16_t setFrequencyDeviation(float freqDev); int16_t setFrequencyDeviation(float freqDev);
/*!
\brief Sets output power. Allowed values are -30, -20, -15, -10, 0, 5, 7 or 10 dBm.
\param power Output power to be set in dBm.
\returns \ref status_codes
*/
int16_t setOutputPower(int8_t power);
/*! /*!
\brief Sets 16-bit sync word as a two byte value. \brief Sets 16-bit sync word as a two byte value.
@ -683,15 +697,6 @@ class CC1101: public PhysicalLayer {
*/ */
int16_t setSyncWord(uint8_t syncH, uint8_t syncL); int16_t setSyncWord(uint8_t syncH, uint8_t syncL);
/*!
\brief Sets output power. Allowed values are -30, -20, -15, -10, 0, 5, 7 or 10 dBm.
\param power Output power to be set in dBm.
\returns \ref status_codes
*/
int16_t setOutputPower(int8_t power);
/*! /*!
\brief Sets node and broadcast addresses. Calling this method will also enable address filtering. \brief Sets node and broadcast addresses. Calling this method will also enable address filtering.