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: fix Septentrino serial read #22936

Merged
merged 2 commits into from
Apr 2, 2024
Merged

gps: fix Septentrino serial read #22936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85995b5
gps: fix Septentrino serial read
julianoes Mar 27, 2024
fbaeb00
Merge branch 'main' into pr-fix-septentrino-serial
dagar Apr 1, 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
6 changes: 3 additions & 3 deletions src/drivers/gps/gps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,14 @@ int GPS::callback(GPSCallbackType type, void *data1, int data2, void *user)
int GPS::pollOrRead(uint8_t *buf, size_t buf_length, int timeout)
{
int ret = 0;
const unsigned character_count = 32; // minimum bytes that we want to read
const size_t character_count = 32; // minimum bytes that we want to read
const int max_timeout = 50;
int timeout_adjusted = math::min(max_timeout, timeout);

handleInjectDataTopic();

if (_interface == GPSHelper::Interface::UART) {
ret = _uart.readAtLeast(buf, buf_length, character_count, timeout_adjusted);
ret = _uart.readAtLeast(buf, buf_length, math::min(character_count, buf_length), timeout_adjusted);

// SPI is only supported on LInux
#if defined(__PX4_LINUX)
Expand Down Expand Up @@ -1560,4 +1560,4 @@ int
gps_main(int argc, char *argv[])
{
return GPS::main(argc, argv);
}
}
Loading