mirrors/microdeck
1
0
Fork 0
mirror of https://codeberg.org/Fl1tzi/microdeck.git synced 2024-05-08 14:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fmt

Browse source
This commit is contained in:
Fl1tzi 2023-04-05 00:02:25 +02:00
parent 74050ccb17
commit dee6193d1e
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -13,7 +13,7 @@ use tokio::sync::mpsc;
use tokio::sync::mpsc::error::TrySendError;
use tokio::sync::Mutex;
use tokio::task::JoinHandle;
use tracing::{debug, error, info, trace, warn, info_span, Level};
use tracing::{debug, error, info, info_span, trace, warn, Level};
mod modules;
use elgato_streamdeck as streamdeck;
use streamdeck::asynchronous::{AsyncStreamDeck, ButtonStateUpdate};
@ -111,9 +111,7 @@ pub async fn start(config: Config, hid: HidApi, hw_devices: Vec<(streamdeck::inf
// start listeners
for device in devices {
handles.push(tokio::spawn(async move {
device.key_listener().await
}))
handles.push(tokio::spawn(async move { device.key_listener().await }))
}
loop {
@ -205,7 +203,11 @@ impl DeviceManager {
/// This is the entry point for the application. This will check all devices for their config,
/// start the modules and the device button listeners.
async fn init_devices(config: Config, hid: HidApi, devices: Vec<(streamdeck::info::Kind, String)>) -> Vec<DeviceManager> {
async fn init_devices(
config: Config,
hid: HidApi,
devices: Vec<(streamdeck::info::Kind, String)>,
) -> Vec<DeviceManager> {
// check if configuration is correct for device
if devices.len() == 0 {
error!("There are no Decks connected");
@ -241,10 +243,10 @@ async fn init_devices(config: Config, hid: HidApi, devices: Vec<(streamdeck::inf
// save button senders
let mut buttons_keys = HashMap::new();
for button in device_conf.buttons.clone().into_iter() {
let _span_button = info_span!("button", index=button.index).entered();
let _span_button = info_span!("button", index = button.index).entered();
if buttons_keys.get(&button.index).is_some() {
warn!("The button is configured twice");
continue
continue;
}
// if the index of the button is higher than the button count
if button_count < button.index {

2
src/modules.rs
View file

@ -11,13 +11,13 @@ use async_trait::async_trait;
pub use elgato_streamdeck as streamdeck;
use futures_util::Future;
use image::DynamicImage;
use lazy_static::lazy_static;
pub use streamdeck::info::ImageFormat;
use streamdeck::info::Kind;
use streamdeck::AsyncStreamDeck;
pub use streamdeck::StreamDeckError;
use tokio::sync::mpsc;
use tokio::sync::Mutex;
use lazy_static::lazy_static;
use tracing::{debug, error, info};
lazy_static! {