mirror of
https://gitlab.com/asus-linux/asusctl.git
synced 2026-02-06 00:15:04 +01:00
Fix the broken pipe error
This commit is contained in:
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Re-implement the `asusctl -s` command (not fully)
|
- Re-implement the `asusctl -s` command (not fully)
|
||||||
- Add more docs to some parts of code, and dbus interfaces
|
- Add more docs to some parts of code, and dbus interfaces
|
||||||
- Reload asusd.ron if changed. Does not notify any dbus listeners (yet)
|
- Reload asusd.ron if changed. Does not notify any dbus listeners (yet)
|
||||||
|
- Fix the broken pipe error
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Support for G614J LED modes
|
||||||
|
|
||||||
## [v5.0.7]
|
## [v5.0.7]
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
26
Cargo.lock
generated
26
Cargo.lock
generated
@@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "asusctl"
|
name = "asusctl"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asusd",
|
"asusd",
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
@@ -219,7 +219,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "asusd"
|
name = "asusd"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"concat-idents",
|
"concat-idents",
|
||||||
@@ -244,7 +244,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "asusd-user"
|
name = "asusd-user"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"config-traits",
|
"config-traits",
|
||||||
@@ -847,7 +847,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "config-traits"
|
name = "config-traits"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"log",
|
"log",
|
||||||
@@ -900,7 +900,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cpuctl"
|
name = "cpuctl"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cpufeatures"
|
name = "cpufeatures"
|
||||||
@@ -1024,7 +1024,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dmi_id"
|
name = "dmi_id"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"udev",
|
"udev",
|
||||||
@@ -2834,7 +2834,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog-control-center"
|
name = "rog-control-center"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asusd",
|
"asusd",
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
@@ -2867,7 +2867,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_anime"
|
name = "rog_anime"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"dmi_id",
|
"dmi_id",
|
||||||
@@ -2884,7 +2884,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_aura"
|
name = "rog_aura"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"dmi_id",
|
"dmi_id",
|
||||||
@@ -2898,7 +2898,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_dbus"
|
name = "rog_dbus"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"asusd",
|
"asusd",
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
@@ -2911,7 +2911,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_platform"
|
name = "rog_platform"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"concat-idents",
|
"concat-idents",
|
||||||
@@ -2928,7 +2928,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_profiles"
|
name = "rog_profiles"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cargo-husky",
|
"cargo-husky",
|
||||||
"log",
|
"log",
|
||||||
@@ -2942,7 +2942,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rog_simulators"
|
name = "rog_simulators"
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"glam",
|
"glam",
|
||||||
"log",
|
"log",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ default-members = ["asusctl", "asusd", "asusd-user", "cpuctl", "rog-control-cent
|
|||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "5.0.8-RC2"
|
version = "5.0.8-RC3"
|
||||||
rust-version = "1.75"
|
rust-version = "1.75"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
|||||||
@@ -239,6 +239,14 @@
|
|||||||
advanced_type: PerKey,
|
advanced_type: PerKey,
|
||||||
power_zones: [Keyboard],
|
power_zones: [Keyboard],
|
||||||
),
|
),
|
||||||
|
(
|
||||||
|
board_name: "G614J",
|
||||||
|
layout_name: "g634j-per-key",
|
||||||
|
basic_modes: [Static, Breathe, Pulse, Strobe, Rainbow],
|
||||||
|
basic_zones: [],
|
||||||
|
advanced_type: None,
|
||||||
|
power_zones: [Keyboard, Lightbar],
|
||||||
|
),
|
||||||
(
|
(
|
||||||
board_name: "G634J",
|
board_name: "G634J",
|
||||||
layout_name: "g634j-per-key",
|
layout_name: "g634j-per-key",
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ use rog_control_center::{
|
|||||||
get_ipc_file, on_tmp_dir_exists, print_versions, RogApp, RogDbusClientBlocking, SHOWING_GUI,
|
get_ipc_file, on_tmp_dir_exists, print_versions, RogApp, RogDbusClientBlocking, SHOWING_GUI,
|
||||||
SHOW_GUI,
|
SHOW_GUI,
|
||||||
};
|
};
|
||||||
|
#[cfg(not(feature = "mocking"))]
|
||||||
|
use supergfxctl::zbus_proxy::DaemonProxyBlocking as GfxProxyBlocking;
|
||||||
use tokio::runtime::Runtime;
|
use tokio::runtime::Runtime;
|
||||||
|
|
||||||
#[cfg(not(feature = "mocking"))]
|
#[cfg(not(feature = "mocking"))]
|
||||||
@@ -197,6 +199,16 @@ fn main() -> Result<()> {
|
|||||||
init_tray(supported_properties, states.clone());
|
init_tray(supported_properties, states.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Ok(mut states) = states.lock() {
|
||||||
|
// For some reason the gui is causing a broke pipe error on dbus send, so
|
||||||
|
// replace it.
|
||||||
|
let (asus_dbus, conn) =
|
||||||
|
rog_dbus::RogDbusClientBlocking::new().expect("Couldn't connect to asusd");
|
||||||
|
states.asus_dbus = asus_dbus;
|
||||||
|
let gfx_dbus = GfxProxyBlocking::new(&conn).expect("Couldn't connect to supergfxd");
|
||||||
|
states.gfx_dbus = gfx_dbus;
|
||||||
|
}
|
||||||
|
|
||||||
let mut bg_check_spawned = false;
|
let mut bg_check_spawned = false;
|
||||||
loop {
|
loop {
|
||||||
if !running_in_bg.load(Ordering::Relaxed) {
|
if !running_in_bg.load(Ordering::Relaxed) {
|
||||||
|
|||||||
@@ -230,6 +230,7 @@ pub fn aura_modes_group(states: &mut SystemState, freq: &mut Arc<AtomicU8>, ui:
|
|||||||
.aura()
|
.aura()
|
||||||
.set_led_mode_data(states.aura.modes.get(&selected).unwrap().clone())
|
.set_led_mode_data(states.aura.modes.get(&selected).unwrap().clone())
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
|
dbg!(&err);
|
||||||
states.error = Some(err.to_string());
|
states.error = Some(err.to_string());
|
||||||
})
|
})
|
||||||
.ok();
|
.ok();
|
||||||
|
|||||||
@@ -133,6 +133,7 @@ fn aura_power1(states: &mut SystemState, ui: &mut Ui) {
|
|||||||
.aura()
|
.aura()
|
||||||
.set_led_power((options, enable))
|
.set_led_power((options, enable))
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
|
dbg!(&err);
|
||||||
states.error = Some(err.to_string());
|
states.error = Some(err.to_string());
|
||||||
})
|
})
|
||||||
.ok();
|
.ok();
|
||||||
@@ -183,6 +184,7 @@ fn aura_power1(states: &mut SystemState, ui: &mut Ui) {
|
|||||||
.aura()
|
.aura()
|
||||||
.set_led_power((options, enable))
|
.set_led_power((options, enable))
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
|
dbg!(&err);
|
||||||
states.error = Some(err.to_string());
|
states.error = Some(err.to_string());
|
||||||
})
|
})
|
||||||
.ok();
|
.ok();
|
||||||
@@ -248,6 +250,7 @@ fn aura_power2(states: &mut SystemState, ui: &mut Ui) {
|
|||||||
.aura()
|
.aura()
|
||||||
.set_led_power((options, enable))
|
.set_led_power((options, enable))
|
||||||
.map_err(|err| {
|
.map_err(|err| {
|
||||||
|
dbg!(&err);
|
||||||
states.error = Some(err.to_string());
|
states.error = Some(err.to_string());
|
||||||
})
|
})
|
||||||
.ok();
|
.ok();
|
||||||
|
|||||||
Reference in New Issue
Block a user