diff --git a/satori/firmware/firmware/src/led.rs b/satori/firmware/firmware/src/led.rs index 188d38fd..23ed352c 100644 --- a/satori/firmware/firmware/src/led.rs +++ b/satori/firmware/firmware/src/led.rs @@ -1,7 +1,7 @@ -use ws2812_esp32_rmt_driver::Ws2812Esp32Rmt; -use smart_leds::{SmartLedsWrite, RGB8}; -use std::sync::{Mutex, Arc}; use log::error; +use smart_leds::{SmartLedsWrite, RGB8}; +use std::sync::{Arc, Mutex}; +use ws2812_esp32_rmt_driver::Ws2812Esp32Rmt; pub(crate) const BLACK: RGB8 = RGB8::new(0, 0, 0); pub(crate) const RED: RGB8 = RGB8::new(8, 0, 0); diff --git a/satori/firmware/firmware/src/main.rs b/satori/firmware/firmware/src/main.rs index 052598fb..c681397d 100644 --- a/satori/firmware/firmware/src/main.rs +++ b/satori/firmware/firmware/src/main.rs @@ -1,8 +1,8 @@ +mod led; mod retry; mod sensors; mod services; mod wifi; -mod led; use crate::{ sensors::{ @@ -37,9 +37,10 @@ fn main() -> anyhow::Result<()> { let peripherals = Peripherals::take().unwrap(); let sysloop = EspSystemEventLoop::take()?; - info!("Satori Laser Cutter Telemetry and Protection System, v{} ({})", - env!("CARGO_PKG_VERSION"), - git_version::git_version!(), + info!( + "Satori Laser Cutter Telemetry and Protection System, v{} ({})", + env!("CARGO_PKG_VERSION"), + git_version::git_version!(), ); let koishi_telemetry_uart: uart::UartDriver = uart::UartDriver::new( @@ -50,7 +51,7 @@ fn main() -> anyhow::Result<()> { Option::::None, &uart::config::Config::default().baudrate(Hertz(57600)), ) - .expect("koishi telemetry UART should be configured"); + .expect("koishi telemetry UART should be configured"); let led = led::Led::new(); led.set(led::RED); diff --git a/satori/firmware/firmware/src/wifi.rs b/satori/firmware/firmware/src/wifi.rs index e3cdda6f..d2afb84d 100644 --- a/satori/firmware/firmware/src/wifi.rs +++ b/satori/firmware/firmware/src/wifi.rs @@ -6,7 +6,7 @@ use esp_idf_svc::{ nvs::EspDefaultNvsPartition, wifi::{BlockingWifi, EspWifi}, }; -use log::{warn, info}; +use log::{info, warn}; pub(crate) fn setup( ssid: &str, @@ -20,7 +20,7 @@ pub(crate) fn setup( EspWifi::new(modem, sysloop.clone(), Some(nvs)).expect("should have wifi"), sysloop, ) - .expect("should have wifi"); + .expect("should have wifi"); wifi.set_configuration(&Configuration::Client(ClientConfiguration::default())) .expect("empty wifi config should be set");