diff --git a/Cargo.lock b/Cargo.lock index d5896c5b..4b210b36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,8 +80,8 @@ dependencies = [ "notify-rust", "rog_aura", "rog_dbus", + "rog_platform", "rog_profiles", - "rog_supported", "serde_json", "smol", "zbus", @@ -98,8 +98,8 @@ dependencies = [ "rog_anime", "rog_aura", "rog_dbus", + "rog_platform", "rog_profiles", - "rog_supported", "sysfs-class", "tinybmp", "toml", @@ -553,7 +553,6 @@ dependencies = [ "rog_dbus", "rog_platform", "rog_profiles", - "rog_supported", "serde", "serde_derive", "serde_json", @@ -571,7 +570,7 @@ dependencies = [ "dirs 4.0.0", "rog_anime", "rog_dbus", - "rog_supported", + "rog_platform", "serde", "serde_derive", "serde_json", @@ -1962,8 +1961,8 @@ dependencies = [ "notify-rust", "rog_aura", "rog_dbus", + "rog_platform", "rog_profiles", - "rog_supported", "serde", "serde_derive", "serde_json", @@ -2005,8 +2004,8 @@ version = "4.2.1" dependencies = [ "rog_anime", "rog_aura", + "rog_platform", "rog_profiles", - "rog_supported", "zbus", "zbus_macros", "zvariant", @@ -2017,9 +2016,14 @@ name = "rog_platform" version = "0.1.0" dependencies = [ "log", + "rog_aura", "rusb", + "serde", + "serde_derive", "sysfs-class", "udev", + "zvariant", + "zvariant_derive", ] [[package]] @@ -2033,17 +2037,6 @@ dependencies = [ "zvariant_derive", ] -[[package]] -name = "rog_supported" -version = "4.2.1" -dependencies = [ - "rog_aura", - "serde", - "serde_derive", - "zvariant", - "zvariant_derive", -] - [[package]] name = "rusb" version = "0.9.1" diff --git a/Cargo.toml b/Cargo.toml index 6999b882..27e26c4a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["asusctl", "asus-notify", "daemon", "daemon-user", "rog-platform", "rog-supported", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center"] +members = ["asusctl", "asus-notify", "daemon", "daemon-user", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center"] [profile.release] # thin = 57s, asusd = 9.0M diff --git a/asus-notify/Cargo.toml b/asus-notify/Cargo.toml index 035a4917..364ab219 100644 --- a/asus-notify/Cargo.toml +++ b/asus-notify/Cargo.toml @@ -12,7 +12,7 @@ zbus = "^2.2" serde_json = "^1.0" rog_dbus = { path = "../rog-dbus" } rog_aura = { path = "../rog-aura" } -rog_supported = { path = "../rog-supported" } +rog_platform = { path = "../rog-platform" } rog_profiles = { path = "../rog-profiles" } smol = "^1.2" diff --git a/asusctl/Cargo.toml b/asusctl/Cargo.toml index f1331457..70c91139 100644 --- a/asusctl/Cargo.toml +++ b/asusctl/Cargo.toml @@ -12,7 +12,7 @@ rog_anime = { path = "../rog-anime" } rog_aura = { path = "../rog-aura" } rog_dbus = { path = "../rog-dbus" } rog_profiles = { path = "../rog-profiles" } -rog_supported = { path = "../rog-supported" } +rog_platform = { path = "../rog-platform" } daemon = { path = "../daemon" } gumdrop = "^0.8" toml = "^0.5.8" diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index f79a6ca8..bf87353f 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -14,12 +14,8 @@ use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, use rog_aura::usb::{AuraDev1866, AuraDev19b6, AuraDevTuf, AuraDevice, AuraPowerDev}; use rog_aura::{self, AuraEffect}; use rog_dbus::RogDbusClientBlocking; +use rog_platform::supported::*; use rog_profiles::error::ProfileError; -use rog_supported::SupportedFunctions; -use rog_supported::{ - AnimeSupportedFunctions, LedSupportedFunctions, PlatformProfileFunctions, - RogBiosSupportedFunctions, -}; use crate::aura_cli::LedBrightness; use crate::cli_opts::*; @@ -102,7 +98,7 @@ fn print_versions() { println!(" rog-aura v{}", rog_aura::VERSION); println!(" rog-dbus v{}", rog_dbus::VERSION); println!(" rog-profiles v{}", rog_profiles::VERSION); - println!("rog-supported v{}", rog_supported::VERSION); + println!("rog-platform v{}", rog_platform::VERSION); } fn print_laptop_info() { diff --git a/daemon-user/Cargo.toml b/daemon-user/Cargo.toml index 4ce3e36d..ec095781 100644 --- a/daemon-user/Cargo.toml +++ b/daemon-user/Cargo.toml @@ -21,7 +21,7 @@ serde_derive = "^1.0" rog_anime = { path = "../rog-anime" } rog_dbus = { path = "../rog-dbus" } -rog_supported = { path = "../rog-supported" } +rog_platform = { path = "../rog-platform" } dirs = "^4.0" diff --git a/daemon-user/src/daemon.rs b/daemon-user/src/daemon.rs index 39c8c99f..6a65588c 100644 --- a/daemon-user/src/daemon.rs +++ b/daemon-user/src/daemon.rs @@ -16,7 +16,7 @@ fn main() -> Result<(), Box> { println!(" user daemon v{}", rog_user::VERSION); println!(" rog-anime v{}", rog_anime::VERSION); println!(" rog-dbus v{}", rog_dbus::VERSION); - println!("rog-supported v{}", rog_supported::VERSION); + println!("rog-platform v{}", rog_platform::VERSION); let (client, _) = RogDbusClientBlocking::new()?; let supported = client.proxies().supported().supported_functions()?; diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 91f0410e..04cbfc60 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -20,7 +20,6 @@ path = "src/daemon.rs" [dependencies] rog_anime = { path = "../rog-anime", features = ["dbus"] } rog_aura = { path = "../rog-aura", features = ["dbus"] } -rog_supported = { path = "../rog-supported" } rog_platform = { path = "../rog-platform" } rog_profiles = { path = "../rog-profiles" } rog_dbus = { path = "../rog-dbus" } diff --git a/daemon/src/ctrl_anime/mod.rs b/daemon/src/ctrl_anime/mod.rs index 67978419..424e2c60 100644 --- a/daemon/src/ctrl_anime/mod.rs +++ b/daemon/src/ctrl_anime/mod.rs @@ -13,8 +13,7 @@ use rog_anime::{ }, ActionData, AnimeDataBuffer, AnimePacketType, AnimeType, }; -use rog_platform::{hid_raw::HidRaw, usb_raw::USBRaw}; -use rog_supported::AnimeSupportedFunctions; +use rog_platform::{hid_raw::HidRaw, supported::AnimeSupportedFunctions, usb_raw::USBRaw}; use smol::{stream::StreamExt, Executor}; use std::sync::atomic::{AtomicBool, Ordering}; use std::{ diff --git a/daemon/src/ctrl_aura/controller.rs b/daemon/src/ctrl_aura/controller.rs index 569542ea..9cdadb04 100644 --- a/daemon/src/ctrl_aura/controller.rs +++ b/daemon/src/ctrl_aura/controller.rs @@ -11,8 +11,7 @@ use rog_aura::{ AuraEffect, LedBrightness, LED_MSG_LEN, }; use rog_aura::{AuraZone, Direction, Speed, GRADIENT}; -use rog_platform::{hid_raw::HidRaw, keyboard_led::KeyboardLed}; -use rog_supported::LedSupportedFunctions; +use rog_platform::{hid_raw::HidRaw, keyboard_led::KeyboardLed, supported::LedSupportedFunctions}; use smol::{stream::StreamExt, Executor}; use std::collections::BTreeMap; use std::sync::Arc; diff --git a/daemon/src/ctrl_charge.rs b/daemon/src/ctrl_charge.rs index 31050109..aacd4a98 100644 --- a/daemon/src/ctrl_charge.rs +++ b/daemon/src/ctrl_charge.rs @@ -3,7 +3,7 @@ use crate::{config::Config, error::RogError, GetSupported}; use async_trait::async_trait; use log::{info, warn}; use logind_zbus::manager::ManagerProxy; -use rog_supported::ChargeSupportedFunctions; +use rog_platform::supported::ChargeSupportedFunctions; use smol::stream::StreamExt; use smol::Executor; use std::fs::OpenOptions; diff --git a/daemon/src/ctrl_profiles/controller.rs b/daemon/src/ctrl_profiles/controller.rs index 98df7308..47864b58 100644 --- a/daemon/src/ctrl_profiles/controller.rs +++ b/daemon/src/ctrl_profiles/controller.rs @@ -4,9 +4,9 @@ use crate::error::RogError; use crate::{CtrlTask, GetSupported}; use async_trait::async_trait; use log::{info, warn}; +use rog_platform::supported::PlatformProfileFunctions; use rog_profiles::error::ProfileError; use rog_profiles::{FanCurveProfiles, Profile}; -use rog_supported::PlatformProfileFunctions; use smol::Executor; use super::config::ProfileConfig; diff --git a/daemon/src/ctrl_rog_bios.rs b/daemon/src/ctrl_rog_bios.rs index 104ece3f..99de8d6e 100644 --- a/daemon/src/ctrl_rog_bios.rs +++ b/daemon/src/ctrl_rog_bios.rs @@ -2,7 +2,7 @@ use crate::{config::Config, error::RogError, GetSupported}; use async_trait::async_trait; use log::{error, info, warn}; use rog_platform::platform::AsusPlatform; -use rog_supported::RogBiosSupportedFunctions; +use rog_platform::supported::RogBiosSupportedFunctions; use std::fs::OpenOptions; use std::io::BufRead; use std::io::{Read, Write}; diff --git a/daemon/src/ctrl_supported.rs b/daemon/src/ctrl_supported.rs index a956b30c..c18ab30d 100644 --- a/daemon/src/ctrl_supported.rs +++ b/daemon/src/ctrl_supported.rs @@ -9,10 +9,7 @@ use crate::{ ctrl_profiles::controller::CtrlPlatformProfile, ctrl_rog_bios::CtrlRogBios, GetSupported, }; -use rog_supported::{ - AnimeSupportedFunctions, ChargeSupportedFunctions, LedSupportedFunctions, - PlatformProfileFunctions, RogBiosSupportedFunctions, -}; +use rog_platform::supported::*; #[derive(Serialize, Deserialize, Type)] pub struct SupportedFunctions { diff --git a/daemon/src/daemon.rs b/daemon/src/daemon.rs index 77c2ce3a..c84b1ba2 100644 --- a/daemon/src/daemon.rs +++ b/daemon/src/daemon.rs @@ -59,7 +59,7 @@ pub fn main() -> Result<(), Box> { info!(" rog-aura v{}", rog_aura::VERSION); info!(" rog-dbus v{}", rog_dbus::VERSION); info!(" rog-profiles v{}", rog_profiles::VERSION); - info!("rog-supported v{}", rog_supported::VERSION); + info!("rog-platform v{}", rog_platform::VERSION); let mut executor = Executor::new(); diff --git a/rog-control-center/Cargo.toml b/rog-control-center/Cargo.toml index edfe47f0..29c9e479 100644 --- a/rog-control-center/Cargo.toml +++ b/rog-control-center/Cargo.toml @@ -15,7 +15,7 @@ eframe= { git = "https://github.com/emilk/egui" } rog_dbus = { path = "../rog-dbus" } rog_aura = { path = "../rog-aura" } rog_profiles = { path = "../rog-profiles" } -rog_supported = { path = "../rog-supported" } +rog_platform = { path = "../rog-platform" } # supergfxctl = { git = "https://gitlab.com/asus-linux/supergfxctl.git" } smol = "^1.2" diff --git a/rog-control-center/src/app.rs b/rog-control-center/src/app.rs index 7c35997f..847364fe 100644 --- a/rog-control-center/src/app.rs +++ b/rog-control-center/src/app.rs @@ -8,7 +8,7 @@ use std::{ }; use egui::{Button, RichText}; -use rog_supported::SupportedFunctions; +use rog_platform::supported::SupportedFunctions; use crate::{ config::Config, error::Result, page_states::PageDataStates, Page, RogDbusClientBlocking, diff --git a/rog-control-center/src/page_states.rs b/rog-control-center/src/page_states.rs index a94249d7..a3ef98c1 100644 --- a/rog-control-center/src/page_states.rs +++ b/rog-control-center/src/page_states.rs @@ -8,8 +8,8 @@ use std::{ use egui::Vec2; use rog_aura::{layouts::KeyLayout, usb::AuraPowerDev, AuraEffect, AuraModeNum}; +use rog_platform::supported::SupportedFunctions; use rog_profiles::{fan_curve_set::FanCurveSet, FanCurvePU, Profile}; -use rog_supported::SupportedFunctions; use crate::{error::Result, RogDbusClientBlocking}; diff --git a/rog-control-center/src/pages/fan_curve_page.rs b/rog-control-center/src/pages/fan_curve_page.rs index b14ec90b..3c50e8f2 100644 --- a/rog-control-center/src/pages/fan_curve_page.rs +++ b/rog-control-center/src/pages/fan_curve_page.rs @@ -4,8 +4,8 @@ use crate::{ RogApp, RogDbusClientBlocking, }; use egui::Ui; +use rog_platform::supported::SupportedFunctions; use rog_profiles::Profile; -use rog_supported::SupportedFunctions; impl<'a> RogApp<'a> { pub fn fan_curve_page(&mut self, ctx: &egui::Context) { diff --git a/rog-control-center/src/widgets/anime_power.rs b/rog-control-center/src/widgets/anime_power.rs index e3b03623..134f98a4 100644 --- a/rog-control-center/src/widgets/anime_power.rs +++ b/rog-control-center/src/widgets/anime_power.rs @@ -1,5 +1,5 @@ use egui::{RichText, Ui}; -use rog_supported::SupportedFunctions; +use rog_platform::supported::SupportedFunctions; use crate::{page_states::PageDataStates, RogDbusClientBlocking}; diff --git a/rog-control-center/src/widgets/aura_modes.rs b/rog-control-center/src/widgets/aura_modes.rs index e4f589fa..49243991 100644 --- a/rog-control-center/src/widgets/aura_modes.rs +++ b/rog-control-center/src/widgets/aura_modes.rs @@ -5,7 +5,7 @@ use std::sync::{ use egui::{RichText, Ui}; use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Speed}; -use rog_supported::SupportedFunctions; +use rog_platform::supported::SupportedFunctions; use crate::{ page_states::{AuraState, PageDataStates}, diff --git a/rog-control-center/src/widgets/aura_power.rs b/rog-control-center/src/widgets/aura_power.rs index 5e19ab5a..b830f6c2 100644 --- a/rog-control-center/src/widgets/aura_power.rs +++ b/rog-control-center/src/widgets/aura_power.rs @@ -3,7 +3,7 @@ use rog_aura::{ usb::{AuraDev1866, AuraDev19b6, AuraDevTuf, AuraDevice, AuraPowerDev}, AuraZone, }; -use rog_supported::SupportedFunctions; +use rog_platform::supported::SupportedFunctions; use crate::{page_states::PageDataStates, RogDbusClientBlocking}; diff --git a/rog-control-center/src/widgets/rog_bios.rs b/rog-control-center/src/widgets/rog_bios.rs index 614ceaaf..e7e06946 100644 --- a/rog-control-center/src/widgets/rog_bios.rs +++ b/rog-control-center/src/widgets/rog_bios.rs @@ -1,7 +1,7 @@ use crate::{page_states::PageDataStates, RogDbusClientBlocking}; use egui::Ui; +use rog_platform::supported::SupportedFunctions; use rog_profiles::Profile; -use rog_supported::SupportedFunctions; pub fn platform_profile(states: &mut PageDataStates, dbus: &RogDbusClientBlocking, ui: &mut Ui) { ui.heading("Platform profile"); diff --git a/rog-dbus/Cargo.toml b/rog-dbus/Cargo.toml index d3c6544f..40bddcd1 100644 --- a/rog-dbus/Cargo.toml +++ b/rog-dbus/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rog_anime = { path = "../rog-anime" } rog_aura = { path = "../rog-aura" } rog_profiles = { path = "../rog-profiles" } -rog_supported = { path = "../rog-supported" } +rog_platform = { path = "../rog-platform" } zbus = "^2.2" zbus_macros = "^2.0" zvariant = "^3.0" diff --git a/rog-dbus/src/zbus_supported.rs b/rog-dbus/src/zbus_supported.rs index 3426a493..15b2104a 100644 --- a/rog-dbus/src/zbus_supported.rs +++ b/rog-dbus/src/zbus_supported.rs @@ -19,7 +19,7 @@ //! //! …consequently `zbus-xmlgen` did not generate code for the above interfaces. -use rog_supported::SupportedFunctions; +use rog_platform::supported::SupportedFunctions; use zbus_macros::dbus_proxy; #[dbus_proxy( diff --git a/rog-platform/Cargo.toml b/rog-platform/Cargo.toml index dc858688..46d279a1 100644 --- a/rog-platform/Cargo.toml +++ b/rog-platform/Cargo.toml @@ -7,6 +7,13 @@ edition = "2021" [dependencies] log = "*" + +rog_aura = { path = "../rog-aura" } +serde = "^1.0" +serde_derive = "^1.0" +zvariant = "^3.0" +zvariant_derive = "^3.0" + udev = "^0.6" rusb = "^0.9" sysfs-class = "^0.1" \ No newline at end of file diff --git a/rog-platform/src/lib.rs b/rog-platform/src/lib.rs index ced25557..1024d830 100644 --- a/rog-platform/src/lib.rs +++ b/rog-platform/src/lib.rs @@ -2,6 +2,7 @@ pub mod error; pub mod hid_raw; pub mod keyboard_led; pub mod platform; +pub mod supported; pub mod usb_raw; use std::path::Path; @@ -9,6 +10,8 @@ use std::path::Path; use error::{PlatformError, Result}; use udev::Device; +pub static VERSION: &str = env!("CARGO_PKG_VERSION"); + #[macro_export] macro_rules! attr_bool { ($hasser:ident, $getter:ident, $setter:ident, $attr_name:literal) => { diff --git a/rog-supported/src/lib.rs b/rog-platform/src/supported.rs similarity index 98% rename from rog-supported/src/lib.rs rename to rog-platform/src/supported.rs index a2ed4cf1..b94af610 100644 --- a/rog-supported/src/lib.rs +++ b/rog-platform/src/supported.rs @@ -1,5 +1,3 @@ -pub static VERSION: &str = env!("CARGO_PKG_VERSION"); - use rog_aura::{usb::AuraDevice, AuraModeNum, AuraZone}; use serde_derive::{Deserialize, Serialize}; use std::fmt; diff --git a/rog-supported/Cargo.toml b/rog-supported/Cargo.toml deleted file mode 100644 index 8f24f34d..00000000 --- a/rog-supported/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "rog_supported" -version = "4.2.1" -license = "MPL-2.0" -readme = "README.md" -authors = ["Luke "] -repository = "https://gitlab.com/asus-linux/asus-nb-ctrl" -homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl" -description = "Helper to determine what is supported by asus laptops" -edition = "2018" - -[dependencies] -rog_aura = { path = "../rog-aura" } -serde = "^1.0" -serde_derive = "^1.0" -zvariant = "^3.0" -zvariant_derive = "^3.0" \ No newline at end of file