Git-Mirrors/RNode_Firmware_CE
1
0
Fork 0
mirror of https://github.com/liberatedsystems/RNode_Firmware_CE.git synced 2025-02-24 00:40:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix final SX127X modulation parameter issues #39

Browse Source
This commit is contained in:
jacob.eva 2025-01-10 21:31:03 +00:00
parent 46a46b4069
commit d2c0d53bdd
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
2 changed files with 25 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Radio.cpp
View File

@ -1162,23 +1162,28 @@ uint8_t ISR_VECT sx127x::singleTransfer(uint8_t address, uint8_t value) {
int sx127x::begin() { int sx127x::begin() {
if (_reset != -1) { if (_reset != -1) {
pinMode(_reset, OUTPUT); pinMode(_reset, OUTPUT);
// Perform reset // Perform reset
digitalWrite(_reset, LOW); digitalWrite(_reset, LOW);
delay(10); delay(10);
digitalWrite(_reset, HIGH); digitalWrite(_reset, HIGH);
delay(10); delay(10);
} }
sleep();
if (_busy != -1) { pinMode(_busy, INPUT); } if (_busy != -1) { pinMode(_busy, INPUT); }
if (!_preinit_done) { if (!_preinit_done) {
if (!preInit()) { return false; } if (!preInit()) { return false; }
} }
sleep();
setFrequency(_frequency); setFrequency(_frequency);
setSignalBandwidth(_bw);
setSpreadingFactor(_sf);
setCodingRate4(_cr);
setTxPower(_txp);
// set base addresses // set base addresses
writeRegister(REG_FIFO_TX_BASE_ADDR_7X, 0); writeRegister(REG_FIFO_TX_BASE_ADDR_7X, 0);
@ -1190,7 +1195,6 @@ int sx127x::begin() {
setSyncWord(SYNC_WORD_7X); setSyncWord(SYNC_WORD_7X);
enableCrc(); enableCrc();
setTxPower(2);
standby(); standby();
@ -1201,10 +1205,8 @@ int sx127x::begin() {
void sx127x::end() { void sx127x::end() {
sleep(); sleep();
_spiModem->end();
_bitrate = 0; _bitrate = 0;
_radio_online = false; _radio_online = false;
_preinit_done = false;
} }
int sx127x::beginPacket(int implicitHeader) { int sx127x::beginPacket(int implicitHeader) {
@ -1377,7 +1379,7 @@ void sx127x::setTxPower(int level, int outputPin) {
writeRegister(REG_PA_DAC_7X, 0x84); writeRegister(REG_PA_DAC_7X, 0x84);
writeRegister(REG_PA_CONFIG_7X, 0x70 | level); writeRegister(REG_PA_CONFIG_7X, 0x70 | level);
_txp = level;
} else { } else {
if (level < 2) { level = 2; } if (level < 2) { level = 2; }
else if (level > 17) { level = 17; } else if (level > 17) { level = 17; }
@ -1388,11 +1390,11 @@ void sx127x::setTxPower(int level, int outputPin) {
} }
} }
//int8_t sx127x::getTxPower() { return readRegister(REG_PA_CONFIG_7X) - 126; } int8_t sx127x::getTxPower() { return readRegister(REG_PA_CONFIG_7X) - 126; }
int8_t sx127x::getTxPower() { return _txp; }
void sx127x::setFrequency(uint32_t frequency) { void sx127x::setFrequency(uint32_t frequency) {
_frequency = frequency; _frequency = frequency;
uint32_t frf = ((uint64_t)frequency << 19) / 32000000; uint32_t frf = ((uint64_t)frequency << 19) / 32000000;
writeRegister(REG_FRF_MSB_7X, (uint8_t)(frf >> 16)); writeRegister(REG_FRF_MSB_7X, (uint8_t)(frf >> 16));
@ -1403,35 +1405,23 @@ void sx127x::setFrequency(uint32_t frequency) {
} }
uint32_t sx127x::getFrequency() { uint32_t sx127x::getFrequency() {
uint8_t msb = readRegister(REG_FRF_MSB_7X); return _frequency;
uint8_t mid = readRegister(REG_FRF_MID_7X);
uint8_t lsb = readRegister(REG_FRF_LSB_7X);
uint32_t frf = ((uint32_t)msb << 16) | ((uint32_t)mid << 8) | (uint32_t)lsb;
uint64_t frm = (uint64_t)frf*32000000;
uint32_t frequency = (frm >> 19);
// TODO, figure out why frequency from module is slightly wrong
if (_frequency != frequency) {
return _frequency;
} else {
return frequency;
}
} }
void sx127x::setSpreadingFactor(int sf) { void sx127x::setSpreadingFactor(int sf) {
if (sf < 6) { sf = 6; } if (sf < 6) { sf = 6; }
else if (sf > 12) { sf = 12; } else if (sf > 12) { sf = 12; }
_sf = sf;
if (sf == 6) { if (sf == 6) {
writeRegister(REG_DETECTION_OPTIMIZE_7X, 0xc5); writeRegister(REG_DETECTION_OPTIMIZE_7X, 0xc5);
writeRegister(REG_DETECTION_THRESHOLD_7X, 0x0c); writeRegister(REG_DETECTION_THRESHOLD_7X, 0x0c);
} else { } else {
writeRegister(REG_DETECTION_OPTIMIZE_7X, 0xc3); writeRegister(REG_DETECTION_OPTIMIZE_7X, 0xc3);
writeRegister(REG_DETECTION_THRESHOLD_7X, 0x0a); writeRegister(REG_DETECTION_THRESHOLD_7X, 0x0a);
} }
_sf = sf;
writeRegister(REG_MODEM_CONFIG_2_7X, (readRegister(REG_MODEM_CONFIG_2_7X) & 0x0f) | ((sf << 4) & 0xf0)); writeRegister(REG_MODEM_CONFIG_2_7X, (readRegister(REG_MODEM_CONFIG_2_7X) & 0x0f) | ((sf << 4) & 0xf0));
handleLowDataRate(); handleLowDataRate();
@ -1443,26 +1433,7 @@ uint8_t sx127x::getSpreadingFactor()
} }
uint32_t sx127x::getSignalBandwidth() { uint32_t sx127x::getSignalBandwidth() {
uint8_t bw; return _bw;
if (_radio_online) {
bw = (readRegister(REG_MODEM_CONFIG_1_7X) >> 4);
} else {
bw = _bw;
}
switch (bw) {
case 0: return 7.8E3;
case 1: return 10.4E3;
case 2: return 15.6E3;
case 3: return 20.8E3;
case 4: return 31.25E3;
case 5: return 41.7E3;
case 6: return 62.5E3;
case 7: return 125E3;
case 8: return 250E3;
case 9: return 500E3;
}
return 0;
} }
void sx127x::setSignalBandwidth(uint32_t sbw) { void sx127x::setSignalBandwidth(uint32_t sbw) {
@ -1490,7 +1461,7 @@ void sx127x::setSignalBandwidth(uint32_t sbw) {
} }
writeRegister(REG_MODEM_CONFIG_1_7X, (readRegister(REG_MODEM_CONFIG_1_7X) & 0x0f) | (bw << 4)); writeRegister(REG_MODEM_CONFIG_1_7X, (readRegister(REG_MODEM_CONFIG_1_7X) & 0x0f) | (bw << 4));
_bw = bw; _bw = sbw;
handleLowDataRate(); handleLowDataRate();
optimizeModemSensitivity(); optimizeModemSensitivity();
} }

2
Radio.hpp
View File

@ -546,7 +546,7 @@ private:
bool _preinit_done; bool _preinit_done;
uint8_t _sf; uint8_t _sf;
uint8_t _cr; uint8_t _cr;
uint8_t _bw; uint32_t _bw;
}; };
class sx128x : public RadioInterface { class sx128x : public RadioInterface {