gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

ROGCC: splatter log messages everywhere. Rename state control

Browse Source
This commit is contained in:
Luke D. Jones
2022-11-16 20:32:00 +13:00
parent 73b1a7050a
commit ad79adcbfa
20 changed files with 250 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rog-control-center/src/widgets/anime_power.rs
View File

@@ -1,13 +1,9 @@
use egui::{RichText, Ui};
use rog_platform::supported::SupportedFunctions;
use crate::page_states::PageDataStates;
use crate::system_state::SystemState;
pub fn anime_power_group(
_supported: &SupportedFunctions,
states: &mut PageDataStates,
ui: &mut Ui,
) {
pub fn anime_power_group(_supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
ui.heading("AniMe Matrix Settings");
ui.label("Options are incomplete. Awake + Boot should work");

4
rog-control-center/src/widgets/app_settings.rs
View File

@@ -1,8 +1,8 @@
use egui::Ui;
use crate::{config::Config, page_states::PageDataStates};
use crate::{config::Config, system_state::SystemState};
pub fn app_settings(config: &mut Config, states: &mut PageDataStates, ui: &mut Ui) {
pub fn app_settings(config: &mut Config, states: &mut SystemState, ui: &mut Ui) {
ui.heading("ROG GUI Settings");
// ui.label("Options are incomplete. Awake + Boot should work");

4
rog-control-center/src/widgets/aura_modes.rs
View File

@@ -7,11 +7,11 @@ use egui::{RichText, Ui};
use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Colour, Speed};
use rog_platform::supported::SupportedFunctions;
use crate::page_states::{AuraState, PageDataStates};
use crate::system_state::{AuraState, SystemState};
pub fn aura_modes_group(
supported: &SupportedFunctions,
states: &mut PageDataStates,
states: &mut SystemState,
freq: &mut Arc<AtomicU8>,
ui: &mut Ui,
) {

8
rog-control-center/src/widgets/aura_power.rs
View File

@@ -5,9 +5,9 @@ use rog_aura::{
};
use rog_platform::supported::SupportedFunctions;
use crate::page_states::PageDataStates;
use crate::system_state::SystemState;
pub fn aura_power_group(supported: &SupportedFunctions, states: &mut PageDataStates, ui: &mut Ui) {
pub fn aura_power_group(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
ui.heading("LED settings");
match supported.keyboard_led.prod_id {
@@ -20,7 +20,7 @@ pub fn aura_power_group(supported: &SupportedFunctions, states: &mut PageDataSta
}
}
fn aura_power1(supported: &SupportedFunctions, states: &mut PageDataStates, ui: &mut Ui) {
fn aura_power1(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
let enabled_states = &mut states.aura.enabled;
let mut boot = enabled_states.x1866.contains(&AuraDev1866::Boot);
let mut sleep = enabled_states.x1866.contains(&AuraDev1866::Sleep);
@@ -201,7 +201,7 @@ fn aura_power1(supported: &SupportedFunctions, states: &mut PageDataStates, ui:
}
}
fn aura_power2(supported: &SupportedFunctions, states: &mut PageDataStates, ui: &mut Ui) {
fn aura_power2(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
let enabled_states = &mut states.aura.enabled;
let has_logo = supported
.keyboard_led

2
rog-control-center/src/widgets/fan_graph.rs
View File

@@ -3,7 +3,7 @@ use rog_platform::supported::SupportedFunctions;
use rog_profiles::{FanCurvePU, Profile};
use crate::{
page_states::{FanCurvesState, ProfilesState},
system_state::{FanCurvesState, ProfilesState},
RogDbusClientBlocking,
};

2
rog-control-center/src/widgets/keyboard_layout.rs
View File

@@ -1,7 +1,7 @@
use egui::{Align, Color32, Vec2};
use rog_aura::{keys::KeyShape, layouts::KeyLayout, AuraModeNum};
use crate::page_states::AuraState;
use crate::system_state::AuraState;
pub fn keyboard(
ui: &mut egui::Ui,

6
rog-control-center/src/widgets/rog_bios.rs
View File

@@ -1,9 +1,9 @@
use crate::page_states::PageDataStates;
use crate::system_state::SystemState;
use egui::Ui;
use rog_platform::{platform::GpuMode, supported::SupportedFunctions};
use rog_profiles::Profile;
pub fn platform_profile(states: &mut PageDataStates, ui: &mut Ui) {
pub fn platform_profile(states: &mut SystemState, ui: &mut Ui) {
ui.heading("Platform profile");
let mut changed = false;
@@ -35,7 +35,7 @@ pub fn platform_profile(states: &mut PageDataStates, ui: &mut Ui) {
};
}
pub fn rog_bios_group(supported: &SupportedFunctions, states: &mut PageDataStates, ui: &mut Ui) {
pub fn rog_bios_group(supported: &SupportedFunctions, states: &mut SystemState, ui: &mut Ui) {
ui.heading("Bios options");
let slider = egui::Slider::new(&mut states.power_state.charge_limit, 20..=100)