Skip to content

Commit 1ff9ff7

Browse files
committed
--inputdeck: Print ADC value more cleanly
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
1 parent 5e8397e commit 1ff9ff7

2 files changed

Lines changed: 21 additions & 23 deletions

File tree

EXAMPLES.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,12 @@ ESRT Entry 3
349349
> framework_tool --inputdeck
350350
Input Deck
351351
Chassis Closed: true
352-
Power Button Board: Present
353-
Audio Daughterboard: Present
354-
Touchpad: Present
352+
Power Button Board: Present (10)
353+
ADC Value 1655mV
354+
Audio Daughterboard: Present (2)
355+
ADC Value 0302mV
356+
Touchpad: Present (10)
357+
ADC Value 1655mV
355358
```
356359

357360
### On Framework 13

framework_lib/src/chromium_ec/mod.rs

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,9 @@ impl CrosEc {
654654
is_present(false).to_string()
655655
}
656656
);
657-
println!(
658-
" ADC Value (mV) {:?}",
659-
self.adc_read(Framework12Adc::PowerButtonBoardId as u8)
660-
);
657+
if let Ok(adc) = self.adc_read(Framework12Adc::PowerButtonBoardId as u8) {
658+
println!(" ADC Value {:04}mV", adc);
659+
}
661660
println!(
662661
" Audio Daughterboard: {}",
663662
if let Some(audio) = audio {
@@ -666,10 +665,9 @@ impl CrosEc {
666665
is_present(false).to_string()
667666
}
668667
);
669-
println!(
670-
" ADC Value (mV) {:?}",
671-
self.adc_read(Framework12Adc::AudioBoardId as u8)
672-
);
668+
if let Ok(adc) = self.adc_read(Framework12Adc::AudioBoardId as u8) {
669+
println!(" ADC Value {:04}mV", adc);
670+
}
673671
println!(
674672
" Touchpad: {}",
675673
if let Some(tp) = tp {
@@ -678,10 +676,9 @@ impl CrosEc {
678676
is_present(false).to_string()
679677
}
680678
);
681-
println!(
682-
" ADC Value (mV) {:?}",
683-
self.adc_read(Framework12Adc::TouchpadBoardId as u8)
684-
);
679+
if let Ok(adc) = self.adc_read(Framework12Adc::TouchpadBoardId as u8) {
680+
println!(" ADC Value {:04}mV", adc);
681+
}
685682

686683
if let Ok(status) = self.get_input_deck_status() {
687684
println!(" Deck State: {:?}", status.state);
@@ -726,10 +723,9 @@ impl CrosEc {
726723
is_present(false).to_string()
727724
}
728725
);
729-
println!(
730-
" ADC Value (mV) {:?}",
731-
self.adc_read(Framework13Adc::AudioBoardId as u8)
732-
);
726+
if let Ok(adc) = self.adc_read(Framework13Adc::AudioBoardId as u8) {
727+
println!(" ADC Value {:04}mV", adc);
728+
}
733729
println!(
734730
" Touchpad: {}",
735731
if let Some(tp) = tp {
@@ -738,10 +734,9 @@ impl CrosEc {
738734
is_present(false).to_string()
739735
}
740736
);
741-
println!(
742-
" ADC Value (mV) {:?}",
743-
self.adc_read(Framework13Adc::TouchpadBoardId as u8)
744-
);
737+
if let Ok(adc) = self.adc_read(Framework13Adc::TouchpadBoardId as u8) {
738+
println!(" ADC Value {:04}mV", adc);
739+
}
745740

746741
Ok(())
747742
}

0 commit comments

Comments
 (0)