Skip to content

Commit c4f23f2

Browse files
committed
fix examples
1 parent 59777ec commit c4f23f2

File tree

10 files changed

+20
-15
lines changed

10 files changed

+20
-15
lines changed

examples/adc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn main() -> ! {
2222
// practical needs. User specified value is be approximated using supported
2323
// prescaler values 2/4/6/8.
2424
let clocks = rcc.cfgr.adcclk(2.MHz()).freeze(&mut flash.acr);
25-
hprintln!("adc freq: {}", clocks.adcclk()).unwrap();
25+
hprintln!("adc freq: {}", clocks.adcclk());
2626

2727
// Setup ADC
2828
let mut adc1 = adc::Adc::adc1(p.ADC1, clocks);
@@ -41,12 +41,12 @@ fn main() -> ! {
4141

4242
loop {
4343
let data: u16 = adc1.read(&mut ch0).unwrap();
44-
hprintln!("adc1: {}", data).unwrap();
44+
hprintln!("adc1: {}", data);
4545

4646
#[cfg(any(feature = "stm32f103", feature = "connectivity"))]
4747
{
4848
let data1: u16 = adc2.read(&mut ch1).unwrap();
49-
hprintln!("adc2: {}", data1).unwrap();
49+
hprintln!("adc2: {}", data1);
5050
}
5151
}
5252
}

examples/adc_temperature.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ fn main() -> ! {
3434
usbpre: rcc::UsbPre::DIV1_5,
3535
adcpre: rcc::AdcPre::DIV2,
3636
}, &mut flash.acr);*/
37-
hprintln!("sysclk freq: {}", clocks.sysclk()).unwrap();
38-
hprintln!("adc freq: {}", clocks.adcclk()).unwrap();
37+
hprintln!("sysclk freq: {}", clocks.sysclk());
38+
hprintln!("adc freq: {}", clocks.adcclk());
3939

4040
// Setup ADC
4141
let mut adc = adc::Adc::adc1(p.ADC1, clocks);
@@ -44,6 +44,6 @@ fn main() -> ! {
4444
loop {
4545
let temp = adc.read_temp();
4646

47-
hprintln!("temp: {}", temp).unwrap();
47+
hprintln!("temp: {}", temp);
4848
}
4949
}

examples/crc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() -> ! {
2121
crc.write(0x12345678);
2222

2323
let val = crc.read();
24-
hprintln!("found={:08x}, expected={:08x}", val, 0xdf8a8a2b_u32).ok();
24+
hprintln!("found={:08x}, expected={:08x}", val, 0xdf8a8a2b_u32);
2525

2626
loop {}
2727
}

examples/dynamic_gpio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> ! {
3939
loop {
4040
pin.make_floating_input(&mut gpioc.crh);
4141
block!(timer.wait()).unwrap();
42-
hprintln!("{}", pin.is_high().unwrap()).unwrap();
42+
hprintln!("{}", pin.is_high().unwrap());
4343

4444
pin.make_push_pull_output(&mut gpioc.crh);
4545
pin.set_high().unwrap();

examples/hello.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ use cortex_m_rt::entry;
1414

1515
#[entry]
1616
fn main() -> ! {
17-
hprintln!("Hello, world!").unwrap();
17+
hprintln!("Hello, world!");
1818
loop {}
1919
}

examples/mfrc522.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ use cortex_m::iprintln;
88

99
use cortex_m_rt::entry;
1010
use embedded_hal::digital::v1_compat::OldOutputPin;
11+
use embedded_hal::spi::{Mode, Phase, Polarity};
1112
use mfrc522::Mfrc522;
1213
use stm32f1xx_hal::{pac, prelude::*, spi::Spi};
14+
pub const MODE: Mode = Mode {
15+
polarity: Polarity::IdleLow,
16+
phase: Phase::CaptureOnFirstTransition,
17+
};
1318

1419
#[entry]
1520
fn main() -> ! {
@@ -32,7 +37,7 @@ fn main() -> ! {
3237
dp.SPI1,
3338
(sck, miso, mosi),
3439
&mut afio.mapr,
35-
mfrc522::MODE,
40+
MODE,
3641
1.MHz(),
3742
clocks,
3843
);
@@ -46,7 +51,7 @@ fn main() -> ! {
4651
loop {
4752
if let Ok(atqa) = mfrc522.reqa() {
4853
if let Ok(uid) = mfrc522.select(&atqa) {
49-
iprintln!(_stim, "* {:?}", uid);
54+
iprintln!(_stim, "* {:?}", uid.as_bytes());
5055
}
5156
}
5257
}

examples/multi_mode_gpio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fn main() -> ! {
3737
// Wait for the timer to trigger an update and change the state of the LED
3838
loop {
3939
block!(timer.wait()).unwrap();
40-
hprintln!("{}", pin.is_high()).unwrap();
40+
hprintln!("{}", pin.is_high());
4141
pin.as_push_pull_output(&mut gpioc.crh, |out| {
4242
out.set_high();
4343
block!(timer.wait()).unwrap();

examples/panics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use cortex_m_rt::{entry, exception, ExceptionFrame};
1313

1414
#[entry]
1515
fn main() -> ! {
16-
hprintln!("Hello, world!").unwrap();
16+
hprintln!("Hello, world!");
1717
loop {}
1818
}
1919

examples/qei.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ fn main() -> ! {
4848

4949
let elapsed = after.wrapping_sub(before) as i16;
5050

51-
hprintln!("{}", elapsed).unwrap();
51+
hprintln!("{}", elapsed);
5252
}
5353
}

examples/rtc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ fn main() -> ! {
2222
let rtc = Rtc::new(p.RTC, &mut backup_domain);
2323

2424
loop {
25-
hprintln!("time: {}", rtc.current_time()).unwrap();
25+
hprintln!("time: {}", rtc.current_time());
2626
}
2727
}

0 commit comments

Comments
 (0)