Skip to content

Commit

Permalink
rerun 'cargo fmt' for the rest of examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@sanxus
sanxus committed Nov 3, 2023
1 parent 37d38f1 commit 5686190
Show file tree
Hide file tree
Showing 49 changed files with 350 additions and 671 deletions.
26 changes: 8 additions & 18 deletions esp32-hal/examples/embassy_spi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,24 +64,14 @@ async fn main(_spawner: Spawner) -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let send_buffer = [0, 1, 2, 3, 4, 5, 6, 7];
loop {
Expand Down
35 changes: 15 additions & 20 deletions esp32-hal/examples/qspi_flash.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,21 @@ fn main() -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new_half_duplex(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new_half_duplex(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let mut delay = Delay::new(&clocks);

Expand Down
20 changes: 8 additions & 12 deletions esp32-hal/examples/spi_eh1_device_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,14 @@ fn main() -> ! {
let miso = io.pins.gpio25;
let mosi = io.pins.gpio23;

let spi_controller = SpiBusController::from_spi(Spi::new(
peripherals.SPI2,
1000u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
gpio::NO_PIN,
));
let spi_controller = SpiBusController::from_spi(
Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
gpio::NO_PIN,
),
);
let mut spi_device_1 = spi_controller.add_device(io.pins.gpio12);
let mut spi_device_2 = spi_controller.add_device(io.pins.gpio13);
let mut spi_device_3 = spi_controller.add_device(io.pins.gpio14);
Expand Down
8 changes: 1 addition & 7 deletions esp32-hal/examples/spi_eh1_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@ fn main() -> ! {
let mosi = io.pins.gpio23;
let cs = io.pins.gpio22;

let mut spi = Spi::new(
peripherals.SPI2,
1000u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
let mut spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Expand Down
22 changes: 9 additions & 13 deletions esp32-hal/examples/spi_halfduplex_read_manufacturer_id.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,15 @@ fn main() -> ! {
let sio3 = io.pins.gpio16;
let cs = io.pins.gpio4;

let mut spi = Spi::new_half_duplex(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
);
let mut spi = Spi::new_half_duplex(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
);

let mut delay = Delay::new(&clocks);

Expand Down
8 changes: 1 addition & 7 deletions esp32-hal/examples/spi_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,7 @@ fn main() -> ! {
let mosi = io.pins.gpio23;
let cs = io.pins.gpio22;

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Expand Down
26 changes: 8 additions & 18 deletions esp32-hal/examples/spi_loopback_dma.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,14 @@ fn main() -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let mut delay = Delay::new(&clocks);

Expand Down
26 changes: 8 additions & 18 deletions esp32c2-hal/examples/embassy_spi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,14 @@ async fn main(_spawner: Spawner) -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let send_buffer = [0, 1, 2, 3, 4, 5, 6, 7];
loop {
Expand Down
35 changes: 15 additions & 20 deletions esp32c2-hal/examples/qspi_flash.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,21 @@ fn main() -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new_half_duplex(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new_half_duplex(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let mut delay = Delay::new(&clocks);

Expand Down
20 changes: 8 additions & 12 deletions esp32c2-hal/examples/spi_eh1_device_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,14 @@ fn main() -> ! {
let miso = io.pins.gpio2;
let mosi = io.pins.gpio7;

let spi_controller = SpiBusController::from_spi(Spi::new(
peripherals.SPI2,
1000u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
gpio::NO_PIN,
));
let spi_controller = SpiBusController::from_spi(
Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
gpio::NO_PIN,
),
);
let mut spi_device_1 = spi_controller.add_device(io.pins.gpio3);
let mut spi_device_2 = spi_controller.add_device(io.pins.gpio4);
let mut spi_device_3 = spi_controller.add_device(io.pins.gpio5);
Expand Down
8 changes: 1 addition & 7 deletions esp32c2-hal/examples/spi_eh1_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@ fn main() -> ! {
let mosi = io.pins.gpio7;
let cs = io.pins.gpio10;

let mut spi = Spi::new(
peripherals.SPI2,
1000u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
let mut spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Expand Down
23 changes: 9 additions & 14 deletions esp32c2-hal/examples/spi_halfduplex_read_manufacturer_id.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,15 @@ fn main() -> ! {
let sio3 = io.pins.gpio8;
let cs = io.pins.gpio9;

let mut spi = Spi::new_half_duplex(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
);
let mut spi = Spi::new_half_duplex(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(sio2),
Some(sio3),
Some(cs),
);

let mut delay = Delay::new(&clocks);

Expand Down
8 changes: 1 addition & 7 deletions esp32c2-hal/examples/spi_loopback.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,7 @@ fn main() -> ! {
let mosi = io.pins.gpio7;
let cs = io.pins.gpio10;

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks).with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Expand Down
26 changes: 8 additions & 18 deletions esp32c2-hal/examples/spi_loopback_dma.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,14 @@ fn main() -> ! {
let mut descriptors = [0u32; 8 * 3];
let mut rx_descriptors = [0u32; 8 * 3];

let mut spi = Spi::new(
peripherals.SPI2,
100u32.kHz(),
SpiMode::Mode0,
&clocks,
)
.with_pins(
Some(sclk),
Some(mosi),
Some(miso),
Some(cs),
)
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));
let mut spi = Spi::new(peripherals.SPI2, 100u32.kHz(), SpiMode::Mode0, &clocks)
.with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
.with_dma(dma_channel.configure(
false,
&mut descriptors,
&mut rx_descriptors,
DmaPriority::Priority0,
));

let mut delay = Delay::new(&clocks);

Expand Down
Loading

0 comments on commit 5686190

Please sign in to comment.