diff --git a/third_party/flserial/macos/Classes/flserial.cpp b/third_party/flserial/macos/Classes/flserial.cpp index ec30afc7..34e99ab2 100644 --- a/third_party/flserial/macos/Classes/flserial.cpp +++ b/third_party/flserial/macos/Classes/flserial.cpp @@ -154,7 +154,12 @@ FFI_PLUGIN_EXPORT int fl_open(int flh, char *portname, int baudrate) port->serialport = new serial::Serial(); #if !defined(__linux__) && !defined(__APPLE__) port->serialport->setTimeout(serial::Timeout(0, 2, 0, 0, 0)); -#endif // #if defined(__linux__) +#else + // With a zero read timeout, read() returns immediately on an idle + // O_NONBLOCK port and SerialThread spins. A short timeout lets select() + // sleep; arriving data still wakes it immediately. + port->serialport->setTimeout(10, 10, 0, 0, 0); +#endif port->serialport->setPort(portname); port->serialport->setBaudrate(baudrate); diff --git a/third_party/flserial/src/flserial.cpp b/third_party/flserial/src/flserial.cpp index a58206e6..ebdf2b2f 100644 --- a/third_party/flserial/src/flserial.cpp +++ b/third_party/flserial/src/flserial.cpp @@ -167,7 +167,12 @@ FFI_PLUGIN_EXPORT int fl_open(int flh, char *portname, int baudrate) port->serialport = new serial::Serial(); #if !defined(__linux__) && !defined(__APPLE__) port->serialport->setTimeout(serial::Timeout(0, 2, 0, 0, 0)); -#endif // #if defined(__linux__) +#else + // With a zero read timeout, read() returns immediately on an idle + // O_NONBLOCK port and SerialThread spins. A short timeout lets select() + // sleep; arriving data still wakes it immediately. + port->serialport->setTimeout(10, 10, 0, 0, 0); +#endif port->serialport->setPort(portname); port->serialport->setBaudrate(baudrate);