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

Improve Linux experience for crank run --device #36

Merged
merged 5 commits into from
Feb 26, 2023
Merged

Improve Linux experience for crank run --device #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5188b9d
On Linux, do not wait for modem_path to disappear
tjkirch Feb 25, 2023
c24aa2a
On Linux, sleep before calling pdutil run
tjkirch Feb 25, 2023
69d9bf7
On Linux, add output about pressing 'A' to exit Data Disk mode
tjkirch Feb 25, 2023
423f3e4
On Linux, add message about mounting Playdate device
tjkirch Feb 25, 2023
5e1bf98
Bump version to 0.2.7
tjkirch Feb 26, 2023
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "crankstart-cli"
version = "0.2.6"
version = "0.2.7"
authors = ["Rob Tsuk <rob@tsuk.com>"]
edition = "2018"
description = "A command line tool for use with [Crankstart](https://github.com/pd-rs/crankstart)."
Expand Down
14 changes: 14 additions & 0 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,17 @@ impl Build {
info!("datadisk cmd: {:#?}", cmd);
let _ = cmd.status()?;

// Note: this device doesn't disappear on one Linux developer's system; is this always
// true? Should we instead have a maximum delay and then continue regardless?
#[cfg(not(target_os = "linux"))]
while modem_path.exists() {
thread::sleep(duration);
}
}

#[cfg(target_os = "linux")]
println!("If your OS does not automatically mount your Playdate, please do so now.");

while !data_path.exists() {
thread::sleep(duration);
}
Expand Down Expand Up @@ -497,10 +503,18 @@ impl Build {
let _ = cmd.status()?;
}

#[cfg(target_os = "linux")]
println!("Please press 'A' on the Playdate to exit Data Disk mode.");

while !modem_path.exists() {
thread::sleep(duration);
}

// Note: this sleep was determined by testing on one Linux system and may not be
// consistent; is there a better marker that we're ready to call pdutil run?
#[cfg(target_os = "linux")]
thread::sleep(duration * 10);

let mut cmd = Command::new(&pdutil_path);
cmd.arg(modem_path)
.arg("run")
Expand Down