Merge rog-supported in to rog-platform

This commit is contained in:
Luke D. Jones
2022-08-12 17:45:29 +12:00
parent b20bde8116
commit d35707f2e4
29 changed files with 44 additions and 70 deletions

View File

@@ -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"

View File

@@ -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,

View File

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

View File

@@ -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) {

View File

@@ -1,5 +1,5 @@
use egui::{RichText, Ui};
use rog_supported::SupportedFunctions;
use rog_platform::supported::SupportedFunctions;
use crate::{page_states::PageDataStates, RogDbusClientBlocking};

View File

@@ -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},

View File

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

View File

@@ -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");