Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gps] correct version checks #10205

Merged
merged 2 commits into from
Jul 7, 2024
Merged

[gps] correct version checks #10205

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bab471
LTE/GT for 23.1 protocol
mmosca Jul 7, 2024
ccc5c98
Merge remote-tracking branch 'origin/master' into mmosca-ublox-satinfo
mmosca Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/io/gps_ublox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ STATIC_PROTOTHREAD(gpsConfigure)
gpsSetProtocolTimeout(GPS_SHORT_TIMEOUT);

// Set dynamic model
if (ubloxVersionGTE(23, 1)) {
if (ubloxVersionGT(23, 1)) {
ubx_config_data8_payload_t dynmodelCfg[] = {
{UBLOX_CFG_NAVSPG_DYNMODEL, UBX_DYNMODEL_AIR_2G},
{UBLOX_CFG_NAVSPG_FIXMODE, UBX_FIXMODE_AUTO}
Expand Down Expand Up @@ -957,7 +957,7 @@ STATIC_PROTOTHREAD(gpsConfigure)

gpsSetProtocolTimeout(GPS_SHORT_TIMEOUT);
// Disable NMEA messages
if (ubloxVersionGTE(23, 1)) {
if (ubloxVersionGT(23, 1)) {
ubx_config_data8_payload_t nmeaValues[] = {
{ UBLOX_CFG_MSGOUT_NMEA_ID_GGA_UART1, 0 },
{ UBLOX_CFG_MSGOUT_NMEA_ID_GLL_UART1, 0 },
Expand Down Expand Up @@ -992,7 +992,7 @@ STATIC_PROTOTHREAD(gpsConfigure)
gpsSetProtocolTimeout(GPS_SHORT_TIMEOUT);

// M9N & M10 does not support some of the UBX 6/7/8 messages, so we have to configure it using special sequence
if (ubloxVersionGTE(23, 1)) { // M9+, new setting API, PVT and NAV_SIG
if (ubloxVersionGT(23, 1)) { // M9+, new setting API, PVT and NAV_SIG
ubx_config_data8_payload_t rateValues[] = {
{UBLOX_CFG_MSGOUT_NAV_POSLLH_UART1, 0}, // 0
{UBLOX_CFG_MSGOUT_NAV_STATUS_UART1, 0}, // 1
Expand Down Expand Up @@ -1080,7 +1080,7 @@ STATIC_PROTOTHREAD(gpsConfigure)
if (gpsState.hwVersion >= UBX_HW_VERSION_UBLOX8) { // TODO: This check can be remove in INAV 9.0.0
gpsSetProtocolTimeout(GPS_SHORT_TIMEOUT);
bool use_VALSET = 0;
if (ubloxVersionGTE(23,1)) {
if (ubloxVersionGT(23,1)) {
use_VALSET = 1;
}

Expand Down
Loading