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

[SX126x] Added public methods to set regulator mode

Browse source
This commit is contained in:
jgromes 2020-01-26 15:11:41 +01:00
parent e800a0584c
commit 2ef331ed9c
3 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keywords.txt
View file

@ -123,6 +123,8 @@ setSyncBits KEYWORD2
setWhitening KEYWORD2 setWhitening KEYWORD2
startReceiveDutyCycle KEYWORD2 startReceiveDutyCycle KEYWORD2
startReceiveDutyCycleAuto KEYWORD2 startReceiveDutyCycleAuto KEYWORD2
setRegulatorLDO KEYWORD2
setRegulatorDCDC KEYWORD2
# ESP8266 # ESP8266
join KEYWORD2 join KEYWORD2

29
src/modules/SX126x/SX126x.cpp
View file

@ -63,6 +63,9 @@ int16_t SX126x::begin(float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, float
// set publicly accessible settings that are not a part of begin method // set publicly accessible settings that are not a part of begin method
state = setDio2AsRfSwitch(true); state = setDio2AsRfSwitch(true);
RADIOLIB_ASSERT(state);
state = setRegulatorDCDC();
return(state); return(state);
} }
@ -1076,11 +1079,19 @@ uint32_t SX126x::getTimeOnAir(size_t len) {
} }
int16_t SX126x::implicitHeader(size_t len) { int16_t SX126x::implicitHeader(size_t len) {
return(setHeaderType(SX126X_LORA_HEADER_IMPLICIT, len)); return(setHeaderType(SX126X_LORA_HEADER_IMPLICIT, len));
} }
int16_t SX126x::explicitHeader() { int16_t SX126x::explicitHeader() {
return(setHeaderType(SX126X_LORA_HEADER_EXPLICIT)); return(setHeaderType(SX126X_LORA_HEADER_EXPLICIT));
}
int16_t SX126x::setRegulatorLDO() {
return(setRegulatorMode(SX126X_REGULATOR_LDO));
}
int16_t SX126x::setRegulatorDCDC() {
return(setRegulatorMode(SX126X_REGULATOR_DC_DC));
} }
int16_t SX126x::setTCXO(float voltage, uint32_t delay) { int16_t SX126x::setTCXO(float voltage, uint32_t delay) {
@ -1320,6 +1331,11 @@ int16_t SX126x::setBufferBaseAddress(uint8_t txBaseAddress, uint8_t rxBaseAddres
return(SPIwriteCommand(SX126X_CMD_SET_BUFFER_BASE_ADDRESS, data, 2)); return(SPIwriteCommand(SX126X_CMD_SET_BUFFER_BASE_ADDRESS, data, 2));
} }
int16_t SX126x::setRegulatorMode(uint8_t mode) {
uint8_t data[1] = {mode};
return(SPIwriteCommand(SX126X_CMD_SET_REGULATOR_MODE, data, 1));
}
uint8_t SX126x::getStatus() { uint8_t SX126x::getStatus() {
uint8_t data = 0; uint8_t data = 0;
SPIreadCommand(SX126X_CMD_GET_STATUS, &data, 1); SPIreadCommand(SX126X_CMD_GET_STATUS, &data, 1);
@ -1422,17 +1438,12 @@ int16_t SX126x::fixInvertedIQ(uint8_t iqConfig) {
} }
int16_t SX126x::config(uint8_t modem) { int16_t SX126x::config(uint8_t modem) {
// set regulator mode
uint8_t data[7];
data[0] = SX126X_REGULATOR_DC_DC;
int16_t state = SPIwriteCommand(SX126X_CMD_SET_REGULATOR_MODE, data, 1);
RADIOLIB_ASSERT(state);
// reset buffer base address // reset buffer base address
state = setBufferBaseAddress(); int16_t state = setBufferBaseAddress();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set modem // set modem
uint8_t data[7];
data[0] = modem; data[0] = modem;
state = SPIwriteCommand(SX126X_CMD_SET_PACKET_TYPE, data, 1); state = SPIwriteCommand(SX126X_CMD_SET_PACKET_TYPE, data, 1);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);

15
src/modules/SX126x/SX126x.h
View file

@ -807,6 +807,20 @@ class SX126x: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t explicitHeader(); int16_t explicitHeader();
/*!
\brief Set regulator mode to LDO.
\returns \ref status_codes
*/
int16_t setRegulatorLDO();
/*!
\brief Set regulator mode to DC-DC.
\returns \ref status_codes
*/
int16_t setRegulatorDCDC();
#ifndef RADIOLIB_GODMODE #ifndef RADIOLIB_GODMODE
protected: protected:
#endif #endif
@ -831,6 +845,7 @@ class SX126x: public PhysicalLayer {
int16_t setPacketParams(uint16_t preambleLength, uint8_t crcType, uint8_t payloadLength, uint8_t headerType, uint8_t invertIQ = SX126X_LORA_IQ_STANDARD); int16_t setPacketParams(uint16_t preambleLength, uint8_t crcType, uint8_t payloadLength, uint8_t headerType, uint8_t invertIQ = SX126X_LORA_IQ_STANDARD);
int16_t setPacketParamsFSK(uint16_t preambleLength, uint8_t crcType, uint8_t syncWordLength, uint8_t addrComp, uint8_t whitening, uint8_t packetType = SX126X_GFSK_PACKET_VARIABLE, uint8_t payloadLength = 0xFF, uint8_t preambleDetectorLength = SX126X_GFSK_PREAMBLE_DETECT_16); int16_t setPacketParamsFSK(uint16_t preambleLength, uint8_t crcType, uint8_t syncWordLength, uint8_t addrComp, uint8_t whitening, uint8_t packetType = SX126X_GFSK_PACKET_VARIABLE, uint8_t payloadLength = 0xFF, uint8_t preambleDetectorLength = SX126X_GFSK_PREAMBLE_DETECT_16);
int16_t setBufferBaseAddress(uint8_t txBaseAddress = 0x00, uint8_t rxBaseAddress = 0x00); int16_t setBufferBaseAddress(uint8_t txBaseAddress = 0x00, uint8_t rxBaseAddress = 0x00);
int16_t setRegulatorMode(uint8_t mode);
uint8_t getStatus(); uint8_t getStatus();
uint32_t getPacketStatus(); uint32_t getPacketStatus();
uint16_t getDeviceErrors(); uint16_t getDeviceErrors();