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

Modify (SX1262.h, SX1262.cpp): remove tcxoVoltage from begin, because it isn't support in SX1262 and LLCC68, override setTCXO by the same cause

Browse source
This commit is contained in:
yagupovr 2021-08-01 21:26:20 +05:00
parent 83d77e1ac5
commit d9fa7bf053
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/SX126x/SX1262.cpp
View file

@ -5,9 +5,9 @@ SX1262::SX1262(Module* mod) : SX126x(mod) {
}
int16_t SX1262::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint16_t preambleLength, float tcxoVoltage, bool useRegulatorLDO) {
int16_t SX1262::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint16_t preambleLength, bool useRegulatorLDO) {
// execute common part
int16_t state = SX126x::begin(bw, sf, cr, syncWord, preambleLength, tcxoVoltage, useRegulatorLDO);
int16_t state = SX126x::begin(bw, sf, cr, syncWord, preambleLength, 0, useRegulatorLDO);
RADIOLIB_ASSERT(state);
// configure publicly accessible settings
@ -23,9 +23,9 @@ int16_t SX1262::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t sync
return(state);
}
int16_t SX1262::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t power, uint16_t preambleLength, float tcxoVoltage, bool useRegulatorLDO) {
int16_t SX1262::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t power, uint16_t preambleLength, bool useRegulatorLDO) {
// execute common part
int16_t state = SX126x::beginFSK(br, freqDev, rxBw, preambleLength, tcxoVoltage, useRegulatorLDO);
int16_t state = SX126x::beginFSK(br, freqDev, rxBw, preambleLength, 0, useRegulatorLDO);
RADIOLIB_ASSERT(state);
// configure publicly accessible settings
@ -92,4 +92,8 @@ int16_t SX1262::setOutputPower(int8_t power) {
return(writeRegister(SX126X_REG_OCP_CONFIGURATION, &ocp, 1));
}
int16_t SX1262::setTCXO(float voltage, uint32_t delay) {
}
#endif

24
src/modules/SX126x/SX1262.h
View file

@ -27,7 +27,7 @@ class SX1262: public SX126x {
// basic methods
/*!
/*!
\brief Initialization method for LoRa modem.
\param freq Carrier frequency in MHz. Defaults to 434.0 MHz.
@ -44,13 +44,11 @@ class SX1262: public SX126x {
\param preambleLength LoRa preamble length in symbols. Defaults to 8 symbols.
\param tcxoVoltage TCXO reference voltage to be set on DIO3. Defaults to 1.6 V, set to 0 to skip.
\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 = SX126X_SYNC_WORD_PRIVATE, int8_t power = 10, uint16_t preambleLength = 8, float tcxoVoltage = 1.6, bool useRegulatorLDO = false);
int16_t begin(float freq = 434.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = SX126X_SYNC_WORD_PRIVATE, int8_t power = 10, uint16_t preambleLength = 8, bool useRegulatorLDO = false);
/*!
/*!
\brief Initialization method for FSK modem.
\param freq Carrier frequency in MHz. Defaults to 434.0 MHz.
@ -65,13 +63,11 @@ class SX1262: public SX126x {
\parma 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, set to 0 to skip.
\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 = 48.0, float freqDev = 50.0, float rxBw = 156.2, int8_t power = 10, uint16_t preambleLength = 16, float tcxoVoltage = 1.6, bool useRegulatorLDO = false);
int16_t beginFSK(float freq = 434.0, float br = 48.0, float freqDev = 50.0, float rxBw = 156.2, int8_t power = 10, uint16_t preambleLength = 16, bool useRegulatorLDO = false);
// configuration methods
@ -94,6 +90,18 @@ class SX1262: public SX126x {
\returns \ref status_codes
*/
int16_t setOutputPower(int8_t power);
/*!
\brief Sets TCXO (Temperature Compensated Crystal Oscillator) configuration. - Stub for SX1262
\param TCXO reference voltage in volts. Allowed values are 1.6, 1.7, 1.8, 2.2. 2.4, 2.7, 3.0 and 3.3 V. Set to 0 to disable TCXO.
NOTE: After setting this parameter to 0, the module will be reset (since there's no other way to disable TCXO).
\param TCXO timeout in us. Defaults to 5000 us.
\returns \ref status_codes
*/
int16_t setTCXO(float voltage, uint32_t delay = 5000);
#if !defined(RADIOLIB_GODMODE)
private: