From 8c304a89c10d86f04fd3b1a1f2fe86635a731e56 Mon Sep 17 00:00:00 2001
From: jgromes <jan.gromes@gmail.com>
Date: Fri, 31 Jan 2025 17:59:47 +0100
Subject: [PATCH] [LLCC68] Add override begin FSK and LR-FHSS methods (#1405)
---
src/modules/LLCC68/LLCC68.cpp | 50 +++++++++++++++++++++++++++++++++++
src/modules/LLCC68/LLCC68.h | 33 ++++++++++++++++++++++-
2 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/src/modules/LLCC68/LLCC68.cpp b/src/modules/LLCC68/LLCC68.cpp
index fe1468a2..17f19794 100644
--- a/src/modules/LLCC68/LLCC68.cpp
+++ b/src/modules/LLCC68/LLCC68.cpp
@@ -37,6 +37,56 @@ int16_t LLCC68::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t sync
return(state);
}
+int16_t LLCC68::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t power, uint16_t preambleLength, float tcxoVoltage, bool useRegulatorLDO) {
+ // execute common part
+ int16_t state = SX126x::beginFSK(br, freqDev, rxBw, preambleLength, tcxoVoltage, useRegulatorLDO);
+ if(state == RADIOLIB_ERR_CHIP_NOT_FOUND) {
+ // bit of a hack, but some LLCC68 chips report as "SX1261", try that
+ // for full discussion, see https://github.com/jgromes/RadioLib/issues/1329
+ chipType = RADIOLIB_SX1261_CHIP_TYPE;
+ state = SX126x::beginFSK(br, freqDev, rxBw, preambleLength, tcxoVoltage, useRegulatorLDO);
+ RADIOLIB_DEBUG_PRINTLN("LLCC68 version string not found, using SX1261 instead");
+ }
+ RADIOLIB_ASSERT(state);
+
+ // configure publicly accessible settings
+ state = setFrequency(freq);
+ RADIOLIB_ASSERT(state);
+
+ state = SX126x::fixPaClamping();
+ RADIOLIB_ASSERT(state);
+
+ state = setOutputPower(power);
+ RADIOLIB_ASSERT(state);
+
+ return(state);
+}
+
+int16_t LLCC68::beginLRFHSS(float freq, uint8_t bw, uint8_t cr, bool narrowGrid, int8_t power, float tcxoVoltage, bool useRegulatorLDO) {
+ // execute common part
+ int16_t state = SX126x::beginLRFHSS(bw, cr, narrowGrid, tcxoVoltage, useRegulatorLDO);
+ if(state == RADIOLIB_ERR_CHIP_NOT_FOUND) {
+ // bit of a hack, but some LLCC68 chips report as "SX1261", try that
+ // for full discussion, see https://github.com/jgromes/RadioLib/issues/1329
+ chipType = RADIOLIB_SX1261_CHIP_TYPE;
+ state = SX126x::beginLRFHSS(bw, cr, narrowGrid, tcxoVoltage, useRegulatorLDO);
+ RADIOLIB_DEBUG_PRINTLN("LLCC68 version string not found, using SX1261 instead");
+ }
+ RADIOLIB_ASSERT(state);
+
+ // configure publicly accessible settings
+ state = setFrequency(freq);
+ RADIOLIB_ASSERT(state);
+
+ state = SX126x::fixPaClamping();
+ RADIOLIB_ASSERT(state);
+
+ state = setOutputPower(power);
+ RADIOLIB_ASSERT(state);
+
+ return(state);
+}
+
int16_t LLCC68::setBandwidth(float bw) {
RADIOLIB_CHECK_RANGE(bw, 100.0f, 510.0f, RADIOLIB_ERR_INVALID_BANDWIDTH);
return(SX1262::setBandwidth(bw));
diff --git a/src/modules/LLCC68/LLCC68.h b/src/modules/LLCC68/LLCC68.h
index 949e666b..5dadf380 100644
--- a/src/modules/LLCC68/LLCC68.h
+++ b/src/modules/LLCC68/LLCC68.h
@@ -40,7 +40,38 @@ class LLCC68: public SX1262 {
\returns \ref status_codes
*/
int16_t begin(float freq = 434.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = RADIOLIB_SX126X_SYNC_WORD_PRIVATE, int8_t pwr = 10, uint16_t preambleLength = 8, float tcxoVoltage = 0, bool useRegulatorLDO = false);
-
+
+ /*!
+ \brief Initialization method for FSK modem.
+ \param freq Carrier frequency in MHz. Defaults to 434.0 MHz.
+ \param br FSK bit rate in kbps. Defaults to 4.8 kbps.
+ \param freqDev Frequency deviation from carrier frequency in kHz. Defaults to 5.0 kHz.
+ \param rxBw Receiver bandwidth in kHz. Defaults to 156.2 kHz.
+ \param power Output power in dBm. Defaults to 10 dBm.
+ \param preambleLength FSK preamble length in bits. Defaults to 16 bits.
+ \param tcxoVoltage TCXO reference voltage to be set on DIO3. Defaults to 1.6 V.
+ If you are seeing -706/-707 error codes, it likely means you are using non-0 value for module with XTAL.
+ To use XTAL, either set this value to 0, or set SX126x::XTAL to true.
+ \param useRegulatorLDO Whether to use only LDO regulator (true) or DC-DC regulator (false). Defaults to false.
+ \returns \ref status_codes
+ */
+ int16_t beginFSK(float freq = 434.0, float br = 4.8, float freqDev = 5.0, float rxBw = 156.2, int8_t power = 10, uint16_t preambleLength = 16, float tcxoVoltage = 1.6, bool useRegulatorLDO = false);
+
+ /*!
+ \brief Initialization method for LR-FHSS modem. This modem only supports transmission!
+ \param freq Carrier frequency in MHz. Defaults to 434.0 MHz.
+ \param bw LR-FHSS bandwidth, one of RADIOLIB_SX126X_LR_FHSS_BW_* values. Defaults to 722.66 kHz.
+ \param cr LR-FHSS coding rate, one of RADIOLIB_SX126X_LR_FHSS_CR_* values. Defaults to 2/3 coding rate.
+ \param narrowGrid Whether to use narrow (3.9 kHz) or wide (25.39 kHz) grid spacing. Defaults to true (narrow/non-FCC) grid.
+ \param power Output power in dBm. Defaults to 10 dBm.
+ \param tcxoVoltage TCXO reference voltage to be set. Defaults to 1.6 V.
+ If you are seeing -706/-707 error codes, it likely means you are using non-0 value for module with XTAL.
+ To use XTAL, either set this value to 0, or set SX126x::XTAL to true.
+ \param useRegulatorLDO Whether to use only LDO regulator (true) or DC-DC regulator (false). Defaults to false.
+ \returns \ref status_codes
+ */
+ int16_t beginLRFHSS(float freq = 434.0, uint8_t bw = RADIOLIB_SX126X_LR_FHSS_BW_722_66, uint8_t cr = RADIOLIB_SX126X_LR_FHSS_CR_2_3, bool narrowGrid = true, int8_t power = 10, float tcxoVoltage = 1.6, bool useRegulatorLDO = false);
+
// configuration methods
/*!