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

Jump to bottom

Fix write timeout for COM ports #158

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix write timeout for COM ports #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e6b5c
Fix write timeout for COM ports
nskartoredjo Feb 13, 2024
24d2bff
Add the fix to the changelog
Feb 15, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ project adheres to [Semantic Versioning](https://semver.org/).
### Fixed
* Fixes a bug where `available_ports()` returned disabled devices on Windows.
[#144](https://github.com/serialport/serialport-rs/pull/144)
* Fixes a bug on Windows where the `WriteTotalTimeoutConstant` field hasn't been
configured properly when the `set_timeout` method is called.
[#124](https://github.com/serialport/serialport-rs/issues/124)

### Removed

Expand Down
4 changes: 2 additions & 2 deletions src/windows/com.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@ impl SerialPort for COMPort {
}

fn set_timeout(&mut self, timeout: Duration) -> Result<()> {
let milliseconds = timeout.as_secs() * 1000 + timeout.subsec_nanos() as u64 / 1_000_000;
let milliseconds = timeout.as_millis();
nskartoredjo marked this conversation as resolved.
Show resolved Hide resolved

let mut timeouts = COMMTIMEOUTS {
ReadIntervalTimeout: 0,
ReadTotalTimeoutMultiplier: 0,
ReadTotalTimeoutConstant: milliseconds as DWORD,
WriteTotalTimeoutMultiplier: 0,
WriteTotalTimeoutConstant: 0,
WriteTotalTimeoutConstant: milliseconds as DWORD,
};

if unsafe { SetCommTimeouts(self.handle, &mut timeouts) } == 0 {
Expand Down