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

Fix T1000-E GPS - some changes went missing from #4303? #4328

Merged
merged 9 commits into from
Jul 25, 2024
Merged

Fix T1000-E GPS - some changes went missing from #4303? #4328

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f2ddab
Update GPS.cpp
markbirss Jul 25, 2024
6e57353
Update GPS.cpp
markbirss Jul 25, 2024
4c74467
Update GPS.cpp
markbirss Jul 25, 2024
7cff6b8
Update GPS.cpp
markbirss Jul 25, 2024
f091b77
Update GPS.cpp
markbirss Jul 25, 2024
5f7fd6a
Update GPS.cpp
markbirss Jul 25, 2024
4f35afd
Update GPS.cpp
markbirss Jul 25, 2024
3b4ffa1
Update GPS.cpp
markbirss Jul 25, 2024
1d5638b
Update GPS.cpp
markbirss Jul 25, 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
15 changes: 13 additions & 2 deletions src/gps/GPS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,16 @@ bool GPS::setup()
int msglen = 0;

if (!didSerialInit) {

#ifdef GNSS_AIROHA
if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
probe(GPS_BAUDRATE);
LOG_INFO("GPS setting to %d.\n", GPS_BAUDRATE);
}
#else
#if !defined(GPS_UC6580)

if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {

// if GPS_BAUDRATE is specified in variant (i.e. not 9600), skip to the specified rate.
if (speedSelect == 0 && GPS_BAUDRATE != serialSpeeds[speedSelect]) {
speedSelect = std::find(serialSpeeds, std::end(serialSpeeds), GPS_BAUDRATE) - serialSpeeds;
Expand All @@ -423,6 +430,9 @@ bool GPS::setup()
} else {
gnssModel = GNSS_MODEL_UNKNOWN;
}
#else
gnssModel = GNSS_MODEL_UC6580;
#endif

if (gnssModel == GNSS_MODEL_MTK) {
/*
Expand Down Expand Up @@ -774,6 +784,7 @@ bool GPS::setup()
LOG_INFO("GNSS module configuration saved!\n");
}
}
#endif
didSerialInit = true;
}

Expand Down Expand Up @@ -1789,4 +1800,4 @@ void GPS::toggleGpsMode()
enable();
}
}
#endif // Exclude GPS
#endif // Exclude GPS
Loading