Skip to content

Commit 7ed6e7b

Browse files
committed
Format and clean examples
1 parent 5f89233 commit 7ed6e7b

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

examples/can-echo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn main() -> ! {
5959

6060
// APB1 (PCLK1): 8MHz, Bit rate: 125kBit/s, Sample Point 87.5%
6161
// Value was calculated with http://www.bittiming.can-wiki.info/
62-
let mut can2 = bxcan::Can::builder(can)
62+
let can2 = bxcan::Can::builder(can)
6363
.set_bit_timing(0x001c_0003)
6464
.leave_disabled();
6565

examples/can-loopback.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
#![no_main]
55
#![no_std]
66

7-
use bxcan::{filter::{ListEntry16, ListEntry32, Mask16}, ExtendedId, Frame, StandardId, Fifo};
7+
use bxcan::{
8+
filter::{ListEntry16, ListEntry32, Mask16},
9+
ExtendedId, Fifo, Frame, StandardId,
10+
};
811
use panic_halt as _;
912

1013
use cortex_m_rt::entry;
@@ -47,7 +50,7 @@ fn main() -> ! {
4750
// TODO: Make this accept also ID 2
4851
filters.enable_bank(
4952
0,
50-
Fifo::Fifo0,
53+
Fifo::Fifo0,
5154
[
5255
// accepts 0 and 1
5356
Mask16::frames_with_std_id(StandardId::new(0).unwrap(), StandardId::new(1).unwrap()),
@@ -59,7 +62,7 @@ fn main() -> ! {
5962
// 2x 29bit id filter bank: Matches 4, 5
6063
filters.enable_bank(
6164
1,
62-
Fifo::Fifo0,
65+
Fifo::Fifo0,
6366
[
6467
ListEntry32::data_frames_with_id(ExtendedId::new(4).unwrap()),
6568
ListEntry32::data_frames_with_id(ExtendedId::new(5).unwrap()),
@@ -69,7 +72,7 @@ fn main() -> ! {
6972
// 4x 11bit id filter bank: Matches 8, 9, 10, 11
7073
filters.enable_bank(
7174
2,
72-
Fifo::Fifo0,
75+
Fifo::Fifo0,
7376
[
7477
ListEntry16::data_frames_with_id(StandardId::new(8).unwrap()),
7578
ListEntry16::data_frames_with_id(StandardId::new(9).unwrap()),

examples/can-rtic.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn enqueue_frame(queue: &mut BinaryHeap<PriorityFrame, Max, 16>, frame: Frame) {
5353
#[rtic::app(device = stm32f1xx_hal::pac)]
5454
mod app {
5555
use super::{enqueue_frame, PriorityFrame};
56-
use bxcan::{filter::Mask32, ExtendedId, Frame, Interrupts, StandardId, Tx, Rx0, Fifo};
56+
use bxcan::{filter::Mask32, ExtendedId, Fifo, Frame, Interrupts, Rx0, StandardId, Tx};
5757
use heapless::binary_heap::{BinaryHeap, Max};
5858
use stm32f1xx_hal::{can::Can, pac::CAN1, prelude::*};
5959

@@ -101,15 +101,16 @@ mod app {
101101
.set_bit_timing(0x001c_0000)
102102
.leave_disabled();
103103

104-
can.modify_filters().enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
104+
can.modify_filters()
105+
.enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
105106

106107
// Sync to the bus and start normal operation.
107108
can.enable_interrupts(
108109
Interrupts::TRANSMIT_MAILBOX_EMPTY | Interrupts::FIFO0_MESSAGE_PENDING,
109110
);
110111
nb::block!(can.enable_non_blocking()).unwrap();
111112

112-
let (can_tx, can_rx) = can.split();
113+
let (can_tx, can_rx, _) = can.split();
113114

114115
let can_tx_queue = BinaryHeap::new();
115116

0 commit comments

Comments
 (0)