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

[LR11x0] Added channel scan configuration

Browse source
This commit is contained in:
jgromes 2024-08-18 11:07:27 +02:00
parent 9fe39d5461
commit 6fdc077999
2 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/modules/LR11x0/LR11x0.cpp
View file

@ -278,12 +278,21 @@ int16_t LR11x0::receiveDirect() {
} }
int16_t LR11x0::scanChannel() { int16_t LR11x0::scanChannel() {
return(this->scanChannel(RADIOLIB_LR11X0_CAD_PARAM_DEFAULT, RADIOLIB_LR11X0_CAD_PARAM_DEFAULT, RADIOLIB_LR11X0_CAD_PARAM_DEFAULT)); ChannelScanConfig_t config = {
.cad = {
.symNum = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.detPeak = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.detMin = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.exitMode = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.timeout = 0,
},
};
return(this->scanChannel(config));
} }
int16_t LR11x0::scanChannel(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin) { int16_t LR11x0::scanChannel(ChannelScanConfig_t config) {
// set mode to CAD // set mode to CAD
int state = startChannelScan(symbolNum, detPeak, detMin); int state = startChannelScan(config);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// wait for channel activity detected or timeout // wait for channel activity detected or timeout
@ -541,10 +550,19 @@ int16_t LR11x0::readData(uint8_t* data, size_t len) {
} }
int16_t LR11x0::startChannelScan() { int16_t LR11x0::startChannelScan() {
return(this->startChannelScan(RADIOLIB_LR11X0_CAD_PARAM_DEFAULT, RADIOLIB_LR11X0_CAD_PARAM_DEFAULT, RADIOLIB_LR11X0_CAD_PARAM_DEFAULT)); ChannelScanConfig_t config = {
.cad = {
.symNum = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.detPeak = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.detMin = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.exitMode = RADIOLIB_LR11X0_CAD_PARAM_DEFAULT,
.timeout = 0,
},
};
return(this->startChannelScan(config));
} }
int16_t LR11x0::startChannelScan(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin) { int16_t LR11x0::startChannelScan(ChannelScanConfig_t config) {
// check active modem // check active modem
int16_t state = RADIOLIB_ERR_NONE; int16_t state = RADIOLIB_ERR_NONE;
uint8_t modem = RADIOLIB_LR11X0_PACKET_TYPE_NONE; uint8_t modem = RADIOLIB_LR11X0_PACKET_TYPE_NONE;
@ -570,7 +588,7 @@ int16_t LR11x0::startChannelScan(uint8_t symbolNum, uint8_t detPeak, uint8_t det
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set mode to CAD // set mode to CAD
return(startCad(symbolNum, detPeak, detMin)); return(startCad(config.cad.symNum, config.cad.detPeak, config.cad.detMin, config.cad.exitMode, config.cad.timeout));
} }
int16_t LR11x0::getChannelScanResult() { int16_t LR11x0::getChannelScanResult() {
@ -2007,7 +2025,7 @@ int16_t LR11x0::setPacketMode(uint8_t mode, uint8_t len) {
return(state); return(state);
} }
int16_t LR11x0::startCad(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin) { int16_t LR11x0::startCad(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin, uint8_t exitMode, RadioLibTime_t timeout) {
// check active modem // check active modem
uint8_t type = RADIOLIB_LR11X0_PACKET_TYPE_NONE; uint8_t type = RADIOLIB_LR11X0_PACKET_TYPE_NONE;
int16_t state = getPacketType(&type); int16_t state = getPacketType(&type);
@ -2034,9 +2052,16 @@ int16_t LR11x0::startCad(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin) {
min = 10; min = 10;
} }
uint8_t mode = exitMode;
if(mode == RADIOLIB_LR11X0_CAD_PARAM_DEFAULT) {
mode = RADIOLIB_LR11X0_CAD_EXIT_MODE_STBY_RC;
}
uint32_t timeout_raw = (float)timeout*1000 / 30.52f;
// set CAD parameters // set CAD parameters
// TODO add configurable exit mode and timeout // TODO add configurable exit mode and timeout
state = setCadParams(num, peak, min, RADIOLIB_LR11X0_CAD_EXIT_MODE_STBY_RC, 0); state = setCadParams(num, peak, min, mode, timeout_raw);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// start CAD // start CAD

16
src/modules/LR11x0/LR11x0.h
View file

@ -844,12 +844,10 @@ class LR11x0: public PhysicalLayer {
/*! /*!
\brief Performs scan for LoRa transmission in the current channel. Detects both preamble and payload. \brief Performs scan for LoRa transmission in the current channel. Detects both preamble and payload.
\param symbolNum Number of symbols for CAD detection. \param config CAD configuration structure.
\param detPeak Peak value for CAD detection.
\param detMin Minimum value for CAD detection.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t scanChannel(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin); int16_t scanChannel(ChannelScanConfig_t config) override;
/*! /*!
\brief Sets the module to standby mode (overload for PhysicalLayer compatibility, uses 13 MHz RC oscillator). \brief Sets the module to standby mode (overload for PhysicalLayer compatibility, uses 13 MHz RC oscillator).
@ -979,14 +977,12 @@ class LR11x0: public PhysicalLayer {
int16_t startChannelScan() override; int16_t startChannelScan() override;
/*! /*!
\brief Interrupt-driven channel activity detection method. IRQ1 will be activated \brief Interrupt-driven channel activity detection method. DIO1 will be activated
when LoRa preamble is detected, or upon timeout. when LoRa preamble is detected, or upon timeout.
\param symbolNum Number of symbols for CAD detection. \param config CAD configuration structure.
\param detPeak Peak value for CAD detection.
\param detMin Minimum value for CAD detection.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t startChannelScan(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin); int16_t startChannelScan(ChannelScanConfig_t config) override;
/*! /*!
\brief Read the channel scan result \brief Read the channel scan result
@ -1618,7 +1614,7 @@ class LR11x0: public PhysicalLayer {
bool findChip(uint8_t ver); bool findChip(uint8_t ver);
int16_t config(uint8_t modem); int16_t config(uint8_t modem);
int16_t setPacketMode(uint8_t mode, uint8_t len); int16_t setPacketMode(uint8_t mode, uint8_t len);
int16_t startCad(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin); int16_t startCad(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin, uint8_t exitMode, RadioLibTime_t timeout);
int16_t setHeaderType(uint8_t hdrType, size_t len = 0xFF); int16_t setHeaderType(uint8_t hdrType, size_t len = 0xFF);
// common methods to avoid some copy-paste // common methods to avoid some copy-paste