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

Cleanup unsafe sysfs interfaces. Bugfixes for UI

Browse Source
This commit is contained in:
Luke D. Jones
2025-01-16 23:56:12 +13:00
parent 7a1b45071d
commit 2b22f82b72
22 changed files with 379 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rog-control-center/ui/pages/about.slint
View File

@@ -17,7 +17,7 @@ export component PageAbout inherits VerticalLayout {
Text {
wrap: TextWrap.word-wrap;
text: "You will require these patches: https://lore.kernel.org/platform-driver-x86/20240404001652.86207-1-luke@ljones.dev/, they have been merged upstream for kernel 6.10. The main thing is that the PPT settings will apply without them, but the read/back will fail";
text: "You will require a kernel built with my work from here: https://github.com/flukejones/linux";
}
Text {
@@ -28,19 +28,7 @@ export component PageAbout inherits VerticalLayout {
}
Text {
text: "- [x] Theme the widgets";
}
Text {
text: "- [x] Add a fullscreen mode (cli arg)";
}
Text {
text: "- [x] Disable aura items depending if mode supports or not";
}
Text {
text: "- [x] Add fan curve graph controls";
text: "- [ ] Theme the widgets";
}
Text {
@@ -48,11 +36,15 @@ export component PageAbout inherits VerticalLayout {
}
Text {
text: "- [ ] Supergfx control";
text: "- [ ] Include fan speeds, temps in a bottom bar";
}
Text {
text: "- [ ] Include fan speeds, temps in a bottom bar";
text: "- [ ] Slash control";
}
Text {
text: "- [ ] Supergfx control";
}
Text {

34
rog-control-center/ui/pages/anime.slint
View File

@@ -9,17 +9,17 @@ export global AnimePageData {
@tr("Anime Brightness" => "High"),
];
in-out property <int> brightness;
callback set_brightness(int);
callback cb_brightness(int);
in-out property <bool> builtins_enabled;
callback set_builtins_enabled(bool);
callback cb_builtins_enabled(bool);
in-out property <bool> enable_display;
callback set_enable_display(bool);
callback cb_enable_display(bool);
in-out property <bool> off_when_lid_closed;
callback set_off_when_lid_closed(bool);
callback cb_off_when_lid_closed(bool);
in-out property <bool> off_when_suspended;
callback set_off_when_suspended(bool);
callback cb_off_when_suspended(bool);
in-out property <bool> off_when_unplugged;
callback set_off_when_unplugged(bool);
callback cb_off_when_unplugged(bool);
in-out property <[string]> boot_anim_choices: [@tr("Glitch Construction"), @tr("Static Emergence")];
in property <int> boot_anim: 0;
in-out property <[string]> awake_anim_choices: [@tr("Binary Banner Scroll"), @tr("Rog Logo Glitch")];
@@ -28,7 +28,7 @@ export global AnimePageData {
in property <int> sleep_anim: 0;
in-out property <[string]> shutdown_anim_choices: [@tr("Glitch Out"), @tr("See Ya")];
in property <int> shutdown_anim: 0;
callback set_builtin_animations(int, int, int, int);
callback cb_builtin_animations(int, int, int, int);
}
export component PageAnime inherits Rectangle {
@@ -53,7 +53,7 @@ export component PageAnime inherits Rectangle {
model <=> AnimePageData.brightness_names;
selected => {
self.current_value = AnimePageData.brightness_names[AnimePageData.brightness];
AnimePageData.set_brightness(AnimePageData.brightness)
AnimePageData.cb_brightness(AnimePageData.brightness)
}
}
}
@@ -66,7 +66,7 @@ export component PageAnime inherits Rectangle {
text: @tr("Enable display");
checked <=> AnimePageData.enable_display;
toggled => {
AnimePageData.set_enable_display(AnimePageData.enable_display)
AnimePageData.cb_enable_display(AnimePageData.enable_display)
}
}
@@ -89,7 +89,7 @@ export component PageAnime inherits Rectangle {
text: @tr("Use built-in animations");
checked <=> AnimePageData.builtins_enabled;
toggled => {
AnimePageData.set_builtins_enabled(AnimePageData.builtins_enabled)
AnimePageData.cb_builtins_enabled(AnimePageData.builtins_enabled)
}
}
@@ -152,7 +152,7 @@ export component PageAnime inherits Rectangle {
current_value: AnimePageData.boot_anim_choices[AnimePageData.boot_anim];
model <=> AnimePageData.boot_anim_choices;
selected => {
AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
}
}
@@ -162,7 +162,7 @@ export component PageAnime inherits Rectangle {
current_value: AnimePageData.awake_anim_choices[AnimePageData.awake_anim];
model <=> AnimePageData.awake_anim_choices;
selected => {
AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
}
}
@@ -172,7 +172,7 @@ export component PageAnime inherits Rectangle {
current_value: AnimePageData.sleep_anim_choices[AnimePageData.sleep_anim];
model <=> AnimePageData.sleep_anim_choices;
selected => {
AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
}
}
@@ -182,7 +182,7 @@ export component PageAnime inherits Rectangle {
current_value: AnimePageData.shutdown_anim_choices[AnimePageData.shutdown_anim];
model <=> AnimePageData.shutdown_anim_choices;
selected => {
AnimePageData.set_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
AnimePageData.cb_builtin_animations(AnimePageData.boot_anim, AnimePageData.awake_anim, AnimePageData.sleep_anim, AnimePageData.shutdown_anim)
}
}
}
@@ -225,7 +225,7 @@ export component PageAnime inherits Rectangle {
text: @tr("Off when lid closed");
checked <=> AnimePageData.off_when_lid_closed;
toggled => {
AnimePageData.set_off_when_lid_closed(AnimePageData.off_when_lid_closed)
AnimePageData.cb_off_when_lid_closed(AnimePageData.off_when_lid_closed)
}
}
@@ -234,7 +234,7 @@ export component PageAnime inherits Rectangle {
text: @tr("Off when suspended");
checked <=> AnimePageData.off_when_suspended;
toggled => {
AnimePageData.set_off_when_suspended(AnimePageData.off_when_suspended)
AnimePageData.cb_off_when_suspended(AnimePageData.off_when_suspended)
}
}
@@ -243,7 +243,7 @@ export component PageAnime inherits Rectangle {
text: @tr("Off when on battery");
checked <=> AnimePageData.off_when_unplugged;
toggled => {
AnimePageData.set_off_when_unplugged(AnimePageData.off_when_unplugged)
AnimePageData.cb_off_when_unplugged(AnimePageData.off_when_unplugged)
}
}
}

38
rog-control-center/ui/pages/aura.slint
View File

@@ -30,7 +30,7 @@ export component PageAura inherits Rectangle {
current_value: AuraPageData.brightness_names[self.current-index];
model <=> AuraPageData.brightness_names;
selected => {
AuraPageData.set_brightness(AuraPageData.brightness)
AuraPageData.cb_brightness(AuraPageData.brightness)
}
}
@@ -44,7 +44,7 @@ export component PageAura inherits Rectangle {
AuraPageData.led_mode_data.mode = AuraPageData.led_mode;
AuraPageData.led_mode_data.mode = AuraPageData.current_available_mode;
self.current_value = AuraPageData.available_mode_names[self.current-index];
AuraPageData.set_led_mode(AuraPageData.current_available_mode);
AuraPageData.cb_led_mode(AuraPageData.current_available_mode);
}
}
}
@@ -67,14 +67,14 @@ export component PageAura inherits Rectangle {
final_colour <=> AuraPageData.color1;
colourbox <=> AuraPageData.colorbox1;
set_hex_from_colour(c1) => {
return AuraPageData.set_hex_from_colour(c1);
return AuraPageData.cb_hex_from_colour(c1);
}
hex_to_colour(s) => {
return AuraPageData.set_hex_to_colour(s);
return AuraPageData.cb_hex_to_colour(s);
}
released => {
AuraPageData.led_mode_data.colour1 = AuraPageData.color1;
AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
}
}
}
@@ -93,14 +93,14 @@ export component PageAura inherits Rectangle {
final_colour <=> AuraPageData.color2;
colourbox <=> AuraPageData.colorbox2;
set_hex_from_colour(c1) => {
return AuraPageData.set_hex_from_colour(c1);
return AuraPageData.cb_hex_from_colour(c1);
}
hex_to_colour(s) => {
return AuraPageData.set_hex_to_colour(s);
return AuraPageData.cb_hex_to_colour(s);
}
released => {
AuraPageData.led_mode_data.colour2 = AuraPageData.color2;
AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
}
}
}
@@ -129,7 +129,7 @@ export component PageAura inherits Rectangle {
model <=> AuraPageData.zone_names;
selected => {
AuraPageData.led_mode_data.zone = self.current-index;
AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
}
}
}
@@ -151,7 +151,7 @@ export component PageAura inherits Rectangle {
model <=> AuraPageData.direction_names;
selected => {
AuraPageData.led_mode_data.direction = self.current-index;
AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
}
}
}
@@ -173,7 +173,7 @@ export component PageAura inherits Rectangle {
model <=> AuraPageData.speed_names;
selected => {
AuraPageData.led_mode_data.speed = self.current-index;
AuraPageData.set_led_mode_data(AuraPageData.led_mode_data);
AuraPageData.cb_led_mode_data(AuraPageData.led_mode_data);
}
}
}
@@ -218,22 +218,22 @@ export component PageAura inherits Rectangle {
boot_checked: state.boot;
boot_toggled => {
AuraPageData.led_power.states[idx].boot = zone.boot_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
awake_checked: state.awake;
awake_toggled => {
AuraPageData.led_power.states[idx].awake = zone.awake_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
sleep_checked: state.sleep;
sleep_toggled => {
AuraPageData.led_power.states[idx].sleep = zone.sleep_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
shutdown_checked: state.shutdown;
shutdown_toggled => {
AuraPageData.led_power.states[idx].shutdown = zone.shutdown_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
}
}
@@ -271,22 +271,22 @@ export component PageAura inherits Rectangle {
zone_strings <=> AuraPageData.power_zone_names_old;
selected_zone => {
AuraPageData.led_power.states[idx].zone = AuraPageData.supported_power_zones[old_zone.current_zone];
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
boot_checked: state.boot;
boot_toggled => {
AuraPageData.led_power.states[idx].boot = old_zone.boot_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
awake_checked: state.awake;
awake_toggled => {
AuraPageData.led_power.states[idx].awake = old_zone.awake_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
sleep_checked: state.sleep;
sleep_toggled => {
AuraPageData.led_power.states[idx].sleep = old_zone.sleep_checked;
AuraPageData.set_led_power(AuraPageData.led_power);
AuraPageData.cb_led_power(AuraPageData.led_power);
}
}
}

12
rog-control-center/ui/pages/system.slint
View File

@@ -219,6 +219,14 @@ export component PageSystem inherits Rectangle {
}
}
if SystemPageData.ppt_pl1_spl.val != -1: Rectangle {
height: 32px;
Text {
font-size: 16px;
text: @tr("ppt_warning" => "The following settings may not be safe, please take care.");
}
}
if SystemPageData.ppt_pl1_spl.val != -1: SystemSlider {
text: @tr("ppt_pl1_spl" => "PL1, sustained power limit");
minimum: SystemPageData.ppt_pl1_spl.min;
@@ -247,8 +255,8 @@ export component PageSystem inherits Rectangle {
maximum: SystemPageData.ppt_pl3_fppt.max;
value: SystemPageData.ppt_pl3_fppt.val;
released => {
SystemPageData.ppt_fppt.val = self.value;
SystemPageData.cb_ppt_fppt(Math.round(self.value))
SystemPageData.ppt_pl3_fppt.val = self.value;
SystemPageData.cb_ppt_pl3_fppt(Math.round(self.value))
}
}
if SystemPageData.ppt_fppt.val != -1: SystemSlider {

12
rog-control-center/ui/types/aura_types.slint
View File

@@ -71,7 +71,7 @@ export global AuraPageData {
@tr("Aura brightness" => "High"),
];
in-out property <int> brightness;
callback set_brightness(int);
callback cb_brightness(int);
in-out property <[string]> mode_names: [
@tr("Basic aura mode" => "Static"),
@tr("Basic aura mode" => "Breathe"),
@@ -95,7 +95,7 @@ export global AuraPageData {
in-out property <int> current_available_mode: 0;
in-out property <[int]> supported_basic_modes: [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12];
in-out property <int> led_mode;
callback set_led_mode(int);
callback cb_led_mode(int);
in-out property <[string]> zone_names: [
@tr("Aura zone" => "None"),
@tr("Aura zone" => "Key1"),
@@ -130,7 +130,7 @@ export global AuraPageData {
speed: 0,
direction: 0,
};
callback set_led_mode_data(AuraEffect);
callback cb_led_mode_data(AuraEffect);
in-out property <color> color1;
in-out property <brush> colorbox1;
in-out property <color> color2;
@@ -147,8 +147,8 @@ export global AuraPageData {
colorbox1 = data.colour1;
colorbox2 = data.colour2;
}
callback set_hex_from_colour(color) -> string;
callback set_hex_to_colour(string) -> color;
callback cb_hex_from_colour(color) -> string;
callback cb_hex_to_colour(string) -> color;
in-out property <AuraDevType> device_type: AuraDevType.Old;
// List of indexes to power_zone_names. Must correspond to rog-aura crate
in-out property <[PowerZones]> supported_power_zones: [
@@ -165,5 +165,5 @@ export global AuraPageData {
shutdown: true,
}]
};
callback set_led_power(LaptopAuraPower);
callback cb_led_power(LaptopAuraPower);
}