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

[SX128x] Implemented ranging fixes from #293

Browse source
This commit is contained in:
jgromes 2021-05-05 20:34:59 +02:00
parent 0810a6c4cc
commit 333aa433d9
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/SX128x/SX1280.cpp
View file

@ -105,7 +105,7 @@ int16_t SX1280::startRanging(bool master, uint32_t addr) {
return(ERR_INVALID_BANDWIDTH); return(ERR_INVALID_BANDWIDTH);
} }
uint8_t calBuff[] = { (uint8_t)((val >> 8) & 0xFF), (uint8_t)(val & 0xFF) }; uint8_t calBuff[] = { (uint8_t)((val >> 8) & 0xFF), (uint8_t)(val & 0xFF) };
state = writeRegister(SX128X_REG_RANGING_CALIBRATION_MSB, calBuff, 4); state = writeRegister(SX128X_REG_RANGING_CALIBRATION_MSB, calBuff, 2);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set role and start ranging // set role and start ranging
@ -138,7 +138,7 @@ float SX1280::getRangingResult() {
state = readRegister(SX128X_REG_RANGING_LORA_CLOCK_ENABLE, data, 1); state = readRegister(SX128X_REG_RANGING_LORA_CLOCK_ENABLE, data, 1);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
data[0] |= 1; data[0] |= (1 << 1);
state = writeRegister(SX128X_REG_RANGING_LORA_CLOCK_ENABLE, data, 1); state = writeRegister(SX128X_REG_RANGING_LORA_CLOCK_ENABLE, data, 1);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
@ -147,12 +147,16 @@ float SX1280::getRangingResult() {
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
data[0] &= 0xCF; data[0] &= 0xCF;
data[0] |= 1 << 4; data[0] |= (1 << 4);
state = writeRegister(SX128X_REG_RANGING_TYPE, data, 1); state = writeRegister(SX128X_REG_RANGING_TYPE, data, 1);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// read the register values // read the register values
state = readRegister(SX128X_REG_RANGING_RESULT_MSB, data + 1, 3); state = readRegister(SX128X_REG_RANGING_RESULT_MSB, &data[0], 1);
RADIOLIB_ASSERT(state);
state = readRegister(SX128X_REG_RANGING_RESULT_MID, &data[1], 1);
RADIOLIB_ASSERT(state);
state = readRegister(SX128X_REG_RANGING_RESULT_LSB, &data[2], 1);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// set mode to standby RC // set mode to standby RC
@ -160,9 +164,8 @@ float SX1280::getRangingResult() {
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// calculate the real result // calculate the real result
uint32_t raw = 0; uint32_t raw = ((uint32_t)data[0] << 16) | ((uint32_t)data[1] << 8) | data[2];
memcpy(&raw, data, sizeof(uint32_t)); return((float)raw * 150.0 / (4.096 * _bwKhz));
return((float)raw * (150.0/(4.096 * _bwKhz)));
} }
#endif #endif