From bf3192ec65023fef1ca372b7a1c339d2f5839808 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Thu, 23 May 2024 20:16:44 +0200 Subject: [PATCH] Format code a bit --- Cargo.lock | Bin 68925 -> 71460 bytes src/drivers/mod.rs | 1 + src/drivers/piface.rs | 8 +++++--- src/errors.rs | 4 ++-- src/main.rs | 20 ++++++++++---------- src/settings.rs | 17 +++++++++++------ src/ws/mod.rs | 4 ++-- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 637c455bde05db6a9644b77aaa379bac37a8b435..6b6c5dc33d46e7b46837d7bb6ea9a9810d50bb3a 100644 GIT binary patch delta 1308 zcmZXU&1+m$7{-|x+gfcKtw}}$$ruVE$aua#lqR8A#D&Dx?jjE7J?A~0NHb$*LerhN z5=0O^6eS?G;8H@$#bpaEcHu_s!i`W!H!l774}9mQ2?lrfo_o3P^FGh-xwp5*zuz9; zxjlZg#oB_mZCSq2tbQ9Gd$BZUCrbG2;-VEGg;tpxp?Pr9@esH`#ZX3-L}uLk?4r@k zWxxnNd7ib^$TEP7*FR}As|T~c%uEfgtoAO?AHRx&;cCCvI@_A3k*ox`u;e5N1eH8X zTtG@eW8yZUaVCloK}BsnSJ`DRIJguna(Yn*X|l}7%a_xWFQiaU=*0d2=U+YEn%_St z>wnH2eSA|IThEU@o@#_J&Sqo~q7{KD)Y^L{JlCTQyy2XKXPH9?!Gl&RIc7;RbEFR$4Q!96OM)``2Wn-gm)D83TZl$_e0sgO-Ts zw3AVQM`xT$+6%!olH-_@WI83uA&&emH5$=ITbbx_j=6=8=|Yi?%86u7rjt|8&Ul;1Mm0N`{aXw~_3X-Wa6=%fV@3gmR37 zPzYcHT9?rYE1dHoI_JtQY?hVxo7JtA$rHy8R-Zl}7HI({odUzXcG?*9!lbB~F-!_h z#&Jz1YqZ8j?vN>&LKX%r<4i^Q^`kK&=BMtd#uL2lYq5}+CEUD}T2d@X!jfPYY1pAO7iV z-}_)}-~Q2GsBGUmS&93n$0zG59g2X`E9-w;T(T)R&{k4kbn;o`2u@lgw>=WUM4ti) qL|CxQD;H#DU@b-9qRyaldEln2H-G--^nO7`R{s6_Y<22koBa!)=#i!X delta 116 zcmV-)0E_>mt^~cB1hBmXld;Pgv)u#%8nc}r$Q!ePK7|64g?|^bCqaw_v%*G+7?V+7 zVY75#6%DgXZVdsGR&dLc;9?iELUEckld;Pfv-_qm5VNGYkqxsu$8Q9)vCDP>ld;Pt WvsBI#1hXd7mlKmAEfura=1ef7(=(U= diff --git a/src/drivers/mod.rs b/src/drivers/mod.rs index 9c0c971..35d9754 100644 --- a/src/drivers/mod.rs +++ b/src/drivers/mod.rs @@ -2,6 +2,7 @@ pub use gpio::GpioDriver; pub use null::NullDriver; pub use piface::PiFaceDriver; use serde::{Deserialize, Deserializer}; + use crate::errors::EmgauwaControllerError; mod gpio; diff --git a/src/drivers/piface.rs b/src/drivers/piface.rs index 4a0baf0..0af161a 100644 --- a/src/drivers/piface.rs +++ b/src/drivers/piface.rs @@ -11,9 +11,11 @@ pub struct PiFaceDriver { impl PiFaceDriver { pub fn new(pin: u8, pfd: &Option) -> Result { - let pfd = pfd.as_ref().ok_or(EmgauwaControllerError::Hardware(String::from( - "PiFaceDigital not initialized", - )))?; + let pfd = pfd + .as_ref() + .ok_or(EmgauwaControllerError::Hardware(String::from( + "PiFaceDigital not initialized", + )))?; let pfd_pin = pfd.get_output_pin(pin)?; Ok(Self { pfd_pin }) } diff --git a/src/errors.rs b/src/errors.rs index 3916180..a13f4b1 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,10 +1,10 @@ use std::fmt::{Display, Formatter}; + +use emgauwa_common::errors::EmgauwaError; use rppal::gpio; use rppal_mcp23s17::Mcp23s17Error; use rppal_pfd::PiFaceDigitalError; -use emgauwa_common::errors::EmgauwaError; - #[derive(Debug)] pub enum EmgauwaControllerError { Hardware(String), diff --git a/src/main.rs b/src/main.rs index bbb1a79..f9d70eb 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,11 +15,11 @@ use crate::ws::run_ws_loop; mod app_state; mod drivers; +mod errors; mod relay_loop; mod settings; mod utils; mod ws; -mod errors; async fn create_this_controller( conn: &mut PoolConnection, @@ -80,14 +80,10 @@ async fn main() -> Result<(), std::io::Error> { }; for relay in &settings.relays { - if DbRelay::get_by_controller_and_num( - &mut conn, - &db_controller, - relay.number, - ) - .await - .map_err(EmgauwaError::from)? - .is_none() + if DbRelay::get_by_controller_and_num(&mut conn, &db_controller, relay.number) + .await + .map_err(EmgauwaError::from)? + .is_none() { create_this_relay(&mut conn, &db_controller, relay) .await @@ -103,7 +99,11 @@ async fn main() -> Result<(), std::io::Error> { let this = Controller::from_db_model(&mut conn, db_controller).map_err(EmgauwaError::from)?; let now = chrono::Local::now().time(); - let initial_states: Vec = this.relays.iter().map(|r| r.active_schedule.is_on(&now)).collect(); + let initial_states: Vec = this + .relays + .iter() + .map(|r| r.active_schedule.is_on(&now)) + .collect(); let mut pfd: Option = None; let drivers = settings.relays_make_drivers(&mut pfd, initial_states)?; diff --git a/src/settings.rs b/src/settings.rs index 15d91bd..f4f83fd 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -2,6 +2,7 @@ use emgauwa_common::errors::EmgauwaError; use emgauwa_common::settings; use rppal_pfd::PiFaceDigital; use serde_derive::Deserialize; + use crate::drivers; #[derive(Clone, Debug, Deserialize)] @@ -69,13 +70,17 @@ impl Settings { &self, pfd: &mut Option, initial_states: Vec, - ) -> Result>, EmgauwaError> { + ) -> Result>, EmgauwaError> { let mut drivers = Vec::new(); - let result: Result<(), EmgauwaError> = self.relays.iter().zip(initial_states).try_for_each(|(relay, state)| { - let driver = relay.make_driver(pfd, state)?; - drivers.push(driver); - Ok(()) - }); + let result: Result<(), EmgauwaError> = + self.relays + .iter() + .zip(initial_states) + .try_for_each(|(relay, state)| { + let driver = relay.make_driver(pfd, state)?; + drivers.push(driver); + Ok(()) + }); result?; Ok(drivers) } diff --git a/src/ws/mod.rs b/src/ws/mod.rs index a79b13c..bdb7e07 100644 --- a/src/ws/mod.rs +++ b/src/ws/mod.rs @@ -7,8 +7,8 @@ use emgauwa_common::types::ControllerWsAction; use futures::{future, pin_mut, SinkExt, StreamExt}; use sqlx::{Pool, Sqlite}; use tokio::time; -use tokio_tungstenite::tungstenite::Message; use tokio_tungstenite::connect_async; +use tokio_tungstenite::tungstenite::Message; use crate::app_state::AppState; use crate::utils::{app_state_get_relay_notifier, app_state_get_this}; @@ -89,4 +89,4 @@ async fn read_app_state( )) })?; } -} \ No newline at end of file +}