diff --git a/Cargo.toml b/Cargo.toml index 65fa0f39..ee68fd8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,11 +29,10 @@ version = "6.0.0-alpha1" rust-version = "1.76" [workspace.dependencies] -tokio = { version = "^1.23.0", default-features = false, features = [ +tokio = { version = "^1.36.0", default-features = false,features = [ "macros", "sync", "time", - "rt", "rt-multi-thread" ] } concat-idents = "^1.1" diff --git a/Makefile b/Makefile index f5f7a967..cb6f84cd 100644 --- a/Makefile +++ b/Makefile @@ -124,9 +124,9 @@ bindings: typeshare ./rog-platform/src/ --lang=typescript --output-file=bindings/ts/platform.ts introspect: -# gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Platform -x > bindings/dbus-xml/org-asuslinux-platform-4.xml -# gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Aura -x > bindings/dbus-xml/org-asuslinux-aura-4.xml -# gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Anime -x > bindings/dbus-xml/org-asuslinux-anime-4.xml + gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Platform -x > bindings/dbus-xml/org-asuslinux-platform-4.xml + gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Aura -x > bindings/dbus-xml/org-asuslinux-aura-4.xml + gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/Anime -x > bindings/dbus-xml/org-asuslinux-anime-4.xml gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux -x > bindings/dbus-xml/org-asuslinux-platform-4.xml gdbus introspect --system -d org.asuslinux.Daemon -o /org/asuslinux/19b6_4_4 -x > bindings/dbus-xml/org-asuslinux-19b6-4-4-4.xml xmlstarlet ed -L -O -d '//interface[@name="org.freedesktop.DBus.Introspectable"]' bindings/dbus-xml/org-asuslinux-* diff --git a/asusctl/src/aura_cli.rs b/asusctl/src/aura_cli.rs index b30cffb9..eea3af0b 100644 --- a/asusctl/src/aura_cli.rs +++ b/asusctl/src/aura_cli.rs @@ -88,15 +88,15 @@ impl FromStr for LedBrightness { } } } -impl Display for LedBrightness { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl ToString for LedBrightness { + fn to_string(&self) -> String { let s = match self.level { Some(0x00) => "low", Some(0x01) => "med", Some(0x02) => "high", _ => "unknown", }; - write!(f, "{}", s.to_owned()) + s.to_owned() } } diff --git a/bindings/dbus-xml/org-asuslinux-19b6-4-4-4.xml b/bindings/dbus-xml/org-asuslinux-19b6-4-4-4.xml deleted file mode 100644 index a04d6fab..00000000 --- a/bindings/dbus-xml/org-asuslinux-19b6-4-4-4.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bindings/dbus-xml/org-asuslinux-platform-4.xml b/bindings/dbus-xml/org-asuslinux-platform-4.xml index 682f0441..f22a35cc 100644 --- a/bindings/dbus-xml/org-asuslinux-platform-4.xml +++ b/bindings/dbus-xml/org-asuslinux-platform-4.xml @@ -1,101 +1,8 @@ + "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -111,11 +18,6 @@ --> - - @@ -140,6 +42,10 @@ internal config also. --> + + - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rog-aura/src/builtin_modes.rs b/rog-aura/src/builtin_modes.rs index f5c729a9..d955c74c 100644 --- a/rog-aura/src/builtin_modes.rs +++ b/rog-aura/src/builtin_modes.rs @@ -486,7 +486,7 @@ impl Default for AuraEffect { Self { mode: AuraModeNum::Static, zone: AuraZone::None, - colour1: Colour { r: 166, g: 166, b: 166 }, + colour1: Colour { r: 166, g: 0, b: 0 }, colour2: Colour { r: 0, g: 0, b: 0 }, speed: Speed::Med, direction: Direction::Right, diff --git a/rog-control-center/src/main.rs b/rog-control-center/src/main.rs index 325c378b..69589382 100644 --- a/rog-control-center/src/main.rs +++ b/rog-control-center/src/main.rs @@ -72,10 +72,14 @@ fn main() -> Result<()> { }) .unwrap(); - let supported_properties = dbus.proxies().platform().supported_properties().unwrap_or_else(|_e| { - // TODO: show an error window - Vec::default() - }); + let supported_properties = dbus + .proxies() + .platform() + .supported_properties() + .unwrap_or_else(|_e| { + // TODO: show an error window + Vec::default() + }); // Startup let mut config = Config::new().load(); @@ -113,7 +117,8 @@ fn main() -> Result<()> { init_tray(supported_properties, states.clone(), config.clone()); } - thread_local! { pub static UI: std::cell::RefCell> = Default::default()}; + thread_local! { pub static UI: std::cell::RefCell> = Default::default()} + ; i_slint_backend_selector::with_platform(|_| Ok(())).unwrap(); let mut do_once = !startup_in_background; @@ -170,7 +175,7 @@ fn main() -> Result<()> { } }); }) - .unwrap(); + .unwrap(); } else { if buf[1] == QUIT_APP { slint::quit_event_loop().unwrap(); @@ -192,7 +197,7 @@ fn main() -> Result<()> { } }); }) - .unwrap(); + .unwrap(); } } } diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 7c5d026c..588c7c76 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-03-30 17:43+0000\n" +"POT-Creation-Date: 2024-03-23 01:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12,184 +12,44 @@ msgstr "" "Language: \n" "Plural-Forms: nplurals=1; plural=0;\n" -#: rog-control-center/ui/types/aura_types.slint:69 -msgctxt "Aura brightness" -msgid "Off" +#: rog-control-center/ui/main_window.slint:50 +msgctxt "MainWindow" +msgid "ROG" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:70 -msgctxt "Aura brightness" -msgid "Low" +#: rog-control-center/ui/main_window.slint:52 +msgctxt "Menu1" +msgid "System Control" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:71 -msgctxt "Aura brightness" -msgid "Med" +#: rog-control-center/ui/main_window.slint:53 +msgctxt "Menu2" +msgid "Keyboard Aura" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:72 -msgctxt "Aura brightness" -msgid "High" +#: rog-control-center/ui/main_window.slint:54 +msgctxt "Menu3" +msgid "AniMe Matrix" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:77 rog-control-center/ui/types/aura_types.slint:92 -msgctxt "Basic aura mode" -msgid "Static" +#: rog-control-center/ui/main_window.slint:55 +msgctxt "Menu4" +msgid "Fan Curves" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:78 rog-control-center/ui/types/aura_types.slint:93 -msgctxt "Basic aura mode" -msgid "Breathe" +#: rog-control-center/ui/main_window.slint:56 +msgctxt "Menu5" +msgid "App Settings" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:79 rog-control-center/ui/types/aura_types.slint:94 -msgctxt "Basic aura mode" -msgid "Strobe" +#: rog-control-center/ui/main_window.slint:57 +msgctxt "Menu6" +msgid "About" msgstr "" -#: rog-control-center/ui/types/aura_types.slint:80 -msgctxt "Basic aura mode" -msgid "Rainbow" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:81 -msgctxt "Basic aura mode" -msgid "Star" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:82 -msgctxt "Basic aura mode" -msgid "Rain" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:83 -msgctxt "Basic aura mode" -msgid "Highlight" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:84 -msgctxt "Basic aura mode" -msgid "Laser" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:85 -msgctxt "Basic aura mode" -msgid "Ripple" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:86 -msgctxt "Basic aura mode" -msgid "Nothing" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:87 -msgctxt "Basic aura mode" -msgid "Pulse" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:88 -msgctxt "Basic aura mode" -msgid "Comet" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:89 -msgctxt "Basic aura mode" -msgid "Flash" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:101 -msgctxt "Aura zone" -msgid "None" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:102 -msgctxt "Aura zone" -msgid "Key1" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:103 -msgctxt "Aura zone" -msgid "Key2" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:104 -msgctxt "Aura zone" -msgid "Key3" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:105 -msgctxt "Aura zone" -msgid "Key4" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:106 -msgctxt "Aura zone" -msgid "Logo" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:107 -msgctxt "Aura zone" -msgid "Lightbar Left" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:108 -msgctxt "Aura zone" -msgid "Lightbar Right" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:112 -msgctxt "Aura direction" -msgid "Right" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:113 -msgctxt "Aura direction" -msgid "Left" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:114 -msgctxt "Aura direction" -msgid "Up" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:115 -msgctxt "Aura direction" -msgid "Down" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:119 -msgctxt "Aura speed" -msgid "Low" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:120 -msgctxt "Aura speed" -msgid "Medium" -msgstr "" - -#: rog-control-center/ui/types/aura_types.slint:121 -msgctxt "Aura speed" -msgid "High" -msgstr "" - -#: rog-control-center/ui/widgets/aura_power.slint:32 -msgctxt "AuraPowerGroup" -msgid "Boot" -msgstr "" - -#: rog-control-center/ui/widgets/aura_power.slint:42 -msgctxt "AuraPowerGroup" -msgid "Awake" -msgstr "" - -#: rog-control-center/ui/widgets/aura_power.slint:52 -msgctxt "AuraPowerGroup" -msgid "Sleep" -msgstr "" - -#: rog-control-center/ui/widgets/aura_power.slint:62 -msgctxt "AuraPowerGroup" -msgid "Shutdown" +#: rog-control-center/ui/main_window.slint:69 +msgctxt "MainWindow" +msgid "Quit" msgstr "" #: rog-control-center/ui/pages/anime.slint:6 @@ -317,6 +177,26 @@ msgctxt "PageAnime" msgid "Off when on battery" msgstr "" +#: rog-control-center/ui/pages/app_settings.slint:29 +msgctxt "PageAppSettings" +msgid "Run in background after closing" +msgstr "" + +#: rog-control-center/ui/pages/app_settings.slint:38 +msgctxt "PageAppSettings" +msgid "Start app in background (UI closed)" +msgstr "" + +#: rog-control-center/ui/pages/app_settings.slint:50 +msgctxt "PageAppSettings" +msgid "Enable system tray icon" +msgstr "" + +#: rog-control-center/ui/pages/app_settings.slint:59 +msgctxt "PageAppSettings" +msgid "Enable change notifications" +msgstr "" + #: rog-control-center/ui/pages/aura.slint:27 msgctxt "PageAura" msgid "Brightness" @@ -607,63 +487,183 @@ msgctxt "PageSystem" msgid "Throttle Policy on AC" msgstr "" -#: rog-control-center/ui/pages/app_settings.slint:29 -msgctxt "PageAppSettings" -msgid "Run in background after closing" +#: rog-control-center/ui/types/aura_types.slint:69 +msgctxt "Aura brightness" +msgid "Off" msgstr "" -#: rog-control-center/ui/pages/app_settings.slint:38 -msgctxt "PageAppSettings" -msgid "Start app in background (UI closed)" +#: rog-control-center/ui/types/aura_types.slint:70 +msgctxt "Aura brightness" +msgid "Low" msgstr "" -#: rog-control-center/ui/pages/app_settings.slint:50 -msgctxt "PageAppSettings" -msgid "Enable system tray icon" +#: rog-control-center/ui/types/aura_types.slint:71 +msgctxt "Aura brightness" +msgid "Med" msgstr "" -#: rog-control-center/ui/pages/app_settings.slint:59 -msgctxt "PageAppSettings" -msgid "Enable change notifications" +#: rog-control-center/ui/types/aura_types.slint:72 +msgctxt "Aura brightness" +msgid "High" msgstr "" -#: rog-control-center/ui/main_window.slint:50 -msgctxt "MainWindow" -msgid "ROG" +#: rog-control-center/ui/types/aura_types.slint:77 rog-control-center/ui/types/aura_types.slint:92 +msgctxt "Basic aura mode" +msgid "Static" msgstr "" -#: rog-control-center/ui/main_window.slint:52 -msgctxt "Menu1" -msgid "System Control" +#: rog-control-center/ui/types/aura_types.slint:78 rog-control-center/ui/types/aura_types.slint:93 +msgctxt "Basic aura mode" +msgid "Breathe" msgstr "" -#: rog-control-center/ui/main_window.slint:53 -msgctxt "Menu2" -msgid "Keyboard Aura" +#: rog-control-center/ui/types/aura_types.slint:79 rog-control-center/ui/types/aura_types.slint:94 +msgctxt "Basic aura mode" +msgid "Strobe" msgstr "" -#: rog-control-center/ui/main_window.slint:54 -msgctxt "Menu3" -msgid "AniMe Matrix" +#: rog-control-center/ui/types/aura_types.slint:80 +msgctxt "Basic aura mode" +msgid "Rainbow" msgstr "" -#: rog-control-center/ui/main_window.slint:55 -msgctxt "Menu4" -msgid "Fan Curves" +#: rog-control-center/ui/types/aura_types.slint:81 +msgctxt "Basic aura mode" +msgid "Star" msgstr "" -#: rog-control-center/ui/main_window.slint:56 -msgctxt "Menu5" -msgid "App Settings" +#: rog-control-center/ui/types/aura_types.slint:82 +msgctxt "Basic aura mode" +msgid "Rain" msgstr "" -#: rog-control-center/ui/main_window.slint:57 -msgctxt "Menu6" -msgid "About" +#: rog-control-center/ui/types/aura_types.slint:83 +msgctxt "Basic aura mode" +msgid "Highlight" msgstr "" -#: rog-control-center/ui/main_window.slint:69 -msgctxt "MainWindow" -msgid "Quit" +#: rog-control-center/ui/types/aura_types.slint:84 +msgctxt "Basic aura mode" +msgid "Laser" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:85 +msgctxt "Basic aura mode" +msgid "Ripple" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:86 +msgctxt "Basic aura mode" +msgid "Nothing" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:87 +msgctxt "Basic aura mode" +msgid "Pulse" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:88 +msgctxt "Basic aura mode" +msgid "Comet" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:89 +msgctxt "Basic aura mode" +msgid "Flash" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:101 +msgctxt "Aura zone" +msgid "None" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:102 +msgctxt "Aura zone" +msgid "Key1" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:103 +msgctxt "Aura zone" +msgid "Key2" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:104 +msgctxt "Aura zone" +msgid "Key3" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:105 +msgctxt "Aura zone" +msgid "Key4" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:106 +msgctxt "Aura zone" +msgid "Logo" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:107 +msgctxt "Aura zone" +msgid "Lightbar Left" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:108 +msgctxt "Aura zone" +msgid "Lightbar Right" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:112 +msgctxt "Aura direction" +msgid "Right" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:113 +msgctxt "Aura direction" +msgid "Left" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:114 +msgctxt "Aura direction" +msgid "Up" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:115 +msgctxt "Aura direction" +msgid "Down" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:119 +msgctxt "Aura speed" +msgid "Low" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:120 +msgctxt "Aura speed" +msgid "Medium" +msgstr "" + +#: rog-control-center/ui/types/aura_types.slint:121 +msgctxt "Aura speed" +msgid "High" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:32 +msgctxt "AuraPowerGroup" +msgid "Boot" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:42 +msgctxt "AuraPowerGroup" +msgid "Awake" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:52 +msgctxt "AuraPowerGroup" +msgid "Sleep" +msgstr "" + +#: rog-control-center/ui/widgets/aura_power.slint:62 +msgctxt "AuraPowerGroup" +msgid "Shutdown" msgstr "" diff --git a/rog-dbus/src/zbus_aura.rs b/rog-dbus/src/zbus_aura.rs index 040bb9b5..f1e5e221 100644 --- a/rog-dbus/src/zbus_aura.rs +++ b/rog-dbus/src/zbus_aura.rs @@ -34,7 +34,7 @@ const BLOCKING_TIME: u64 = 33; // 100ms = 10 FPS, max 50ms = 20 FPS, 40ms = 25 F #[proxy( interface = "org.asuslinux.Aura", default_service = "org.asuslinux.Daemon", - default_path = "/org/asuslinux/19b6_4_4" + default_path = "/org/asuslinux/Aura" )] trait Aura { /// AllModeData method diff --git a/rog-platform/src/usb_raw.rs b/rog-platform/src/usb_raw.rs index 9b853395..fce8ecbc 100644 --- a/rog-platform/src/usb_raw.rs +++ b/rog-platform/src/usb_raw.rs @@ -11,11 +11,9 @@ impl USBRaw { pub fn new(id_product: u16) -> Result { for device in rusb::devices()?.iter() { let device_desc = device.device_descriptor()?; - if device_desc.vendor_id() == 0x0b05 { - if device_desc.product_id() == id_product { - let handle = Self::get_dev_handle(&device)?; - return Ok(Self(handle)); - } + if device_desc.vendor_id() == 0x0b05 && device_desc.product_id() == id_product { + let handle = Self::get_dev_handle(&device)?; + return Ok(Self(handle)); } } @@ -28,17 +26,11 @@ impl USBRaw { fn get_dev_handle( device: &Device, ) -> Result> { - // We don't expect this ID to ever change - let device_open = device.open(); - if let Err(err) = device_open { - panic!("Could not open device, try running as root: {}", err); - } else { - let mut device = device_open.unwrap(); - device.reset()?; - device.set_auto_detach_kernel_driver(true)?; - device.claim_interface(0)?; - Ok(device) - } + let mut device = device.open()?; + device.reset()?; + device.set_auto_detach_kernel_driver(true)?; + device.claim_interface(0)?; + Ok(device) } pub fn write_bytes(&self, message: &[u8]) -> Result { diff --git a/squashfs-root/.DirIcon b/squashfs-root/.DirIcon deleted file mode 100644 index 94e6adba..00000000 --- a/squashfs-root/.DirIcon +++ /dev/null @@ -1 +0,0 @@ -ToolBox_trayIcon_colour_32-01 \ No newline at end of file