mirror of
https://codeberg.org/Fl1tzi/microdeck.git
synced 2024-05-19 19:20:20 +00:00
patched driver, new structure, hot plugging
I forked the initial driver because it has breaking changes, which do not perform well.
This commit is contained in:
parent
b15fad561e
commit
73b981fabe
|
@ -6,7 +6,7 @@ license = "MIT"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
hidapi = "2.2.0"
|
hidapi = "2.2.0"
|
||||||
elgato-streamdeck = { version = "0.2.4", features = ["async"] }
|
deck-driver = { git = "https://codeberg.org/Fl1tzi/deck-driver.git", branch = "main", features = ["async"] }
|
||||||
toml = "0.7.2"
|
toml = "0.7.2"
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
196
src/device.rs
Normal file
196
src/device.rs
Normal file
|
@ -0,0 +1,196 @@
|
||||||
|
use crate::{
|
||||||
|
modules::{retrieve_module_from_name, start_module, HostEvent},
|
||||||
|
Button, ConfigError, DeviceConfig,
|
||||||
|
};
|
||||||
|
use deck_driver as streamdeck;
|
||||||
|
use hidapi::HidApi;
|
||||||
|
use std::{
|
||||||
|
collections::HashMap,
|
||||||
|
fmt::{self, Display},
|
||||||
|
sync::Arc,
|
||||||
|
};
|
||||||
|
use streamdeck::{
|
||||||
|
asynchronous::{AsyncStreamDeck, ButtonStateUpdate},
|
||||||
|
info::Kind,
|
||||||
|
StreamDeckError,
|
||||||
|
};
|
||||||
|
use tokio::{
|
||||||
|
process::Command,
|
||||||
|
sync::{
|
||||||
|
mpsc::{self, error::TrySendError},
|
||||||
|
Mutex,
|
||||||
|
},
|
||||||
|
task::JoinHandle,
|
||||||
|
};
|
||||||
|
use tracing::{debug, error, info_span, trace};
|
||||||
|
|
||||||
|
macro_rules! skip_if_none {
|
||||||
|
($res:expr) => {
|
||||||
|
match $res {
|
||||||
|
Some(v) => v,
|
||||||
|
None => continue,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum DeviceError {
|
||||||
|
DriverError(StreamDeckError),
|
||||||
|
Config(ConfigError),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for DeviceError {
|
||||||
|
fn fmt(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
|
||||||
|
match self {
|
||||||
|
DeviceError::DriverError(e) => write!(formatter, "Driver: {}", e),
|
||||||
|
DeviceError::Config(e) => write!(formatter, "Config: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handles everything related to a single device
|
||||||
|
pub struct Device {
|
||||||
|
// use this in favor of DeviceConfig
|
||||||
|
modules: HashMap<u8, (Button, JoinHandle<()>, mpsc::Sender<HostEvent>)>,
|
||||||
|
device: Arc<AsyncStreamDeck>,
|
||||||
|
is_dropped: bool,
|
||||||
|
serial: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Device {
|
||||||
|
pub async fn new(
|
||||||
|
serial: String,
|
||||||
|
kind: Kind,
|
||||||
|
device_conf: &DeviceConfig,
|
||||||
|
hid: &HidApi,
|
||||||
|
) -> Result<Device, DeviceError> {
|
||||||
|
// connect to deck or continue to next
|
||||||
|
let deck = match AsyncStreamDeck::connect(hid, kind, &serial) {
|
||||||
|
Ok(deck) => deck,
|
||||||
|
Err(e) => return Err(DeviceError::DriverError(e)),
|
||||||
|
};
|
||||||
|
// set brightness
|
||||||
|
deck.set_brightness(device_conf.brightness).await.unwrap();
|
||||||
|
// reset
|
||||||
|
deck.reset().await.unwrap();
|
||||||
|
// initialize buttons
|
||||||
|
let button_count = kind.key_count();
|
||||||
|
|
||||||
|
// CONFIG VALIDATING
|
||||||
|
for button in device_conf.buttons.clone().into_iter() {
|
||||||
|
let _span_button = info_span!("button", index = button.index).entered();
|
||||||
|
// if the index of the button is higher than the button count
|
||||||
|
if button_count < button.index {
|
||||||
|
return Err(DeviceError::Config(ConfigError::ButtonDoesNotExist(
|
||||||
|
button.index,
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Device {
|
||||||
|
modules: HashMap::new(),
|
||||||
|
device: deck,
|
||||||
|
is_dropped: false,
|
||||||
|
serial,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn start_button(&mut self, btn: &Button) -> Result<(), DeviceError> {
|
||||||
|
let (button_sender, button_receiver) = mpsc::channel(4);
|
||||||
|
if let Some(module) = retrieve_module_from_name(btn.module.clone()) {
|
||||||
|
let b = btn.clone();
|
||||||
|
let ser = self.serial.clone();
|
||||||
|
let rx = Arc::new(Mutex::new(button_receiver));
|
||||||
|
let dev = self.device.clone();
|
||||||
|
let handle = tokio::spawn(async move {
|
||||||
|
start_module(ser, b, module, dev, rx).await;
|
||||||
|
});
|
||||||
|
self.modules
|
||||||
|
.insert(btn.index, (btn.clone(), handle, button_sender));
|
||||||
|
return Ok(());
|
||||||
|
} else {
|
||||||
|
return Err(DeviceError::Config(ConfigError::ModuleDoesNotExist(
|
||||||
|
btn.index,
|
||||||
|
btn.module.clone(),
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn serial(&self) -> String {
|
||||||
|
self.serial.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// stops all modules of the device
|
||||||
|
fn stop_all_modules(&self) {
|
||||||
|
for (index, (_, handle, _)) in self.modules.iter() {
|
||||||
|
trace!("Destroying module {}", index);
|
||||||
|
handle.abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn drop(&mut self) {
|
||||||
|
self.is_dropped = true
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_dropped(&self) -> bool {
|
||||||
|
self.is_dropped
|
||||||
|
}
|
||||||
|
|
||||||
|
/// listener for button press changes on the device
|
||||||
|
#[tracing::instrument(skip_all, fields(serial = self.serial))]
|
||||||
|
pub async fn key_listener(&mut self) {
|
||||||
|
loop {
|
||||||
|
match self.device.get_reader().read(7.0).await {
|
||||||
|
Ok(v) => {
|
||||||
|
trace!("{:?}", v);
|
||||||
|
for update in v {
|
||||||
|
match update {
|
||||||
|
ButtonStateUpdate::ButtonDown(i) => {
|
||||||
|
let options = skip_if_none!(self.modules.get(&i));
|
||||||
|
if let Some(on_click) = &options.0.on_click {
|
||||||
|
execute_sh(on_click).await;
|
||||||
|
} else {
|
||||||
|
send_to_channel(&options.2, HostEvent::ButtonPressed).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ButtonStateUpdate::ButtonUp(i) => {
|
||||||
|
let options = skip_if_none!(self.modules.get(&i));
|
||||||
|
if let Some(on_release) = &options.0.on_release {
|
||||||
|
execute_sh(on_release).await;
|
||||||
|
} else {
|
||||||
|
send_to_channel(&options.2, HostEvent::ButtonReleased).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => match e {
|
||||||
|
StreamDeckError::HidError(e) => {
|
||||||
|
error!("Shutting down device because of: {e}");
|
||||||
|
self.stop_all_modules();
|
||||||
|
self.drop();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_ => error!("{e}"),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn execute_sh(command: &str) {
|
||||||
|
match Command::new("sh").arg(command).output().await {
|
||||||
|
Ok(o) => debug!("Command \'{}\' returned: {}", command, o.status),
|
||||||
|
Err(e) => error!("Command \'{}\' failed: {}", command, e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// try to send an event to the module channel.
|
||||||
|
/// If the module dropped the listener this will return false.
|
||||||
|
pub async fn send_to_channel(sender: &mpsc::Sender<HostEvent>, event: HostEvent) -> bool {
|
||||||
|
if let Err(e) = sender.try_send(event) {
|
||||||
|
match e {
|
||||||
|
TrySendError::Full(_) => trace!("Buffer full: {:?}", e),
|
||||||
|
TrySendError::Closed(_) => return false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
312
src/main.rs
312
src/main.rs
|
@ -1,39 +1,30 @@
|
||||||
|
use deck_driver as streamdeck;
|
||||||
|
use device::Device;
|
||||||
use hidapi::HidApi;
|
use hidapi::HidApi;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::collections::HashMap;
|
use std::{
|
||||||
use std::fs;
|
collections::HashMap,
|
||||||
use std::io::ErrorKind;
|
env,
|
||||||
use std::process::exit;
|
fmt::{self, Display},
|
||||||
use std::sync::Arc;
|
fs,
|
||||||
use std::time::Duration;
|
io::ErrorKind,
|
||||||
use std::{env, path::PathBuf};
|
path::PathBuf,
|
||||||
use streamdeck::StreamDeckError;
|
process::exit,
|
||||||
use tokio::process::Command;
|
time::Duration,
|
||||||
use tokio::sync::mpsc;
|
};
|
||||||
use tokio::sync::mpsc::error::TrySendError;
|
use tracing::{debug, error, info, warn};
|
||||||
use tokio::sync::Mutex;
|
use tracing_subscriber::{
|
||||||
use tokio::task::JoinHandle;
|
self, prelude::__tracing_subscriber_SubscriberExt, util::SubscriberInitExt, EnvFilter,
|
||||||
use tracing::{debug, error, info, info_span, trace, warn, Level};
|
};
|
||||||
mod modules;
|
|
||||||
use elgato_streamdeck as streamdeck;
|
|
||||||
use streamdeck::asynchronous::{AsyncStreamDeck, ButtonStateUpdate};
|
|
||||||
|
|
||||||
use dirs::config_dir;
|
use dirs::config_dir;
|
||||||
|
|
||||||
use crate::modules::{retrieve_module_from_name, start_module, HostEvent};
|
mod device;
|
||||||
|
mod modules;
|
||||||
|
|
||||||
/// The name of the folder which holds the config
|
/// The name of the folder which holds the config
|
||||||
pub const CONFIG_FOLDER_NAME: &'static str = "dach-decker";
|
pub const CONFIG_FOLDER_NAME: &'static str = "dach-decker";
|
||||||
|
|
||||||
macro_rules! skip_if_none {
|
|
||||||
($res:expr) => {
|
|
||||||
match $res {
|
|
||||||
Some(v) => v,
|
|
||||||
None => continue,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The config structure
|
/// The config structure
|
||||||
#[derive(Deserialize, Debug)]
|
#[derive(Deserialize, Debug)]
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
|
@ -45,11 +36,17 @@ pub struct Config {
|
||||||
struct GlobalConfig;
|
struct GlobalConfig;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let subscriber = tracing_subscriber::fmt()
|
// ------ LOAD CONFIG
|
||||||
.with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
|
|
||||||
.with_target(false)
|
let fmt_layer = tracing_subscriber::fmt::layer().with_target(false);
|
||||||
.finish();
|
let filter_layer = EnvFilter::try_from_default_env()
|
||||||
tracing::subscriber::set_global_default(subscriber).unwrap();
|
.or_else(|_| EnvFilter::try_new("info"))
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
tracing_subscriber::registry()
|
||||||
|
.with(filter_layer)
|
||||||
|
.with(fmt_layer)
|
||||||
|
.init();
|
||||||
|
|
||||||
let config_file: PathBuf = match env::var_os("DACH_DECKER_CONFIG") {
|
let config_file: PathBuf = match env::var_os("DACH_DECKER_CONFIG") {
|
||||||
Some(path) => PathBuf::from(path),
|
Some(path) => PathBuf::from(path),
|
||||||
|
@ -85,7 +82,9 @@ fn main() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
debug!("{:#?}", config);
|
debug!("{:#?}", config);
|
||||||
// hidapi
|
|
||||||
|
// ------ START APPLICATION
|
||||||
|
|
||||||
let hid = match streamdeck::new_hidapi() {
|
let hid = match streamdeck::new_hidapi() {
|
||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
@ -93,195 +92,102 @@ fn main() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
// list devices
|
|
||||||
// TODO: allow hotplug
|
|
||||||
let devices = streamdeck::list_devices(&hid);
|
|
||||||
// lets start some async
|
// lets start some async
|
||||||
tokio::runtime::Builder::new_multi_thread()
|
tokio::runtime::Builder::new_multi_thread()
|
||||||
.enable_all()
|
.enable_all()
|
||||||
.build()
|
.build()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.block_on(start(config, hid, devices))
|
.block_on(start(config, hid))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn start(config: Config, hid: HidApi, hw_devices: Vec<(streamdeck::info::Kind, String)>) {
|
pub async fn start(config: Config, mut hid: HidApi) {
|
||||||
let devices = init_devices(config, hid, hw_devices).await;
|
let mut devices: HashMap<String, Device> = HashMap::new();
|
||||||
|
|
||||||
let mut handles: Vec<JoinHandle<()>> = Vec::new();
|
// devices which are not configured anyways
|
||||||
|
let mut ignore_devices: Vec<String> = Vec::new();
|
||||||
// start listeners
|
|
||||||
for device in devices {
|
|
||||||
handles.push(tokio::spawn(async move { device.key_listener().await }))
|
|
||||||
}
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
tokio::time::sleep(Duration::from_secs(2000)).await;
|
// check for devices that can be removed
|
||||||
}
|
let mut removable_devices = Vec::new();
|
||||||
}
|
for (key, device) in &devices {
|
||||||
|
if device.is_dropped() {
|
||||||
/// try to send an event to the module channel.
|
removable_devices.push(key.to_owned());
|
||||||
/// If the module dropped the listener this will return false.
|
|
||||||
pub async fn send_to_channel(sender: mpsc::Sender<HostEvent>, event: HostEvent) -> bool {
|
|
||||||
if let Err(e) = sender.try_send(event) {
|
|
||||||
match e {
|
|
||||||
TrySendError::Full(_) => trace!("Buffer full: {:?}", e),
|
|
||||||
TrySendError::Closed(_) => return false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
true
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Handles everything related to a single device
|
|
||||||
pub struct DeviceManager {
|
|
||||||
modules: HashMap<u8, (Button, JoinHandle<()>, mpsc::Sender<HostEvent>)>,
|
|
||||||
device: Arc<AsyncStreamDeck>,
|
|
||||||
serial: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl DeviceManager {
|
|
||||||
async fn new(
|
|
||||||
serial: String,
|
|
||||||
device: Arc<AsyncStreamDeck>,
|
|
||||||
modules: HashMap<u8, (Button, JoinHandle<()>, mpsc::Sender<HostEvent>)>,
|
|
||||||
) -> DeviceManager {
|
|
||||||
DeviceManager {
|
|
||||||
modules,
|
|
||||||
device,
|
|
||||||
serial,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// stops all modules of the device
|
|
||||||
fn shutdown(self) {
|
|
||||||
for (index, (_, handle, _)) in self.modules {
|
|
||||||
trace!("Destroying module {}", index);
|
|
||||||
handle.abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/// listener for button press changes on the device
|
|
||||||
#[tracing::instrument(skip_all, fields(serial = self.serial))]
|
|
||||||
async fn key_listener(self) {
|
|
||||||
loop {
|
|
||||||
match self.device.get_reader().read(7.0).await {
|
|
||||||
Ok(v) => {
|
|
||||||
trace!("{:?}", v);
|
|
||||||
for update in v {
|
|
||||||
match update {
|
|
||||||
ButtonStateUpdate::ButtonDown(i) => {
|
|
||||||
let options = skip_if_none!(self.modules.get(&i));
|
|
||||||
if let Some(on_click) = &options.0.on_click {
|
|
||||||
execute_sh(on_click).await;
|
|
||||||
} else {
|
|
||||||
send_to_channel(options.2.clone(), HostEvent::ButtonPressed)
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ButtonStateUpdate::ButtonUp(i) => {
|
|
||||||
let options = skip_if_none!(self.modules.get(&i));
|
|
||||||
if let Some(on_release) = &options.0.on_release {
|
|
||||||
execute_sh(on_release).await;
|
|
||||||
} else {
|
|
||||||
send_to_channel(options.2.clone(), HostEvent::ButtonReleased)
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => match e {
|
|
||||||
StreamDeckError::HidError(e) => {
|
|
||||||
error!("Shutting down device because of: {e}");
|
|
||||||
self.shutdown();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
_ => error!("{e}"),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
for d in removable_devices {
|
||||||
}
|
devices.remove(&d);
|
||||||
|
|
||||||
/// 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> {
|
|
||||||
// check if configuration is correct for device
|
|
||||||
if devices.len() == 0 {
|
|
||||||
error!("There are no Decks connected");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
info!("There are {} Decks connected", devices.len());
|
|
||||||
let mut device_managers = Vec::new();
|
|
||||||
'device: for device in devices {
|
|
||||||
let _span_device = info_span!("device", serial = device.1).entered();
|
|
||||||
// no pedals are supported
|
|
||||||
if !device.0.is_visual() {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
// device.1 is the serial number
|
|
||||||
if let Some(device_conf) = config.device.iter().find(|s| s.serial == device.1) {
|
|
||||||
// connect to deck or continue to next
|
|
||||||
let deck = match AsyncStreamDeck::connect(&hid, device.0, &device.1) {
|
|
||||||
Ok(deck) => {
|
|
||||||
info!("Successfully connected");
|
|
||||||
deck
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
error!("Cannot connect: {}", e);
|
|
||||||
continue 'device;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
// set brightness
|
|
||||||
deck.set_brightness(device_conf.brightness).await.unwrap();
|
|
||||||
// reset
|
|
||||||
deck.reset().await.unwrap();
|
|
||||||
// initialize buttons
|
|
||||||
let button_count = device.0.key_count();
|
|
||||||
// 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();
|
|
||||||
if buttons_keys.get(&button.index).is_some() {
|
|
||||||
warn!("The button is configured twice");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// if the index of the button is higher than the button count
|
|
||||||
if button_count < button.index {
|
|
||||||
warn!("This button does not exist on device",);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// create a channel for the module to receive device events
|
|
||||||
let (button_sender, button_receiver) = mpsc::channel(4);
|
|
||||||
// spawn the module
|
|
||||||
if let Some(module) = retrieve_module_from_name(button.module.clone()) {
|
|
||||||
let b = button.clone();
|
|
||||||
let rx = Arc::new(Mutex::new(button_receiver));
|
|
||||||
let dev = deck.clone();
|
|
||||||
let ser = device.1.clone();
|
|
||||||
let handle = tokio::spawn(async move {
|
|
||||||
start_module(ser, b, module, dev, rx).await;
|
|
||||||
});
|
|
||||||
|
|
||||||
buttons_keys.insert(button.index, (button, handle, button_sender));
|
// refresh device list
|
||||||
} else {
|
if let Err(e) = streamdeck::refresh_device_list(&mut hid) {
|
||||||
warn!("The module \"{}\" does not exist.", button.module)
|
warn!("Cannot fetch new devices: {}", e);
|
||||||
}
|
|
||||||
}
|
|
||||||
device_managers.push(DeviceManager::new(device.1, deck, buttons_keys).await);
|
|
||||||
} else {
|
} else {
|
||||||
info!("Deck is not configured");
|
for hw_device in streamdeck::list_devices(&hid) {
|
||||||
|
// if the device is not ignored and device is not already started
|
||||||
|
if !ignore_devices.contains(&hw_device.1) && devices.get(&hw_device.1).is_none() {
|
||||||
|
debug!("New device detected: {}", &hw_device.1);
|
||||||
|
if let Some(device_config) =
|
||||||
|
config.device.iter().find(|d| d.serial == hw_device.1)
|
||||||
|
{
|
||||||
|
// start the device and its listener
|
||||||
|
if let Some(mut device) = start_device(hw_device, &hid, device_config).await
|
||||||
|
{
|
||||||
|
device.key_listener().await;
|
||||||
|
devices.insert(device.serial(), device);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
info!("The device {} is not configured.", hw_device.1);
|
||||||
|
ignore_devices.push(hw_device.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tokio::time::sleep(Duration::from_secs(2)).await;
|
||||||
}
|
}
|
||||||
device_managers
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn execute_sh(command: &str) {
|
#[tracing::instrument(name = "device", skip_all, fields(serial = device.1))]
|
||||||
match Command::new("sh").arg(command).output().await {
|
pub async fn start_device(
|
||||||
Ok(o) => debug!("Command \'{}\' returned: {}", command, o.status),
|
device: (streamdeck::info::Kind, String),
|
||||||
Err(e) => error!("Command \'{}\' failed: {}", command, e),
|
hid: &HidApi,
|
||||||
|
device_config: &DeviceConfig,
|
||||||
|
) -> Option<Device> {
|
||||||
|
match Device::new(device.1, device.0, device_config, &hid).await {
|
||||||
|
Ok(mut d) => {
|
||||||
|
info!("Connected");
|
||||||
|
// start all modules
|
||||||
|
for button in device_config.buttons.iter() {
|
||||||
|
if let Err(e) = d.start_button(&button) {
|
||||||
|
error!("{}", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some(d)
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
error!("Unable to connect: {}", e);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub enum ConfigError {
|
||||||
|
ButtonDoesNotExist(u8),
|
||||||
|
ModuleDoesNotExist(u8, String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Display for ConfigError {
|
||||||
|
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
ConfigError::ButtonDoesNotExist(index) => {
|
||||||
|
write!(formatter, "Button {}: does not exist.", index)
|
||||||
|
}
|
||||||
|
ConfigError::ModuleDoesNotExist(index, module) => write!(
|
||||||
|
formatter,
|
||||||
|
"Button {}: The module \"{}\" does not exist.",
|
||||||
|
index, module
|
||||||
|
),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
mod blank;
|
mod blank;
|
||||||
mod counter;
|
mod counter;
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::pin::Pin;
|
|
||||||
use std::{error::Error, sync::Arc};
|
|
||||||
|
|
||||||
use self::counter::Counter;
|
use self::counter::Counter;
|
||||||
use crate::Button;
|
use crate::Button;
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
pub use elgato_streamdeck as streamdeck;
|
pub use deck_driver as streamdeck;
|
||||||
use futures_util::Future;
|
use futures_util::Future;
|
||||||
use image::DynamicImage;
|
use image::DynamicImage;
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::pin::Pin;
|
||||||
|
use std::{error::Error, sync::Arc};
|
||||||
pub use streamdeck::info::ImageFormat;
|
pub use streamdeck::info::ImageFormat;
|
||||||
use streamdeck::info::Kind;
|
use streamdeck::info::Kind;
|
||||||
use streamdeck::AsyncStreamDeck;
|
use streamdeck::AsyncStreamDeck;
|
||||||
|
@ -37,8 +36,8 @@ pub enum HostEvent {
|
||||||
ButtonReleased,
|
ButtonReleased,
|
||||||
}
|
}
|
||||||
|
|
||||||
type ModuleFuture = Pin<Box<dyn Future<Output = Result<(), ReturnError>> + Send>>;
|
pub type ModuleFuture = Pin<Box<dyn Future<Output = Result<(), ReturnError>> + Send>>;
|
||||||
type ModuleFunction = fn(DeviceAccess, ChannelReceiver, Button) -> ModuleFuture;
|
pub type ModuleFunction = fn(DeviceAccess, ChannelReceiver, Button) -> ModuleFuture;
|
||||||
|
|
||||||
pub fn retrieve_module_from_name(name: String) -> Option<ModuleFunction> {
|
pub fn retrieve_module_from_name(name: String) -> Option<ModuleFunction> {
|
||||||
MODULE_MAP.get(name.as_str()).copied()
|
MODULE_MAP.get(name.as_str()).copied()
|
||||||
|
@ -81,17 +80,17 @@ impl DeviceAccess {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// write a raw image to the Deck
|
/// write a raw image to the Deck.
|
||||||
pub async fn write_raw_img(&self, img: &[u8]) -> Result<(), StreamDeckError> {
|
pub async fn write_raw_img(&self, img: &[u8]) -> Result<(), StreamDeckError> {
|
||||||
self.streamdeck.write_image(self.index, img).await
|
self.streamdeck.write_image(self.index, img).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Write an image to the Deck
|
/// Write an image to the Deck.
|
||||||
pub async fn write_img(&self, img: DynamicImage) -> Result<(), StreamDeckError> {
|
pub async fn write_img(&self, img: DynamicImage) -> Result<(), StreamDeckError> {
|
||||||
self.streamdeck.set_button_image(self.index, img).await
|
self.streamdeck.set_button_image(self.index, img).await
|
||||||
}
|
}
|
||||||
|
|
||||||
/// reset the image
|
/// reset the image.
|
||||||
pub async fn clear_img(&self) -> Result<(), StreamDeckError> {
|
pub async fn clear_img(&self) -> Result<(), StreamDeckError> {
|
||||||
self.streamdeck.clear_button_image(self.index).await
|
self.streamdeck.clear_button_image(self.index).await
|
||||||
}
|
}
|
||||||
|
@ -100,7 +99,7 @@ impl DeviceAccess {
|
||||||
self.kind.key_image_format()
|
self.kind.key_image_format()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The resolution of the image on the Deck
|
/// The resolution of the image on the Deck.
|
||||||
pub fn resolution(&self) -> (usize, usize) {
|
pub fn resolution(&self) -> (usize, usize) {
|
||||||
self.format().size
|
self.format().size
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue