Skip to content

windows: Fix --console follow #136

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.

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

Merged
merged 1 commit into from
May 7, 2025
Merged
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions framework_lib/src/chromium_ec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1044,21 +1044,21 @@ impl CrosEc {
loop {
match cmd.send_command_vec(self) {
Ok(data) => {
// EC Buffer is empty. That means we've read everything from the snapshot
// The windows crosecbus driver returns all NULL instead of empty response
if data.is_empty() || data.iter().all(|x| *x == 0) {
// EC Buffer is empty. That means we've read everything from the snapshot.
// The windows crosecbus driver returns all NULL with a leading 0x01 instead of
// an empty response.
if data.is_empty() || data.iter().all(|x| *x == 0 || *x == 1) {
debug!("Empty EC response. Stopping console read");
// Don't read too fast, wait a second before reading more
os_specific::sleep(1_000_000);
// Don't read too fast, wait 100ms before reading more
os_specific::sleep(100_000);
EcRequestConsoleSnapshot {}.send_command(self)?;
cmd.subcmd = ConsoleReadSubCommand::ConsoleReadRecent as u8;
continue;
}

let utf8 = std::str::from_utf8(&data).unwrap();
let ascii = utf8
.replace(|c: char| !c.is_ascii(), "")
.replace(['\0'], "");
let full_ascii = utf8.replace(|c: char| !c.is_ascii(), "");
let ascii = full_ascii.replace(['\0'], "");

print!("{}", ascii);
}
Expand Down
Loading