Skip to content

Commit d3d17a9

Browse files
stargazing-dinostargazing-dino
authored
Update to embedded-hal 1.0.0 (#26)
* update to v1 * update examples for linux-hal * Remove unused imports * Remove commented out code
1 parent b781363 commit d3d17a9

File tree

10 files changed

+67
-81
lines changed

10 files changed

+67
-81
lines changed

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ exclude = [
1515
]
1616

1717
[dependencies]
18-
embedded-hal = "0.2.7"
18+
embedded-hal = "1.0.0"
1919
bit_reverse = { version = "0.1.7", default-features = false }
2020
bitflags = "1.0"
2121
byteorder = { version = "1.2", default-features = false }
2222

2323
[dev-dependencies]
24-
linux-embedded-hal = "0.2.2"
24+
linux-embedded-hal = "0.4.0"

‎examples/baton.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate bit_reverse;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97

108
use pscontroller_rs::PlayStationPort;
119

@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1513
const SPI_SPEED: u32 = 10_000;
1614

1715
// This will build the SPI device communication for us
18-
fn build_spi() -> io::Result<Spidev> {
19-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2018
let opts = SpidevOptions::new()
2119
.bits_per_word(8)
2220
.max_speed_hz(SPI_SPEED)
23-
.mode(SPI_MODE_3)
21+
.mode(SpiModeFlags::SPI_MODE_3)
2422
.build();
2523
spi.configure(&opts)?;
2624

@@ -29,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
2927

3028
fn main() {
3129
let spi = build_spi().unwrap();
32-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
30+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
3331

3432
let mut controller;
3533

‎examples/console.rs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate embedded_hal;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97
use std::{thread, time};
108

119
use pscontroller_rs::PlayStationPort;
@@ -16,14 +14,14 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1614
const SPI_SPEED: u32 = 100_000;
1715
// If you need to use an alternate pin for cable select, uncomment the relevant bits
1816
// and pass the pin into psp's new() function.
19-
//const SPI_ENABLE_PIN: u64 = 4;
17+
//const SPI_ENABLE_PIN: u32 = 4;
2018

21-
fn build_spi() -> io::Result<Spidev> {
22-
let mut spi = Spidev::open(SPI_DEVICE)?;
19+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
20+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2321
let opts = SpidevOptions::new()
2422
.bits_per_word(8)
2523
.max_speed_hz(SPI_SPEED)
26-
.mode(SPI_MODE_3)
24+
.mode(SpiModeFlags::SPI_MODE_3)
2725
.build();
2826
spi.configure(&opts)?;
2927

@@ -32,9 +30,7 @@ fn build_spi() -> io::Result<Spidev> {
3230

3331
fn main() {
3432
let spi = build_spi().unwrap();
35-
//let enable_pin = Pin::new(SPI_ENABLE_PIN);
36-
//let mut psp = PlayStationPort::new(spi, Some(enable_pin));
37-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
33+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
3834
let mut command = [0u8; 32];
3935
let mut buffer = [0u8; 32];
4036

‎examples/dualshock.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate bit_reverse;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97

108
use pscontroller_rs::{classic::GamepadButtons, dualshock::ControlDS, Device, PlayStationPort};
119

@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1513
const SPI_SPEED: u32 = 10_000;
1614

1715
// This will build the
18-
fn build_spi() -> io::Result<Spidev> {
19-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2018
let opts = SpidevOptions::new()
2119
.bits_per_word(8)
2220
.max_speed_hz(SPI_SPEED)
23-
.mode(SPI_MODE_3)
21+
.mode(SpiModeFlags::SPI_MODE_3)
2422
.build();
2523
spi.configure(&opts)?;
2624

@@ -47,7 +45,7 @@ fn set_motors(buttons: &GamepadButtons, small: &mut bool, big: &mut u8) {
4745

4846
fn main() {
4947
let spi = build_spi().unwrap();
50-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
48+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
5149
let mut control_ds = ControlDS::new(false, 0);
5250

5351
let mut big: u8 = 0;

‎examples/guitarhero.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate bit_reverse;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97

108
use pscontroller_rs::PlayStationPort;
119

@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1513
const SPI_SPEED: u32 = 10_000;
1614

1715
// This will build the
18-
fn build_spi() -> io::Result<Spidev> {
19-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2018
let opts = SpidevOptions::new()
2119
.bits_per_word(8)
2220
.max_speed_hz(SPI_SPEED)
23-
.mode(SPI_MODE_3)
21+
.mode(SpiModeFlags::SPI_MODE_3)
2422
.build();
2523
spi.configure(&opts)?;
2624

@@ -29,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
2927

3028
fn main() {
3129
let spi = build_spi().unwrap();
32-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
30+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
3331

3432
let mut controller;
3533

‎examples/jogcon.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ extern crate embedded_hal;
99
extern crate linux_embedded_hal as linux_hal;
1010
extern crate pscontroller_rs;
1111

12-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
13-
use linux_hal::Pin;
14-
use linux_hal::Spidev;
15-
use std::io;
12+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
13+
use linux_hal::{CdevPin, SpidevBus};
1614

1715
use pscontroller_rs::{
1816
jogcon::{ControlJC, JogControl},
@@ -24,12 +22,12 @@ use pscontroller_rs::{
2422
const SPI_DEVICE: &str = "/dev/spidev0.0";
2523
const SPI_SPEED: u32 = 10_000;
2624

27-
fn build_spi() -> io::Result<Spidev> {
28-
let mut spi = Spidev::open(SPI_DEVICE)?;
25+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
26+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2927
let opts = SpidevOptions::new()
3028
.bits_per_word(8)
3129
.max_speed_hz(SPI_SPEED)
32-
.mode(SPI_MODE_3)
30+
.mode(SpiModeFlags::SPI_MODE_3)
3331
.build();
3432
spi.configure(&opts)?;
3533

@@ -38,7 +36,7 @@ fn build_spi() -> io::Result<Spidev> {
3836

3937
fn main() {
4038
let spi = build_spi().unwrap();
41-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
39+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
4240
let mut control_jc = ControlJC::new(JogControl::Stop, 15);
4341

4442
psp.enable_jogcon()

‎examples/mouse.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
extern crate linux_embedded_hal as linux_hal;
22
extern crate pscontroller_rs;
33

4-
use std::{io, thread, time};
4+
use std::{thread, time};
55

6-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
7-
use linux_hal::Pin;
8-
use linux_hal::Spidev;
6+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
7+
use linux_hal::{CdevPin, SpidevBus};
98

109
use pscontroller_rs::{Device, PlayStationPort};
1110

@@ -15,12 +14,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1514
const SPI_SPEED: u32 = 100_000;
1615

1716
// This will build the
18-
fn build_spi() -> io::Result<Spidev> {
19-
let mut spi = Spidev::open(SPI_DEVICE)?;
17+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
18+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2019
let opts = SpidevOptions::new()
2120
.bits_per_word(8)
2221
.max_speed_hz(SPI_SPEED)
23-
.mode(SPI_MODE_3)
22+
.mode(SpiModeFlags::SPI_MODE_3)
2423
.build();
2524
spi.configure(&opts)?;
2625

@@ -29,7 +28,7 @@ fn build_spi() -> io::Result<Spidev> {
2928

3029
fn main() {
3130
let spi = build_spi().unwrap();
32-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
31+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
3332
let sleep_duration = time::Duration::from_millis(10);
3433

3534
let mut x: i32 = 0;

‎examples/playstation.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate bit_reverse;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97

108
use pscontroller_rs::{Device, PlayStationPort};
119

@@ -15,12 +13,12 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1513
const SPI_SPEED: u32 = 100_000;
1614

1715
// This will build the
18-
fn build_spi() -> io::Result<Spidev> {
19-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2018
let opts = SpidevOptions::new()
2119
.bits_per_word(8)
2220
.max_speed_hz(SPI_SPEED)
23-
.mode(SPI_MODE_3)
21+
.mode(SpiModeFlags::SPI_MODE_3)
2422
.build();
2523
spi.configure(&opts)?;
2624

@@ -36,7 +34,7 @@ fn dump_hex(buffer: &[u8]) {
3634

3735
fn main() {
3836
let spi = build_spi().unwrap();
39-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
37+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
4038

4139
psp.enable_pressure().unwrap();
4240

‎examples/scanner.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ extern crate embedded_hal;
22
extern crate linux_embedded_hal as linux_hal;
33
extern crate pscontroller_rs;
44

5-
use linux_hal::spidev::{SpidevOptions, SPI_MODE_3};
6-
use linux_hal::Pin;
7-
use linux_hal::Spidev;
8-
use std::io;
5+
use linux_hal::spidev::{SpiModeFlags, SpidevOptions};
6+
use linux_hal::{CdevPin, SpidevBus};
97
use std::{thread, time};
108

119
use pscontroller_rs::{MultitapPort, PlayStationPort};
@@ -26,12 +24,12 @@ const SCAN_RESPONSE_WIDTH: u8 = 10;
2624
const SAMPLE_PAUSE: u64 = 0_000;
2725
const USE_MULTITAP: bool = false;
2826

29-
fn build_spi() -> io::Result<Spidev> {
30-
let mut spi = Spidev::open(SPI_DEVICE)?;
27+
fn build_spi() -> Result<SpidevBus, Box<dyn std::error::Error>> {
28+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
3129
let opts = SpidevOptions::new()
3230
.bits_per_word(8)
3331
.max_speed_hz(SPI_SPEED)
34-
.mode(SPI_MODE_3)
32+
.mode(SpiModeFlags::SPI_MODE_3)
3533
.build();
3634
spi.configure(&opts)?;
3735

@@ -40,7 +38,7 @@ fn build_spi() -> io::Result<Spidev> {
4038

4139
fn main() {
4240
let spi = build_spi().unwrap();
43-
let mut psp = PlayStationPort::new(spi, None::<Pin>);
41+
let mut psp: PlayStationPort<_, CdevPin> = PlayStationPort::new(spi, None);
4442
let mut command = [0u8; SCAN_RESPONSE_WIDTH as usize];
4543
let mut buffer = [0u8; SCAN_RESPONSE_WIDTH as usize];
4644
let mut _dummy = [0u8; SCAN_RESPONSE_WIDTH as usize];

0 commit comments

Comments
 (0)