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

[Regression] Fix custom baudrate for OSX & Linux #186

Merged
merged 1 commit into from
Dec 23, 2024
Merged

[Regression] Fix custom baudrate for OSX & Linux #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/serialport_unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ void ConnectionOptionsBaton::Execute() {
// If there is a custom baud rate on linux you can do the following trick with B38400
#if defined(__linux__) && defined(ASYNC_SPD_CUST)
if (baudRate == -1) {
int err = linuxSetCustomBaudRate(fd, baudRate);
int err = linuxSetCustomBaudRate(fd, this->baudRate);

if (err == -1) {
snprintf(errorString, sizeof(errorString), "Error: %s || while retrieving termios2 info", strerror(errno));
this->SetError(errorString);
return;
} else if (err == -2) {
snprintf(errorString, sizeof(errorString), "Error: %s || while setting custom baud rate of %d", strerror(errno), baudRate);
snprintf(errorString, sizeof(errorString), "Error: %s || while setting custom baud rate of %d", strerror(errno), this->baudRate);
this->SetError(errorString);
return;
}
Expand All @@ -133,7 +133,7 @@ void ConnectionOptionsBaton::Execute() {
// On OS X, starting with Tiger, we can set a custom baud rate with ioctl
#if defined(MAC_OS_X_VERSION_10_4) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4)
if (-1 == baudRate) {
speed_t speed = baudRate;
speed_t speed = this->baudRate;
if (-1 == ioctl(fd, IOSSIOSPEED, &speed)) {
snprintf(errorString, sizeof(errorString), "Error: %s calling ioctl(.., IOSSIOSPEED, %ld )", strerror(errno), speed);
this->SetError(errorString);
Expand Down