Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
DanNixon committed Nov 25, 2023
1 parent ae75035 commit abe82ce
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions satori/firmware/firmware/src/led.rs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
11 changes: 6 additions & 5 deletions satori/firmware/firmware/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mod led;
mod retry;
mod sensors;
mod services;
mod wifi;
mod led;

use crate::{
sensors::{
Expand Down Expand Up @@ -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(
Expand All @@ -50,7 +51,7 @@ fn main() -> anyhow::Result<()> {
Option::<AnyIOPin>::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);
Expand Down
4 changes: 2 additions & 2 deletions satori/firmware/firmware/src/wifi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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");
Expand Down

0 comments on commit abe82ce

Please sign in to comment.