@@ -24,21 +24,21 @@ use std::io::prelude::*;
24
24
use spidev :: {Spidev , SpidevOptions , SpidevTransfer , SpiModeFlags };
25
25
26
26
fn create_spi () -> io :: Result <Spidev > {
27
- let mut spi = try ! ( Spidev :: open (" /dev/spidev0.0" )) ;
27
+ let mut spi = Spidev :: open (" /dev/spidev0.0" )? ;
28
28
let options = SpidevOptions :: new ()
29
29
. bits_per_word (8 )
30
30
. max_speed_hz (20_000 )
31
31
. mode (SpiModeFlags :: SPI_MODE_0 )
32
32
. build ();
33
- try ! ( spi . configure (& options )) ;
33
+ spi . configure (& options )? ;
34
34
Ok (spi )
35
35
}
36
36
37
37
/// perform half duplex operations using Read and Write traits
38
38
fn half_duplex (spi : & mut Spidev ) -> io :: Result <()> {
39
39
let mut rx_buf = [0_u8 ; 10 ];
40
- try ! ( spi . write (& [0x01 , 0x02 , 0x03 ])) ;
41
- try ! ( spi . read (& mut rx_buf )) ;
40
+ spi . write (& [0x01 , 0x02 , 0x03 ])? ;
41
+ spi . read (& mut rx_buf )? ;
42
42
println! (" {:?}" , rx_buf );
43
43
Ok (())
44
44
}
@@ -51,7 +51,7 @@ fn full_duplex(spi: &mut Spidev) -> io::Result<()> {
51
51
let mut rx_buf = [0 ; 3 ];
52
52
{
53
53
let mut transfer = SpidevTransfer :: read_write (& tx_buf , & mut rx_buf );
54
- try ! ( spi . transfer (& mut transfer )) ;
54
+ spi . transfer (& mut transfer )? ;
55
55
}
56
56
println! (" {:?}" , rx_buf );
57
57
Ok (())
0 commit comments