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

[SX126x] Minor formatting fixes

Browse source
This commit is contained in:
jgromes 2020-04-07 13:27:55 +02:00
parent 34559fdee3
commit cc90345342
2 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,7 @@ int16_t SX126x::beginFSK(float br, float freqDev, float rxBw, float currentLimit
// set module properties // set module properties
_mod->init(RADIOLIB_USE_SPI); _mod->init(RADIOLIB_USE_SPI);
Module::pinMode(_mod->getIrq(), INPUT); Module::pinMode(_mod->getIrq(), INPUT);
Module::pinMode(_mod->getGpio(), INPUT);
// initialize configuration variables (will be overwritten during public settings configuration) // initialize configuration variables (will be overwritten during public settings configuration)
_br = 21333; // 48.0 kbps _br = 21333; // 48.0 kbps
@ -553,7 +554,6 @@ int16_t SX126x::readData(uint8_t* data, size_t len) {
uint16_t irq = getIrqStatus(); uint16_t irq = getIrqStatus();
int16_t crcState = ERR_NONE; int16_t crcState = ERR_NONE;
if((irq & SX126X_IRQ_CRC_ERR) || (irq & SX126X_IRQ_HEADER_ERR)) { if((irq & SX126X_IRQ_CRC_ERR) || (irq & SX126X_IRQ_HEADER_ERR)) {
clearIrqStatus();
crcState = ERR_CRC_MISMATCH; crcState = ERR_CRC_MISMATCH;
} }
@ -1171,12 +1171,12 @@ int16_t SX126x::setDio2AsRfSwitch(bool enable) {
} }
int16_t SX126x::setTx(uint32_t timeout) { int16_t SX126x::setTx(uint32_t timeout) {
uint8_t data[3] = {(uint8_t)((timeout >> 16) & 0xFF), (uint8_t)((timeout >> 8) & 0xFF), (uint8_t)(timeout & 0xFF)}; uint8_t data[] = { (uint8_t)((timeout >> 16) & 0xFF), (uint8_t)((timeout >> 8) & 0xFF), (uint8_t)(timeout & 0xFF)} ;
return(SPIwriteCommand(SX126X_CMD_SET_TX, data, 3)); return(SPIwriteCommand(SX126X_CMD_SET_TX, data, 3));
} }
int16_t SX126x::setRx(uint32_t timeout) { int16_t SX126x::setRx(uint32_t timeout) {
uint8_t data[3] = {(uint8_t)((timeout >> 16) & 0xFF), (uint8_t)((timeout >> 8) & 0xFF), (uint8_t)(timeout & 0xFF)}; uint8_t data[] = { (uint8_t)((timeout >> 16) & 0xFF), (uint8_t)((timeout >> 8) & 0xFF), (uint8_t)(timeout & 0xFF) };
return(SPIwriteCommand(SX126X_CMD_SET_RX, data, 3)); return(SPIwriteCommand(SX126X_CMD_SET_RX, data, 3));
} }
@ -1185,32 +1185,28 @@ int16_t SX126x::setCad() {
} }
int16_t SX126x::setPaConfig(uint8_t paDutyCycle, uint8_t deviceSel, uint8_t hpMax, uint8_t paLut) { int16_t SX126x::setPaConfig(uint8_t paDutyCycle, uint8_t deviceSel, uint8_t hpMax, uint8_t paLut) {
uint8_t data[4] = {paDutyCycle, hpMax, deviceSel, paLut}; uint8_t data[] = { paDutyCycle, hpMax, deviceSel, paLut };
return(SPIwriteCommand(SX126X_CMD_SET_PA_CONFIG, data, 4)); return(SPIwriteCommand(SX126X_CMD_SET_PA_CONFIG, data, 4));
} }
int16_t SX126x::writeRegister(uint16_t addr, uint8_t* data, uint8_t numBytes) { int16_t SX126x::writeRegister(uint16_t addr, uint8_t* data, uint8_t numBytes) {
uint8_t cmd[] = { SX126X_CMD_WRITE_REGISTER, (uint8_t)((addr >> 8) & 0xFF), (uint8_t)(addr & 0xFF) }; uint8_t cmd[] = { SX126X_CMD_WRITE_REGISTER, (uint8_t)((addr >> 8) & 0xFF), (uint8_t)(addr & 0xFF) };
int16_t state = SPIwriteCommand(cmd, 3, data, numBytes); return(SPIwriteCommand(cmd, 3, data, numBytes));
return(state);
} }
int16_t SX126x::readRegister(uint16_t addr, uint8_t* data, uint8_t numBytes) { int16_t SX126x::readRegister(uint16_t addr, uint8_t* data, uint8_t numBytes) {
uint8_t cmd[] = {SX126X_CMD_READ_REGISTER, (uint8_t)((addr >> 8) & 0xFF), (uint8_t)(addr & 0xFF)}; uint8_t cmd[] = { SX126X_CMD_READ_REGISTER, (uint8_t)((addr >> 8) & 0xFF), (uint8_t)(addr & 0xFF) };
return(SX126x::SPItransfer(cmd, 3, false, NULL, data, numBytes, true)); return(SX126x::SPItransfer(cmd, 3, false, NULL, data, numBytes, true));
} }
int16_t SX126x::writeBuffer(uint8_t* data, uint8_t numBytes, uint8_t offset) { int16_t SX126x::writeBuffer(uint8_t* data, uint8_t numBytes, uint8_t offset) {
uint8_t cmd[] = { SX126X_CMD_WRITE_BUFFER, offset }; uint8_t cmd[] = { SX126X_CMD_WRITE_BUFFER, offset };
int16_t state = SPIwriteCommand(cmd, 2, data, numBytes); return(SPIwriteCommand(cmd, 2, data, numBytes));
return(state);
} }
int16_t SX126x::readBuffer(uint8_t* data, uint8_t numBytes) { int16_t SX126x::readBuffer(uint8_t* data, uint8_t numBytes) {
uint8_t cmd[] = { SX126X_CMD_READ_BUFFER, SX126X_CMD_NOP }; uint8_t cmd[] = { SX126X_CMD_READ_BUFFER, SX126X_CMD_NOP };
int16_t state = SPIreadCommand(cmd, 2, data, numBytes); return(SPIreadCommand(cmd, 2, data, numBytes));
return(state);
} }
int16_t SX126x::setDioIrqParams(uint16_t irqMask, uint16_t dio1Mask, uint16_t dio2Mask, uint16_t dio3Mask) { int16_t SX126x::setDioIrqParams(uint16_t irqMask, uint16_t dio1Mask, uint16_t dio2Mask, uint16_t dio3Mask) {
@ -1222,18 +1218,18 @@ int16_t SX126x::setDioIrqParams(uint16_t irqMask, uint16_t dio1Mask, uint16_t di
} }
uint16_t SX126x::getIrqStatus() { uint16_t SX126x::getIrqStatus() {
uint8_t data[2] = {0, 0};; uint8_t data[] = { 0x00, 0x00 };
SPIreadCommand(SX126X_CMD_GET_IRQ_STATUS, data, 2); SPIreadCommand(SX126X_CMD_GET_IRQ_STATUS, data, 2);
return(((uint16_t)(data[0]) << 8) | data[1]); return(((uint16_t)(data[0]) << 8) | data[1]);
} }
int16_t SX126x::clearIrqStatus(uint16_t clearIrqParams) { int16_t SX126x::clearIrqStatus(uint16_t clearIrqParams) {
uint8_t data[2] = {(uint8_t)((clearIrqParams >> 8) & 0xFF), (uint8_t)(clearIrqParams & 0xFF)}; uint8_t data[] = { (uint8_t)((clearIrqParams >> 8) & 0xFF), (uint8_t)(clearIrqParams & 0xFF) };
return(SPIwriteCommand(SX126X_CMD_CLEAR_IRQ_STATUS, data, 2)); return(SPIwriteCommand(SX126X_CMD_CLEAR_IRQ_STATUS, data, 2));
} }
int16_t SX126x::setRfFrequency(uint32_t frf) { int16_t SX126x::setRfFrequency(uint32_t frf) {
uint8_t data[4] = {(uint8_t)((frf >> 24) & 0xFF), (uint8_t)((frf >> 16) & 0xFF), (uint8_t)((frf >> 8) & 0xFF), (uint8_t)(frf & 0xFF)}; uint8_t data[] = { (uint8_t)((frf >> 24) & 0xFF), (uint8_t)((frf >> 16) & 0xFF), (uint8_t)((frf >> 8) & 0xFF), (uint8_t)(frf & 0xFF) };
return(SPIwriteCommand(SX126X_CMD_SET_RF_FREQUENCY, data, 4)); return(SPIwriteCommand(SX126X_CMD_SET_RF_FREQUENCY, data, 4));
} }
@ -1248,7 +1244,7 @@ uint8_t SX126x::getPacketType() {
} }
int16_t SX126x::setTxParams(uint8_t power, uint8_t rampTime) { int16_t SX126x::setTxParams(uint8_t power, uint8_t rampTime) {
uint8_t data[2] = {power, rampTime}; uint8_t data[] = { power, rampTime };
return(SPIwriteCommand(SX126X_CMD_SET_TX_PARAMS, data, 2)); return(SPIwriteCommand(SX126X_CMD_SET_TX_PARAMS, data, 2));
} }
@ -1520,6 +1516,7 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d
while(digitalRead(_mod->getGpio())) { while(digitalRead(_mod->getGpio())) {
yield(); yield();
if(millis() - start >= timeout) { if(millis() - start >= timeout) {
digitalWrite(_mod->getCs(), HIGH);
return(ERR_SPI_CMD_TIMEOUT); return(ERR_SPI_CMD_TIMEOUT);
} }
} }

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

@ -106,7 +106,7 @@
// SX126X SPI command variables // SX126X SPI command variables
//SX126X_CMD_SET_SLEEP //SX126X_CMD_SET_SLEEP MSB LSB DESCRIPTION
#define SX126X_SLEEP_START_COLD 0b00000000 // 2 2 sleep mode: cold start, configuration is lost (default) #define SX126X_SLEEP_START_COLD 0b00000000 // 2 2 sleep mode: cold start, configuration is lost (default)
#define SX126X_SLEEP_START_WARM 0b00000100 // 2 2 warm start, configuration is retained #define SX126X_SLEEP_START_WARM 0b00000100 // 2 2 warm start, configuration is retained
#define SX126X_SLEEP_RTC_OFF 0b00000000 // 0 0 wake on RTC timeout: disabled #define SX126X_SLEEP_RTC_OFF 0b00000000 // 0 0 wake on RTC timeout: disabled
@ -768,7 +768,7 @@ class SX126x: public PhysicalLayer {
*/ */
float getSNR(); float getSNR();
/*! /*!
\brief Query modem for the packet length of received payload. \brief Query modem for the packet length of received payload.
\param update Update received packet length. Will return cached value when set to false. \param update Update received packet length. Will return cached value when set to false.
@ -786,7 +786,7 @@ class SX126x: public PhysicalLayer {
*/ */
int16_t fixedPacketLengthMode(uint8_t len = SX126X_MAX_PACKET_LENGTH); int16_t fixedPacketLengthMode(uint8_t len = SX126X_MAX_PACKET_LENGTH);
/*! /*!
\brief Set modem in variable packet length mode. Available in FSK mode only. \brief Set modem in variable packet length mode. Available in FSK mode only.
\param len Maximum packet length. \param len Maximum packet length.
@ -795,7 +795,7 @@ class SX126x: public PhysicalLayer {
*/ */
int16_t variablePacketLengthMode(uint8_t maxLen = SX126X_MAX_PACKET_LENGTH); int16_t variablePacketLengthMode(uint8_t maxLen = SX126X_MAX_PACKET_LENGTH);
/*! /*!
\brief Get expected time-on-air for a given size of payload \brief Get expected time-on-air for a given size of payload
\param len Payload length in bytes. \param len Payload length in bytes.
@ -804,14 +804,14 @@ class SX126x: public PhysicalLayer {
*/ */
uint32_t getTimeOnAir(size_t len); uint32_t getTimeOnAir(size_t len);
/*! /*!
\brief Set implicit header mode for future reception/transmission. \brief Set implicit header mode for future reception/transmission.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t implicitHeader(size_t len); int16_t implicitHeader(size_t len);
/*! /*!
\brief Set explicit header mode for future reception/transmission. \brief Set explicit header mode for future reception/transmission.
\param len Payload length in bytes. \param len Payload length in bytes.
@ -821,17 +821,17 @@ class SX126x: public PhysicalLayer {
int16_t explicitHeader(); int16_t explicitHeader();
/*! /*!
\brief Set regulator mode to LDO. \brief Set regulator mode to LDO.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setRegulatorLDO(); int16_t setRegulatorLDO();
/*! /*!
\brief Set regulator mode to DC-DC. \brief Set regulator mode to DC-DC.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setRegulatorDCDC(); int16_t setRegulatorDCDC();
/*! /*!
@ -846,7 +846,7 @@ class SX126x: public PhysicalLayer {
#ifndef RADIOLIB_GODMODE #ifndef RADIOLIB_GODMODE
protected: protected:
#endif #endif
// SX1276x SPI command implementations // SX126x SPI command implementations
int16_t setTx(uint32_t timeout = 0); int16_t setTx(uint32_t timeout = 0);
int16_t setRx(uint32_t timeout); int16_t setRx(uint32_t timeout);
int16_t setCad(); int16_t setCad();