Skip to content

Commit 236067f

Browse files
barafaelRafael Bachmann
authored andcommitted
Update to ebyte-32 0.9.0
1 parent 6a69fb6 commit 236067f

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ clap = { version = "3.1.14", features = ["derive"] }
2121
#ebyte-e32 = { git = "https://github.com/barafael/ebyte-e32-rs", rev = "fee291a427df8e7c55e8dc154e181257ebb52a41", features = [
2222
#"arg_enum",
2323
#] }
24-
ebyte-e32 = { version = "0.8.0", features = ["value_enum"] }
24+
ebyte-e32 = { version = "0.9.0", features = ["value_enum"] }
2525
embedded-hal = "0.2.7"
2626
klask = "1"
2727
linux-embedded-hal = "0.3.2"

src/lib.rs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub fn create(args: &Args) -> anyhow::Result<Ebyte<Serial, Pin, Pin, Pin, Delay,
8181
.context("Failed to request settings for M1 pin")?;
8282
let m1 = Pin::new(m1).context("Failed to create M1 CDEV pin")?;
8383

84-
Ok(Ebyte::new(serial, aux, m0, m1, Delay).expect("Failed to initialize driver"))
84+
Ebyte::new(serial, aux, m0, m1, Delay).context("Failed to initialize driver")
8585
}
8686

8787
pub fn run<S, AUX, M0, M1, D>(
@@ -102,17 +102,19 @@ where
102102
Mode::Listen => loop {
103103
let b = block!(ebyte.read()).expect("Failed to read");
104104
print!("{}", b as char);
105-
std::io::Write::flush(&mut std::io::stdout()).expect("Failed to flush");
105+
std::io::Write::flush(&mut std::io::stdout()).context("Failed to flush")?;
106106
},
107107
Mode::ReadModelData => {
108108
println!("Reading model data");
109-
let model_data = ebyte.model_data().expect("Failed to read model data");
109+
let model_data = ebyte.model_data().context("Failed to read model data")?;
110110
println!("{model_data:#?}");
111111
Ok(())
112112
}
113113
Mode::ReadParameters => {
114114
println!("Reading parameter data");
115-
let parameters = ebyte.parameters().expect("Failed to read parameter data");
115+
let parameters = ebyte
116+
.parameters()
117+
.context("Failed to read parameter data")?;
116118
println!("{parameters:#?}");
117119
Ok(())
118120
}
@@ -132,7 +134,7 @@ where
132134
M1: OutputPin,
133135
D: delay::DelayMs<u32>,
134136
{
135-
let mut prompt = Editor::<()>::new().expect("Failed to set up prompt");
137+
let mut prompt = Editor::<()>::new().context("Failed to set up prompt")?;
136138
loop {
137139
match prompt.readline("Enter message >> ") {
138140
Ok(line) => {
@@ -144,7 +146,7 @@ where
144146
for b in line.as_bytes() {
145147
block!(ebyte.write(*b)).expect("Failed to write");
146148
print!("{}", *b as char);
147-
std::io::Write::flush(&mut std::io::stdout()).expect("Failed to flush");
149+
std::io::Write::flush(&mut std::io::stdout()).context("Failed to flush")?;
148150
}
149151
block!(ebyte.write(b'\n')).expect("Failed to write");
150152
println!();
@@ -187,7 +189,7 @@ where
187189
println!("Loading existing parameters");
188190
let old_params = ebyte
189191
.parameters()
190-
.expect("Failed to read existing parameters");
192+
.context("Failed to read existing parameters")?;
191193
println!("Loaded parameters: {old_params:#?}");
192194

193195
// Create Ebyte parameters from argument parameters.
@@ -202,12 +204,12 @@ where
202204
);
203205
ebyte
204206
.set_parameters(&new_params, parameters.persistence)
205-
.expect("Failed to set new parameters");
207+
.context("Failed to set new parameters")?;
206208

207209
// Check if it worked.
208210
let current_params = ebyte
209211
.parameters()
210-
.expect("Failed to read current parameters");
212+
.context("Failed to read current parameters")?;
211213
if current_params != new_params {
212214
eprintln!("Error: parameters unchanged: {current_params:#?}");
213215
}

0 commit comments

Comments
 (0)