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

fix(ci): Resolve compilation errors in asusd and control-center

Browse Source
This commit is contained in:
mihai2mn
2026-01-24 17:47:27 +01:00
parent 23207ab8ae
commit 17bbd8aabb
5 changed files with 59 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.lock generated
View File

@@ -4502,7 +4502,10 @@ dependencies = [
"rog_dbus", "rog_dbus",
"rog_platform", "rog_platform",
"rog_profiles", "rog_profiles",
"rog_slash",
"ron",
"serde", "serde",
"serde_json",
"slint", "slint",
"slint-build", "slint-build",
"supergfxctl", "supergfxctl",

1
asusd/Cargo.toml
View File

@@ -40,6 +40,7 @@ logind-zbus.workspace = true
# serialisation # serialisation
serde.workspace = true serde.workspace = true
serde_json = "1.0"
concat-idents.workspace = true concat-idents.workspace = true

2
rog-control-center/Cargo.toml
View File

@@ -37,7 +37,7 @@ gumdrop.workspace = true
log.workspace = true log.workspace = true
env_logger.workspace = true env_logger.workspace = true
tokio.workspace = true tokio = { workspace = true, features = ["fs"] }
serde.workspace = true serde.workspace = true
zbus.workspace = true zbus.workspace = true
ron.workspace = true ron.workspace = true

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

@@ -86,13 +86,18 @@ export component PageAura inherits Rectangle {
vertical-alignment: TextVerticalAlignment.center; vertical-alignment: TextVerticalAlignment.center;
horizontal-alignment: TextHorizontalAlignment.center; horizontal-alignment: TextHorizontalAlignment.center;
} }
HorizontalBox { HorizontalBox {
c1 := ColourSlider { c1 := ColourSlider {
enabled: AuraPageData.colour1_enabled; enabled: AuraPageData.colour1_enabled;
final_colour <=> AuraPageData.color1; final_colour <=> AuraPageData.color1;
colourbox <=> AuraPageData.colorbox1; colourbox <=> AuraPageData.colorbox1;
set_hex_from_colour(c) => { return AuraPageData.cb_hex_from_colour(c); } set_hex_from_colour(c) => {
hex_to_colour(s) => { return AuraPageData.cb_hex_to_colour(s); } return AuraPageData.cb_hex_from_colour(c);
}
hex_to_colour(s) => {
return AuraPageData.cb_hex_to_colour(s);
}
released => { released => {
AuraPageData.apply_effect({ AuraPageData.apply_effect({
mode: AuraPageData.led_mode_data.mode, mode: AuraPageData.led_mode_data.mode,
@@ -106,15 +111,25 @@ export component PageAura inherits Rectangle {
} }
} }
} }
VerticalBox { VerticalBox {
Text { text: @tr("Colour 2"); vertical-alignment: TextVerticalAlignment.center; horizontal-alignment: TextHorizontalAlignment.center; } Text {
text: @tr("Colour 2");
vertical-alignment: TextVerticalAlignment.center;
horizontal-alignment: TextHorizontalAlignment.center;
}
HorizontalBox { HorizontalBox {
c2 := ColourSlider { c2 := ColourSlider {
enabled: AuraPageData.colour2_enabled; enabled: AuraPageData.colour2_enabled;
final_colour <=> AuraPageData.color2; final_colour <=> AuraPageData.color2;
colourbox <=> AuraPageData.colorbox2; colourbox <=> AuraPageData.colorbox2;
set_hex_from_colour(c) => { return AuraPageData.cb_hex_from_colour(c); } set_hex_from_colour(c) => {
hex_to_colour(s) => { return AuraPageData.cb_hex_to_colour(s); } return AuraPageData.cb_hex_from_colour(c);
}
hex_to_colour(s) => {
return AuraPageData.cb_hex_to_colour(s);
}
released => { released => {
AuraPageData.apply_effect({ AuraPageData.apply_effect({
mode: AuraPageData.led_mode_data.mode, mode: AuraPageData.led_mode_data.mode,
@@ -137,7 +152,12 @@ export component PageAura inherits Rectangle {
max-height: 90px; max-height: 90px;
RogItem { RogItem {
VerticalBox { VerticalBox {
Text { text: @tr("Zone"); vertical-alignment: TextVerticalAlignment.center; horizontal-alignment: TextHorizontalAlignment.center; } Text {
text: @tr("Zone");
vertical-alignment: TextVerticalAlignment.center;
horizontal-alignment: TextHorizontalAlignment.center;
}
ComboBox { ComboBox {
enabled: false; enabled: false;
current_index <=> AuraPageData.zone; current_index <=> AuraPageData.zone;
@@ -156,9 +176,15 @@ export component PageAura inherits Rectangle {
} }
} }
} }
RogItem { RogItem {
VerticalBox { VerticalBox {
Text { text: @tr("Direction"); vertical-alignment: TextVerticalAlignment.center; horizontal-alignment: TextHorizontalAlignment.center; } Text {
text: @tr("Direction");
vertical-alignment: TextVerticalAlignment.center;
horizontal-alignment: TextHorizontalAlignment.center;
}
ComboBox { ComboBox {
enabled: AuraPageData.direction_enabled; enabled: AuraPageData.direction_enabled;
current_index <=> AuraPageData.direction; current_index <=> AuraPageData.direction;
@@ -177,9 +203,15 @@ export component PageAura inherits Rectangle {
} }
} }
} }
RogItem { RogItem {
VerticalBox { VerticalBox {
Text { text: @tr("Speed"); vertical-alignment: TextVerticalAlignment.center; horizontal-alignment: TextHorizontalAlignment.center; } Text {
text: @tr("Speed");
vertical-alignment: TextVerticalAlignment.center;
horizontal-alignment: TextHorizontalAlignment.center;
}
ComboBox { ComboBox {
enabled: AuraPageData.speed_enabled; enabled: AuraPageData.speed_enabled;
current_index <=> AuraPageData.speed; current_index <=> AuraPageData.speed;
@@ -260,7 +292,7 @@ export component PageAura inherits Rectangle {
} }
if root.show_aura_power && AuraPageData.device_type == AuraDevType.New: Rectangle { if root.show_aura_power && AuraPageData.device_type == AuraDevType.New: Rectangle {
background: Palette.background; background: RogPalette.background;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 1; opacity: 1;
@@ -311,7 +343,7 @@ export component PageAura inherits Rectangle {
} }
if root.show_aura_power && AuraPageData.device_type == AuraDevType.Old: Rectangle { if root.show_aura_power && AuraPageData.device_type == AuraDevType.Old: Rectangle {
background: Palette.background; background: RogPalette.background;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 1; opacity: 1;

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

@@ -96,7 +96,11 @@ export global AuraPageData {
@tr("Basic aura mode" => "Comet"), @tr("Basic aura mode" => "Comet"),
@tr("Basic aura mode" => "Flash"), @tr("Basic aura mode" => "Flash"),
]; ];
in-out property <[string]> available_mode_names: [ @tr("Basic aura mode" => "Static"), @tr("Basic aura mode" => "Breathe"), @tr("Basic aura mode" => "Strobe") ]; in-out property <[string]> available_mode_names: [
@tr("Basic aura mode" => "Static"),
@tr("Basic aura mode" => "Breathe"),
@tr("Basic aura mode" => "Strobe")
];
in-out property <int> current_available_mode: 0; 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]> supported_basic_modes: [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12];
in-out property <[string]> zone_names: [ in-out property <[string]> zone_names: [
@@ -129,6 +133,8 @@ export global AuraPageData {
speed: 0, speed: 0,
direction: 0, direction: 0,
}; };
in-out property <int> led_mode;
callback cb_led_mode(int);
in-out property <color> color1; in-out property <color> color1;
in-out property <brush> colorbox1; in-out property <brush> colorbox1;
in-out property <color> color2; in-out property <color> color2;
@@ -139,9 +145,12 @@ export global AuraPageData {
out property <bool> speed_enabled: led_mode_data.mode == 1 || led_mode_data.mode == 2 || led_mode_data.mode == 3 || led_mode_data.mode == 4 || led_mode_data.mode == 5 || led_mode_data.mode == 6 || led_mode_data.mode == 7 || led_mode_data.mode == 8; out property <bool> speed_enabled: led_mode_data.mode == 1 || led_mode_data.mode == 2 || led_mode_data.mode == 3 || led_mode_data.mode == 4 || led_mode_data.mode == 5 || led_mode_data.mode == 6 || led_mode_data.mode == 7 || led_mode_data.mode == 8;
out property <bool> direction_enabled: led_mode_data.mode == 3; out property <bool> direction_enabled: led_mode_data.mode == 3;
callback apply_led_mode_data(); callback cb_led_mode_data(AuraEffect);
callback apply_effect(AuraEffect); callback apply_effect(AuraEffect);
apply_effect(e) => { led_mode_data = e; apply_led_mode_data(); } apply_effect(e) => {
led_mode_data = e;
cb_led_mode_data(e);
}
in-out property <int> zone; in-out property <int> zone;
in-out property <int> speed; in-out property <int> speed;
in-out property <int> direction; in-out property <int> direction;