Merge pull request #52 from SimonBrandner/feat/monochrome

Fix: properly handle monochrome devices
AaronErhardt · Dec 28, 2023 · 977bab6 · 977bab6
2 parents 96e4003 + f48fcdb
commit 977bab6
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 48 deletions.
diff --git a/tailor_api/src/color.rs b/tailor_api/src/color.rs
@@ -1,3 +1,4 @@
+use crate::led::LedControllerMode;
 use atoi::FromRadix16;
 use std::{fmt::Display, io, str::FromStr};
 
@@ -22,25 +23,28 @@ pub enum ColorProfile {
     Multiple(Vec<ColorPoint>),
 }
 
-impl Default for ColorProfile {
-    fn default() -> Self {
-        Self::Multiple(vec![
-            ColorPoint {
-                color: Color { r: 255, g: 0, b: 0 },
-                transition: ColorTransition::Linear,
-                transition_time: 6000,
-            },
-            ColorPoint {
-                color: Color { r: 0, g: 255, b: 0 },
-                transition: ColorTransition::Linear,
-                transition_time: 6000,
-            },
-            ColorPoint {
-                color: Color { r: 0, g: 0, b: 255 },
-                transition: ColorTransition::Linear,
-                transition_time: 6000,
-            },
-        ])
+impl ColorProfile {
+    pub fn default(mode: LedControllerMode) -> Self {
+        match mode {
+            LedControllerMode::Monochrome => Self::None,
+            LedControllerMode::Rgb => Self::Multiple(vec![
+                ColorPoint {
+                    color: Color { r: 255, g: 0, b: 0 },
+                    transition: ColorTransition::Linear,
+                    transition_time: 6000,
+                },
+                ColorPoint {
+                    color: Color { r: 0, g: 255, b: 0 },
+                    transition: ColorTransition::Linear,
+                    transition_time: 6000,
+                },
+                ColorPoint {
+                    color: Color { r: 0, g: 0, b: 255 },
+                    transition: ColorTransition::Linear,
+                    transition_time: 6000,
+                },
+            ]),
+        }
     }
 }
 

diff --git a/tailor_api/src/led.rs b/tailor_api/src/led.rs
@@ -1,14 +1,23 @@
+#[derive(Debug, Copy, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum LedControllerMode {
+    Rgb,
+    Monochrome,
+}
+
 #[derive(Debug, Clone, Hash, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct LedDeviceInfo {
     pub device_name: String,
     pub function: String,
+    pub mode: LedControllerMode,
 }
 
 impl LedDeviceInfo {
     pub fn device_id(&self) -> String {
         let Self {
             device_name,
             function,
+            mode: _mode,
         } = self;
         format!("{device_name}::{function}")
     }

diff --git a/tailor_api/src/lib.rs b/tailor_api/src/lib.rs
@@ -5,5 +5,5 @@ mod profile;
 
 pub use color::{Color, ColorPoint, ColorProfile, ColorTransition};
 pub use fan::FanProfilePoint;
-pub use led::LedDeviceInfo;
+pub use led::{LedControllerMode, LedDeviceInfo};
 pub use profile::{LedProfile, ProfileInfo};
diff --git a/tailor_api/src/profile.rs b/tailor_api/src/profile.rs
@@ -1,3 +1,5 @@
+use crate::LedControllerMode;
+
 #[derive(Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct ProfileInfo {
     pub fans: Vec<String>,
@@ -20,4 +22,5 @@ pub struct LedProfile {
     pub device_name: String,
     pub function: String,
     pub profile: String,
+    pub mode: LedControllerMode,
 }
diff --git a/tailord/src/dbus/led.rs b/tailord/src/dbus/led.rs
@@ -34,7 +34,8 @@ impl LedInterface {
                             None
                         }
                     })
-                    .unwrap_or_default();
+                    .unwrap_or_else(|| ColorProfile::default(handle.info.mode));
+
                 handle.profile_sender.send(profile).await.unwrap();
             }
         }

diff --git a/tailord/src/dbus/profiles.rs b/tailord/src/dbus/profiles.rs
@@ -1,4 +1,4 @@
-use tailor_api::{LedDeviceInfo, ProfileInfo};
+use tailor_api::{ColorProfile, LedDeviceInfo, ProfileInfo};
 use zbus::{dbus_interface, fdo};
 
 use crate::{
@@ -92,7 +92,10 @@ impl ProfileInterface {
         }
 
         for led_handle in &self.led_handles {
-            let profile = leds.get(&led_handle.info).cloned().unwrap_or_default();
+            let profile = match leds.get(&led_handle.info).cloned() {
+                Some(color_profile) => color_profile,
+                None => ColorProfile::default(led_handle.info.mode),
+            };
             led_handle
                 .profile_sender
                 .send(profile)

diff --git a/tailord/src/led/mod.rs b/tailord/src/led/mod.rs
@@ -32,6 +32,7 @@ impl LedRuntime {
                 info: LedDeviceInfo {
                     device_name: data.controller.device_name.clone(),
                     function: data.controller.function.clone(),
+                    mode: data.controller.mode().clone(),
                 },
                 profile_sender,
                 color_sender,

diff --git a/tailord/src/main.rs b/tailord/src/main.rs
@@ -11,6 +11,7 @@ use std::future::pending;
 
 use dbus::{FanInterface, PerformanceInterface, ProfileInterface};
 use profiles::Profile;
+use tailor_api::{ColorProfile, LedControllerMode};
 use tuxedo_ioctl::hal::IoInterface;
 use zbus::ConnectionBuilder;
 
@@ -19,6 +20,7 @@ use crate::{
     fancontrol::FanRuntime,
     led::{LedRuntime, LedRuntimeData},
     performance::PerformanceProfileRuntime,
+    profiles::SupportedFeatures,
 };
 
 const DBUS_NAME: &str = "com.tux.Tailor";
@@ -45,6 +47,18 @@ async fn start_runtime() {
     // Setup shutdown
     let mut shutdown_receiver = shutdown::setup();
 
+    let led_devices = tuxedo_sysfs::led::Collection::new()
+        .await
+        .map(|c| c.into_inner())
+        .unwrap_or_default();
+
+    let mut mode = LedControllerMode::Rgb;
+    for device in &led_devices {
+        if device.mode() == LedControllerMode::Monochrome {
+            mode = LedControllerMode::Monochrome;
+        }
+    }
+    Profile::init_if_necessary(SupportedFeatures { mode });
     let profile = Profile::load();
 
     let (device, _webcam, _tdp) = match IoInterface::new() {
@@ -81,11 +95,6 @@ async fn start_runtime() {
         }
     }
 
-    let led_devices = tuxedo_sysfs::led::Collection::new()
-        .await
-        .map(|c| c.into_inner())
-        .unwrap_or_default();
-
     let mut led_handles = Vec::new();
     let mut led_runtimes = Vec::new();
     for led_device in led_devices {
@@ -101,7 +110,7 @@ async fn start_runtime() {
                     None
                 }
             })
-            .unwrap_or_default();
+            .unwrap_or_else(|| ColorProfile::default(led_device.mode()));
 
         let (handle, runtime) = LedRuntime::new(LedRuntimeData {
             controller: led_device,

diff --git a/tailord/src/profiles.rs b/tailord/src/profiles.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, path::Component, path::Path};
 
 use crate::{fancontrol::profile::FanProfile, performance::PerformanceProfile};
-use tailor_api::{ColorProfile, LedDeviceInfo, LedProfile, ProfileInfo};
+use tailor_api::{ColorProfile, LedControllerMode, LedDeviceInfo, LedProfile, ProfileInfo};
 use zbus::fdo;
 
 use super::util;
@@ -20,14 +20,14 @@ fn init_paths() {
         })
 }
 
-fn init_profiles() {
+fn init_profiles(supported_features: SupportedFeatures) {
     fn default_profile_exists(base_path: &str) -> bool {
         Path::new(base_path).join(DEFAULT_PROFILE_NAME).exists()
     }
 
     tracing::debug!("Initialising profiles.");
     if !default_profile_exists(KEYBOARD_DIR) {
-        let profile = ColorProfile::default();
+        let profile = ColorProfile::default(supported_features.mode);
         util::write_json_sync(KEYBOARD_DIR, DEFAULT_PROFILE_NAME, &profile).ok();
     }
     if !default_profile_exists(FAN_DIR) {
@@ -50,9 +50,9 @@ fn init_profiles() {
     std::os::unix::fs::symlink(default_profile, ACTIVE_PROFILE_PATH).ok();
 }
 
-fn init_profiles_if_necessary() {
+fn init_profiles_if_necessary(supported_features: SupportedFeatures) {
     if !Path::new(ACTIVE_PROFILE_PATH).exists() {
-        init_profiles();
+        init_profiles(supported_features);
     }
 }
 
@@ -75,6 +75,11 @@ fn load_fan_profile(name: &str) -> fdo::Result<FanProfile> {
     FanProfile::load_config(fan_path(name)?)
 }
 
+#[derive(Debug, Clone, Copy)]
+pub struct SupportedFeatures {
+    pub mode: LedControllerMode,
+}
+
 #[derive(Debug)]
 pub struct Profile {
     pub fans: Vec<FanProfile>,
@@ -83,10 +88,12 @@ pub struct Profile {
 }
 
 impl Profile {
-    pub fn load() -> Self {
+    pub fn init_if_necessary(supported_features: SupportedFeatures) {
         init_paths();
-        init_profiles_if_necessary();
+        init_profiles_if_necessary(supported_features);
+    }
 
+    pub fn load() -> Self {
         let profile_info = Self::get_active_profile_info().unwrap_or_else(|err| {
             tracing::warn!("Failed to load active profile at `{ACTIVE_PROFILE_PATH}`: {err:?}");
             ProfileInfo::default()
@@ -99,10 +106,12 @@ impl Profile {
                 device_name,
                 function,
                 profile,
+                mode,
             } = data;
             let info = LedDeviceInfo {
                 device_name,
                 function,
+                mode,
             };
             let profile = match load_led_profile(&profile) {
                 Ok(keyboard) => keyboard,
@@ -112,7 +121,7 @@ impl Profile {
                         info.device_id(),
                         err.to_string(),
                     );
-                    ColorProfile::default()
+                    ColorProfile::default(mode)
                 }
             };
             led.insert(info, profile);

diff --git a/tuxedo_sysfs/src/led/controller.rs b/tuxedo_sysfs/src/led/controller.rs
@@ -1,10 +1,11 @@
 use std::io;
 
 use tailor_api::Color;
+use tailor_api::LedControllerMode;
 
 use crate::sysfs_util::{read_int_list, write_string};
 
-use super::{Controller, ControllerMode};
+use super::Controller;
 
 impl Controller {
     pub async fn new_rgb(
@@ -91,11 +92,11 @@ impl Controller {
         &self.function
     }
 
-    pub fn mode(&self) -> ControllerMode {
+    pub fn mode(&self) -> LedControllerMode {
         if self.intensities_file.is_some() {
-            ControllerMode::Rgb
+            LedControllerMode::Rgb
         } else {
-            ControllerMode::Monochrome
+            LedControllerMode::Monochrome
         }
     }
 }
diff --git a/tuxedo_sysfs/src/led/mod.rs b/tuxedo_sysfs/src/led/mod.rs
@@ -19,10 +19,3 @@ pub struct Controller {
     brightness_file: tokio_uring::fs::File,
     intensities_file: Option<tokio_uring::fs::File>,
 }
-
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum ControllerMode {
-    Rgb,
-    Monochrome,
-}