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

Merge branch 'jgromes:master' into Base

Browse source
This commit is contained in:
Crsarmv7l 2025-02-19 10:56:36 +01:00 • committed by GitHub
commit dd4bc792e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/modules/LR11x0/LR11x0.cpp
View file

@ -3254,8 +3254,8 @@ int16_t LR11x0::gnssAssisted(uint32_t gpsTime, uint8_t effort, uint8_t resMask,
}
int16_t LR11x0::gnssSetAssistancePosition(float lat, float lon) {
uint16_t latRaw = (lat*2048.0f)/90.0f + 0.5f;
uint16_t lonRaw = (lon*2048.0f)/180.0f + 0.5f;
int16_t latRaw = (lat*2048.0f)/90.0f + 0.5f;
int16_t lonRaw = (lon*2048.0f)/180.0f + 0.5f;
uint8_t buff[4] = {
(uint8_t)((latRaw >> 8) & 0xFF), (uint8_t)(latRaw & 0xFF),
(uint8_t)((lonRaw >> 8) & 0xFF), (uint8_t)(lonRaw & 0xFF),
@ -3269,11 +3269,11 @@ int16_t LR11x0::gnssReadAssistancePosition(float* lat, float* lon) {
// pass the replies
if(lat) {
uint16_t latRaw = ((uint16_t)(buff[0]) << 8) | (uint16_t)(buff[1]);
int16_t latRaw = ((int16_t)(buff[0]) << 8) | (int16_t)(buff[1]);
*lat = ((float)latRaw*90.0f)/2048.0f;
}
if(lon) {
uint16_t lonRaw = ((uint16_t)(buff[2]) << 8) | (uint16_t)(buff[3]);
int16_t lonRaw = ((int16_t)(buff[2]) << 8) | (int16_t)(buff[3]);
*lon = ((float)lonRaw*180.0f)/2048.0f;
}
@ -3403,8 +3403,8 @@ int16_t LR11x0::gnssAlmanacReadSV(uint8_t svId, uint8_t* almanac) {
}
int16_t LR11x0::gnssGetNbSvVisible(uint32_t time, float lat, float lon, uint8_t constellation, uint8_t* nbSv) {
uint16_t latRaw = (lat*2048.0f)/90.0f + 0.5f;
uint16_t lonRaw = (lon*2048.0f)/180.0f + 0.5f;
int16_t latRaw = (lat*2048.0f)/90.0f + 0.5f;
int16_t lonRaw = (lon*2048.0f)/180.0f + 0.5f;
uint8_t reqBuff[9] = {
(uint8_t)((time >> 24) & 0xFF), (uint8_t)((time >> 16) & 0xFF),
(uint8_t)((time >> 8) & 0xFF), (uint8_t)(time & 0xFF),
@ -3541,21 +3541,21 @@ int16_t LR11x0::gnssReadDopplerSolverRes(uint8_t* error, uint8_t* nbSvUsed, floa
if(error) { *error = buff[0]; }
if(nbSvUsed) { *nbSvUsed = buff[1]; }
if(lat) {
uint16_t latRaw = ((uint16_t)(buff[2]) << 8) | (uint16_t)buff[3];
int16_t latRaw = ((int16_t)(buff[2]) << 8) | (int16_t)buff[3];
*lat = ((float)latRaw * 90.0f)/2048.0f;
}
if(lon) {
uint16_t lonRaw = ((uint16_t)(buff[4]) << 8) | (uint16_t)buff[5];
int16_t lonRaw = ((int16_t)(buff[4]) << 8) | (int16_t)buff[5];
*lon = ((float)lonRaw * 180.0f)/2048.0f;
}
if(accuracy) { *accuracy = ((uint16_t)(buff[6]) << 8) | (uint16_t)buff[7]; }
if(xtal) { *xtal = ((uint16_t)(buff[8]) << 8) | (uint16_t)buff[9]; }
if(latFilt) {
uint16_t latRaw = ((uint16_t)(buff[10]) << 8) | (uint16_t)buff[11];
int16_t latRaw = ((int16_t)(buff[10]) << 8) | (int16_t)buff[11];
*latFilt = ((float)latRaw * 90.0f)/2048.0f;
}
if(lonFilt) {
uint16_t lonRaw = ((uint16_t)(buff[12]) << 8) | (uint16_t)buff[13];
int16_t lonRaw = ((int16_t)(buff[12]) << 8) | (int16_t)buff[13];
*lonFilt = ((float)lonRaw * 180.0f)/2048.0f;
}
if(accuracyFilt) { *accuracyFilt = ((uint16_t)(buff[14]) << 8) | (uint16_t)buff[15]; }

3
src/modules/SX127x/SX1272.cpp
View file

@ -279,8 +279,9 @@ int16_t SX1272::setOutputPower(int8_t power) {
return(this->setOutputPower(power, false));
}
int16_t SX1272::setOutputPower(int8_t power, bool useRfo) {
int16_t SX1272::setOutputPower(int8_t power, bool forceRfo) {
// check if power value is configurable
bool useRfo = (power < 2) || forceRfo;
int16_t state = checkOutputPower(power, NULL, useRfo);
RADIOLIB_ASSERT(state);

5
src/modules/SX127x/SX1272.h
View file

@ -201,10 +201,11 @@ class SX1272: public SX127x {
/*!
\brief Sets transmission output power. Allowed values range from -1 to 14 dBm (RFO pin) or +2 to +20 dBm (PA_BOOST pin).
\param power Transmission output power in dBm.
\param useRfo Whether to use the RFO (true) or the PA_BOOST (false) pin for the RF output.
\param forceRfo Whether to force using the RFO pin for the RF output (true)
or to leave the selection up to user (false) based on power output.
\returns \ref status_codes
*/
int16_t setOutputPower(int8_t power, bool useRfo);
int16_t setOutputPower(int8_t power, bool forceRfo);
/*!
\brief Check if output power is configurable.

3
src/modules/SX127x/SX1278.cpp
View file

@ -293,8 +293,9 @@ int16_t SX1278::setOutputPower(int8_t power) {
return(this->setOutputPower(power, false));
}
int16_t SX1278::setOutputPower(int8_t power, bool useRfo) {
int16_t SX1278::setOutputPower(int8_t power, bool forceRfo) {
// check if power value is configurable
bool useRfo = (power < 2) || forceRfo;
int16_t state = checkOutputPower(power, NULL, useRfo);
RADIOLIB_ASSERT(state);

5
src/modules/SX127x/SX1278.h
View file

@ -213,10 +213,11 @@ class SX1278: public SX127x {
\brief Sets transmission output power. Allowed values range from -4 to 15 dBm (RFO pin) or +2 to +17 dBm (PA_BOOST pin).
High power +20 dBm operation is also supported, on the PA_BOOST pin.
\param power Transmission output power in dBm.
\param useRfo Whether to use the RFO (true) or the PA_BOOST (false) pin for the RF output.
\param forceRfo Whether to force using the RFO pin for the RF output (true)
or to leave the selection up to user (false) based on power output.
\returns \ref status_codes
*/
int16_t setOutputPower(int8_t power, bool useRfo);
int16_t setOutputPower(int8_t power, bool forceRfo);
/*!
\brief Check if output power is configurable.