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

[CC1101] Synced parameters of all FSK modules

Browse source
This commit is contained in:
jgromes 2020-07-06 11:13:01 +02:00
parent a437e25968
commit 58db5d1661
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/CC1101/CC1101_Settings/CC1101_Settings.ino
View file

@ -59,8 +59,9 @@ void setup() {
// bit rate: 32.0 kbps // bit rate: 32.0 kbps
// frequency deviation: 60.0 kHz // frequency deviation: 60.0 kHz
// Rx bandwidth: 250.0 kHz // Rx bandwidth: 250.0 kHz
// sync word: 0xD391 // output power: 7 dBm
state = radio2.begin(434.0, 32.0, 60.0, 250.0); // preamble length: 32 bits
state = radio2.begin(434.0, 32.0, 60.0, 250.0, 7, 32);
if (state == ERR_NONE) { if (state == ERR_NONE) {
Serial.println(F("success!")); Serial.println(F("success!"));
} else { } else {

22
src/modules/CC1101/CC1101.cpp
View file

@ -77,15 +77,15 @@ int16_t CC1101::begin(float freq, float br, float freqDev, float rxBw, int8_t po
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set default data shaping // set default data shaping
state = setDataShaping(0); state = setDataShaping(RADIOLIB_ENCODING_NRZ);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set default encoding // set default encoding
state = setEncoding(2); state = setEncoding(RADIOLIB_SHAPING_NONE);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set default sync word // set default sync word
state = setSyncWord(0xD3, 0x91, 0, false); state = setSyncWord(0x12, 0xAD, 0, false);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// flush FIFOs // flush FIFOs
@ -508,28 +508,28 @@ int16_t CC1101::setPreambleLength(uint8_t preambleLength) {
// check allowed values // check allowed values
uint8_t value; uint8_t value;
switch(preambleLength){ switch(preambleLength){
case 2: case 16:
value = CC1101_NUM_PREAMBLE_2; value = CC1101_NUM_PREAMBLE_2;
break; break;
case 3: case 24:
value = CC1101_NUM_PREAMBLE_3; value = CC1101_NUM_PREAMBLE_3;
break; break;
case 4: case 32:
value = CC1101_NUM_PREAMBLE_4; value = CC1101_NUM_PREAMBLE_4;
break; break;
case 6: case 48:
value = CC1101_NUM_PREAMBLE_6; value = CC1101_NUM_PREAMBLE_6;
break; break;
case 8: case 64:
value = CC1101_NUM_PREAMBLE_8; value = CC1101_NUM_PREAMBLE_8;
break; break;
case 12: case 96:
value = CC1101_NUM_PREAMBLE_12; value = CC1101_NUM_PREAMBLE_12;
break; break;
case 16: case 128:
value = CC1101_NUM_PREAMBLE_16; value = CC1101_NUM_PREAMBLE_16;
break; break;
case 24: case 192:
value = CC1101_NUM_PREAMBLE_24; value = CC1101_NUM_PREAMBLE_24;
break; break;
default: default:

14
src/modules/CC1101/CC1101.h
View file

@ -521,21 +521,21 @@ class CC1101: public PhysicalLayer {
/*! /*!
\brief Initialization method. \brief Initialization method.
\param freq Carrier frequency in MHz. Defaults to 868.0 MHz. \param freq Carrier frequency in MHz. Defaults to 434.0 MHz.
\param br Bit rate to be used in kbps. Defaults to 4.8 kbps. \param br Bit rate to be used in kbps. Defaults to 48.0 kbps.
\param freqDev Frequency deviation from carrier frequency in kHz Defaults to 48.0 kHz. \param freqDev Frequency deviation from carrier frequency in kHz Defaults to 48.0 kHz.
\param rxBw Receiver bandwidth in kHz. Defaults to 325.0 kHz. \param rxBw Receiver bandwidth in kHz. Defaults to 125.0 kHz.
\param power Output power in dBm. Defaults to 0 dBm. \param power Output power in dBm. Defaults to 10 dBm.
\param preambleLength Preamble Length in bytes. Defaults to 4 bytes. \param preambleLength Preamble Length in bits. Defaults to 16 bits.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t begin(float freq = 868.0, float br = 4.8, float freqDev = 48.0, float rxBw = 325.0, int8_t power = 0, uint8_t preambleLength = 4); int16_t begin(float freq = 434.0, float br = 48.0, float freqDev = 48.0, float rxBw = 125.0, int8_t power = 10, uint8_t preambleLength = 16);
/*! /*!
\brief Blocking binary transmit method. \brief Blocking binary transmit method.
@ -733,7 +733,7 @@ class CC1101: public PhysicalLayer {
/*! /*!
\brief Sets preamble length. \brief Sets preamble length.
\param preambleLength Preamble length to be set (in bytes), allowed values: 2, 3, 4, 6, 8, 12, 16, 24 \param preambleLength Preamble length to be set (in bits), allowed values: 16, 24, 32, 48, 64, 96, 128 and 192.
\returns \ref status_codes \returns \ref status_codes
*/ */