Skip to content

Commit 972d40b

Browse files
jhodappcalebbourg
authored andcommitted
Tidied up source formatting.
1 parent 65894c2 commit 972d40b

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

esp32-wroom-rp/src/gpio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ impl Default for EspControlPins<(), (), (), ()> {
154154
cs: (),
155155
gpio0: (),
156156
resetn: (),
157-
ack: ()
157+
ack: (),
158158
}
159159
}
160160
}

esp32-wroom-rp/src/lib.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub mod wifi;
9191
pub mod protocol;
9292
mod spi;
9393

94-
use protocol::{ProtocolInterface, ProtocolError};
94+
use protocol::{ProtocolError, ProtocolInterface};
9595

9696
use defmt::{write, Format, Formatter};
9797
use embedded_hal::blocking::delay::DelayMs;
@@ -111,7 +111,11 @@ impl Format for Error {
111111
fn format(&self, fmt: Formatter) {
112112
match self {
113113
Error::Bus => write!(fmt, "Bus error"),
114-
Error::Protocol(e) => write!(fmt, "Communication protocol error with ESP32 WiFi target: {}", e),
114+
Error::Protocol(e) => write!(
115+
fmt,
116+
"Communication protocol error with ESP32 WiFi target: {}",
117+
e
118+
),
115119
}
116120
}
117121
}

esp32-wroom-rp/src/protocol.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ pub enum ProtocolError {
245245
CommunicationTimeout,
246246
InvalidCommand,
247247
InvalidNumberOfParameters,
248-
TooManyParameters
248+
TooManyParameters,
249249
}
250250

251251
impl Format for ProtocolError {

host-tests/tests/spi.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
use embedded_hal_mock::spi;
2-
use embedded_hal_mock::pin::{
3-
Mock as PinMock, State as PinState, Transaction as PinTransaction,
4-
};
51
use embedded_hal_mock::delay::MockNoop;
2+
use embedded_hal_mock::pin::{Mock as PinMock, State as PinState, Transaction as PinTransaction};
3+
use embedded_hal_mock::spi;
64

7-
use esp32_wroom_rp::wifi::Wifi;
85
use esp32_wroom_rp::gpio::EspControlInterface;
6+
use esp32_wroom_rp::wifi::Wifi;
97

108
struct EspControlMock {}
119

@@ -18,7 +16,7 @@ impl EspControlInterface for EspControlMock {
1816
true
1917
}
2018

21-
fn wait_for_esp_select(&mut self) {}
19+
fn wait_for_esp_select(&mut self) {}
2220

2321
fn wait_for_esp_ack(&self) {}
2422

@@ -41,7 +39,6 @@ fn invalid_command_induces_nina_protocol_version_mismatch_error() {
4139
spi::Transaction::transfer(vec![0x37], vec![0x0]),
4240
spi::Transaction::transfer(vec![0x0], vec![0x0]),
4341
spi::Transaction::transfer(vec![0xee], vec![0x0]),
44-
4542
// wait_response_cmd()
4643
spi::Transaction::transfer(vec![0xff], vec![0xef]),
4744
];
@@ -54,7 +51,12 @@ fn invalid_command_induces_nina_protocol_version_mismatch_error() {
5451
let mut wifi = Wifi::init(&mut spi, &mut pins, &mut delay).ok().unwrap();
5552
let f = wifi.firmware_version();
5653

57-
assert_eq!(f.unwrap_err(), esp32_wroom_rp::Error::Protocol(esp32_wroom_rp::protocol::ProtocolError::NinaProtocolVersionMismatch));
54+
assert_eq!(
55+
f.unwrap_err(),
56+
esp32_wroom_rp::Error::Protocol(
57+
esp32_wroom_rp::protocol::ProtocolError::NinaProtocolVersionMismatch
58+
)
59+
);
5860

5961
spi.done();
6062
}

0 commit comments

Comments
 (0)