Skip to content

Commit 227620f

Browse files
stargazing-dinostargazing-dino
committed
fix rest of examples - use bus, non generic none
1 parent 83442c2 commit 227620f

File tree

8 files changed

+39
-50
lines changed

8 files changed

+39
-50
lines changed

‎examples/baton.rs‎

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

5-
use linux_hal::gpio_cdev::{Chip, LineHandle, LineRequestFlags};
6-
use linux_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
5+
use linux_hal::spidev::{SpiModeFlags, SpidevBus, SpidevOptions};
76
use std::io;
87

98
use pscontroller_rs::PlayStationPort;
@@ -14,8 +13,8 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1413
const SPI_SPEED: u32 = 10_000;
1514

1615
// This will build the SPI device communication for us
17-
fn build_spi() -> io::Result<Spidev> {
18-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> io::Result<SpidevBus> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
1918
let opts = SpidevOptions::new()
2019
.bits_per_word(8)
2120
.max_speed_hz(SPI_SPEED)
@@ -28,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
2827

2928
fn main() {
3029
let spi = build_spi().unwrap();
31-
let mut psp = PlayStationPort::new(spi, None::<LineHandle>);
30+
let mut psp = PlayStationPort::new(spi, None);
3231

3332
let mut controller;
3433

‎examples/console.rs‎

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

5-
use linux_hal::gpio_cdev::{Chip, LineHandle, LineRequestFlags};
6-
use linux_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
5+
use linux_hal::spidev::{SpiModeFlags, SpidevBus, SpidevOptions};
76
use std::io;
87
use std::{thread, time};
98

@@ -17,8 +16,8 @@ const SPI_SPEED: u32 = 100_000;
1716
// and pass the pin into psp's new() function.
1817
//const SPI_ENABLE_PIN: u32 = 4;
1918

20-
fn build_spi() -> io::Result<Spidev> {
21-
let mut spi = Spidev::open(SPI_DEVICE)?;
19+
fn build_spi() -> io::Result<SpidevBus> {
20+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
2221
let opts = SpidevOptions::new()
2322
.bits_per_word(8)
2423
.max_speed_hz(SPI_SPEED)
@@ -31,12 +30,13 @@ fn build_spi() -> io::Result<Spidev> {
3130

3231
fn main() {
3332
let spi = build_spi().unwrap();
33+
// Example of using GPIO pin for chip select:
3434
//const GPIO_CHIP: &str = "/dev/gpiochip0";
3535
//let mut chip = Chip::new(GPIO_CHIP).unwrap();
36-
//let enable_pin = chip.get_line(SPI_ENABLE_PIN).unwrap()
37-
// .request(LineRequestFlags::OUTPUT, 1, "pscontroller").unwrap();
36+
//let enable_pin = CdevPin::new(chip.get_line(SPI_ENABLE_PIN).unwrap()
37+
// .request(LineRequestFlags::OUTPUT, 1, "pscontroller").unwrap()).unwrap();
3838
//let mut psp = PlayStationPort::new(spi, Some(enable_pin));
39-
let mut psp = PlayStationPort::new(spi, None::<LineHandle>);
39+
let mut psp = PlayStationPort::new(spi, None);
4040
let mut command = [0u8; 32];
4141
let mut buffer = [0u8; 32];
4242

‎examples/dualshock.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ 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;
5+
use linux_hal::spidev::{SpidevBus, SpidevOptions, SpiModeFlags};
86
use std::io;
97

108
use pscontroller_rs::{classic::GamepadButtons, dualshock::ControlDS, Device, PlayStationPort};
@@ -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() -> io::Result<SpidevBus> {
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::new(spi, None);
5149
let mut control_ds = ControlDS::new(false, 0);
5250

5351
let mut big: u8 = 0;

‎examples/guitarhero.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ 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;
5+
use linux_hal::spidev::{SpidevBus, SpidevOptions, SpiModeFlags};
86
use std::io;
97

108
use pscontroller_rs::PlayStationPort;
@@ -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() -> io::Result<SpidevBus> {
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::new(spi, None);
3331

3432
let mut controller;
3533

‎examples/jogcon.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ 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;
12+
use linux_hal::spidev::{SpidevBus, SpidevOptions, SpiModeFlags};
1513
use std::io;
1614

1715
use pscontroller_rs::{
@@ -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() -> io::Result<SpidevBus> {
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::new(spi, None);
4240
let mut control_jc = ControlJC::new(JogControl::Stop, 15);
4341

4442
psp.enable_jogcon()

‎examples/mouse.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ extern crate pscontroller_rs;
33

44
use std::{io, thread, time};
55

6-
use linux_hal::gpio_cdev::{Chip, LineHandle, LineRequestFlags};
7-
use linux_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
6+
use linux_hal::spidev::{SpiModeFlags, SpidevBus, SpidevOptions};
87

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

@@ -14,8 +13,8 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1413
const SPI_SPEED: u32 = 100_000;
1514

1615
// This will build the
17-
fn build_spi() -> io::Result<Spidev> {
18-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> io::Result<SpidevBus> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
1918
let opts = SpidevOptions::new()
2019
.bits_per_word(8)
2120
.max_speed_hz(SPI_SPEED)
@@ -28,7 +27,7 @@ fn build_spi() -> io::Result<Spidev> {
2827

2928
fn main() {
3029
let spi = build_spi().unwrap();
31-
let mut psp = PlayStationPort::new(spi, None::<LineHandle>);
30+
let mut psp = PlayStationPort::new(spi, None);
3231
let sleep_duration = time::Duration::from_millis(10);
3332

3433
let mut x: i32 = 0;

‎examples/playstation.rs‎

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

5-
use linux_hal::gpio_cdev::{Chip, LineHandle, LineRequestFlags};
6-
use linux_hal::spidev::{SpiModeFlags, Spidev, SpidevOptions};
5+
use linux_hal::spidev::{SpiModeFlags, SpidevBus, SpidevOptions};
76
use std::io;
87

98
use pscontroller_rs::{Device, PlayStationPort};
@@ -14,8 +13,8 @@ const SPI_DEVICE: &str = "/dev/spidev0.0";
1413
const SPI_SPEED: u32 = 100_000;
1514

1615
// This will build the
17-
fn build_spi() -> io::Result<Spidev> {
18-
let mut spi = Spidev::open(SPI_DEVICE)?;
16+
fn build_spi() -> io::Result<SpidevBus> {
17+
let mut spi = SpidevBus::open(SPI_DEVICE)?;
1918
let opts = SpidevOptions::new()
2019
.bits_per_word(8)
2120
.max_speed_hz(SPI_SPEED)
@@ -35,7 +34,7 @@ fn dump_hex(buffer: &[u8]) {
3534

3635
fn main() {
3736
let spi = build_spi().unwrap();
38-
let mut psp = PlayStationPort::new(spi, None::<LineHandle>);
37+
let mut psp = PlayStationPort::new(spi, None);
3938

4039
psp.enable_pressure().unwrap();
4140

‎examples/scanner.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ 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;
5+
use linux_hal::spidev::{SpidevBus, SpidevOptions, SpiModeFlags};
86
use std::io;
97
use std::{thread, time};
108

@@ -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() -> io::Result<SpidevBus> {
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::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)