Merge rog-supported in to rog-platform

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::{

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;

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;

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;

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};

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 {

daemon/src/daemon.rs

@@ -59,7 +59,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     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();