emgauwa/controller
2
0
Fork 0
Code Issues Pull requests Projects Releases1 Packages Wiki Activity

Move relay drivers from common to controller

Browse source
This commit is contained in:
Tobias Reisinger 2024-05-05 23:46:38 +02:00
parent e9ea0b625d
commit 340c4e9f15
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
9 changed files with 193 additions and 33 deletions

11
src/main.rs
View file

@ -14,11 +14,12 @@ use crate::settings::Settings;
use crate::ws::run_ws_loop;
mod app_state;
mod driver;
mod drivers;
mod relay_loop;
mod settings;
mod utils;
mod ws;
mod errors;
async fn create_this_controller(
conn: &mut PoolConnection<Sqlite>,
@ -42,9 +43,7 @@ async fn create_this_relay(
let relay = DbRelay::create(
conn,
&settings_relay.name,
settings_relay.number.ok_or(EmgauwaError::Internal(
"Relay number is missing".to_string(),
))?,
settings_relay.number,
this_controller,
)
.await?;
@ -87,9 +86,7 @@ async fn main() -> Result<(), std::io::Error> {
if DbRelay::get_by_controller_and_num(
&mut conn,
&db_controller,
relay.number.ok_or(EmgauwaError::Internal(
"Relay number is missing".to_string(),
))?,
relay.number,
)
.await
.map_err(EmgauwaError::from)?