diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 8cfa8608..00000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -patreon: lukenukem diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dad5144d..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: bug -assignees: flukejones - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behaviour: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Please provide the following:** - - Distro: - - Kernel (`uname -r`): - - `cat /sys/class/dmi/id/product_name`: - - `cat /sys/class/dmi/id/product_family`: - - `cat /sys/class/dmi/id/board_name`: - - `lsusb |grep 0b05` - + `sudo lsusb -vd 0b05: > ~/laptop_info`, and attach to issue. - - `sudo journalctl -b --unit rog-core > rog-core.log` and attach to issue. - - `sudo usbhid-dump > usbhid.log` and attach to issue. - -**Additional context** -Add any other context about the problem here. diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml deleted file mode 100644 index 8d703a80..00000000 --- a/.github/workflows/rust.yml +++ /dev/null @@ -1,78 +0,0 @@ -on: [push, pull_request] - -name: Rust - -jobs: - check: - name: Check - runs-on: ubuntu-latest - steps: - - name: Install deps - run: sudo apt-get install libusb-1.0-0-dev libdbus-1-dev llvm libclang-dev - - - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - - name: Run cargo check - uses: actions-rs/cargo@v1 - with: - command: check - - test: - name: Test Suite - runs-on: ubuntu-latest - steps: - - name: Install deps - run: sudo apt-get install libusb-1.0-0-dev libdbus-1-dev llvm libclang-dev - - - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - - name: Run cargo test - uses: actions-rs/cargo@v1 - with: - command: test - - lints: - name: Lints - runs-on: ubuntu-latest - steps: - - name: Install deps - run: sudo apt-get install libusb-1.0-0-dev libdbus-1-dev llvm libclang-dev - - - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - components: rustfmt, clippy - - - name: Run cargo fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check - - - name: Run cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: -- -D warnings \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index e7e9d11d..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml diff --git a/.idea/dictionaries/luke.xml b/.idea/dictionaries/luke.xml deleted file mode 100644 index e6d3f95b..00000000 --- a/.idea/dictionaries/luke.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - backlight - dbus - hotkey - rogcore - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 66234fcc..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/rog-core.iml b/.idea/rog-core.iml deleted file mode 100644 index 7348b99f..00000000 --- a/.idea/rog-core.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 0f560714..d0e2d94f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,6 +15,40 @@ dependencies = [ "memchr", ] +[[package]] +name = "asus-nb" +version = "0.15.0" +dependencies = [ + "dbus", + "gumdrop", + "serde", + "serde_derive", + "serde_json", + "tinybmp", + "yansi-term", +] + +[[package]] +name = "asus-nb-ctrl" +version = "1.0.0" +dependencies = [ + "asus-nb", + "async-trait", + "dbus", + "dbus-tokio", + "env_logger", + "gumdrop", + "intel-pstate", + "log", + "rusb", + "serde", + "serde_derive", + "serde_json", + "sysfs-class", + "tokio", + "udev", +] + [[package]] name = "async-trait" version = "0.1.36" @@ -639,40 +673,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" -[[package]] -name = "rog-client" -version = "0.15.0" -dependencies = [ - "dbus", - "gumdrop", - "serde", - "serde_derive", - "serde_json", - "tinybmp", - "yansi-term", -] - -[[package]] -name = "rog-daemon" -version = "0.15.3" -dependencies = [ - "async-trait", - "dbus", - "dbus-tokio", - "env_logger", - "gumdrop", - "intel-pstate", - "log", - "rog-client", - "rusb", - "serde", - "serde_derive", - "serde_json", - "sysfs-class", - "tokio", - "udev", -] - [[package]] name = "rusb" version = "0.6.0" diff --git a/Cargo.toml b/Cargo.toml index 3e6af02a..907c258a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["rog-core", "rog-client"] +members = ["asus-nb-ctrl", "asus-nb"] [profile.release] lto = true @@ -12,6 +12,5 @@ debug = false opt-level = 1 [profile.bench] -lto = true debug = false opt-level = 3 \ No newline at end of file diff --git a/Makefile b/Makefile index 90ed7a9d..94ab4bc9 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,8 @@ SRC = Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.r .PHONY: all clean distclean install uninstall update -BIN=rog-core +BIN_C=asusctl +BIN_D=asusd DEBUG ?= 0 ifeq ($(DEBUG),0) @@ -24,7 +25,7 @@ ifeq ($(VENDORED),1) ARGS += "--frozen" endif -all: target/release/$(BIN) +all: target/release/$(BIN_D) clean: cargo clean @@ -33,16 +34,18 @@ distclean: rm -rf .cargo vendor vendor.tar.xz install: all - install -D -m 0755 "target/release/$(BIN)" "$(DESTDIR)$(bindir)/$(BIN)" - install -D -m 0644 "data/$(BIN).rules" "$(DESTDIR)/lib/udev/rules.d/99-$(BIN).rules" - install -D -m 0644 "data/$(BIN).conf" "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN).conf" - install -D -m 0644 "data/$(BIN).service" "$(DESTDIR)/lib/systemd/system/$(BIN).service" + install -D -m 0755 "target/release/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)" + install -D -m 0755 "target/release/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)" + install -D -m 0644 "data/$(BIN_D).rules" "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules" + install -D -m 0644 "data/$(BIN_D).conf" "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf" + install -D -m 0644 "data/$(BIN_D).service" "$(DESTDIR)/lib/systemd/system/$(BIN_D).service" uninstall: - rm -f "$(DESTDIR)$(bindir)/$(BIN)" - rm -f "$(DESTDIR)/lib/udev/rules.d/99-$(BIN).rules" - rm -f "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN).conf" - rm -f "$(DESTDIR)/lib/systemd/system/$(BIN).service" + rm -f "$(DESTDIR)$(bindir)/$(BIN_C)" + rm -f "$(DESTDIR)$(bindir)/$(BIN_D)" + rm -f "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules" + rm -f "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf" + rm -f "$(DESTDIR)/lib/systemd/system/$(BIN_D).service" update: cargo update @@ -54,7 +57,7 @@ vendor: tar pcfJ vendor.tar.xz vendor rm -rf vendor -target/release/$(BIN): $(SRC) +target/release/$(BIN_D): $(SRC) ifeq ($(VENDORED),1) tar pxf vendor.tar.xz endif diff --git a/rog-core/Cargo.lock b/asus-nb-ctrl/Cargo.lock similarity index 100% rename from rog-core/Cargo.lock rename to asus-nb-ctrl/Cargo.lock diff --git a/rog-core/Cargo.toml b/asus-nb-ctrl/Cargo.toml similarity index 75% rename from rog-core/Cargo.toml rename to asus-nb-ctrl/Cargo.toml index bf805401..03ad8f96 100644 --- a/rog-core/Cargo.toml +++ b/asus-nb-ctrl/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "rog-daemon" -version = "0.15.3" +name = "asus-nb-ctrl" +version = "1.0.0" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] -repository = "https://github.com/flukejones/rog-core" -homepage = "https://github.com/flukejones/rog-core" +repository = "https://gitlab.com/asus-linux/asus-nb-ctrl" +homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl" description = "A daemon app for ASUS GX502 and similar laptops to control missing features" edition = "2018" @@ -14,11 +14,15 @@ name = "daemon" path = "src/lib.rs" [[bin]] -name = "rog-core" +name = "asusctl" path = "src/main.rs" +[[bin]] +name = "asusd" +path = "src/daemon.rs" + [dependencies] -rog-client = { path = "../rog-client" } +asus-nb = { path = "../asus-nb" } rusb = "^0.6.0" udev = "^0.4.0" async-trait = "0.1.36" diff --git a/rog-core/src/config.rs b/asus-nb-ctrl/src/config.rs similarity index 97% rename from rog-core/src/config.rs rename to asus-nb-ctrl/src/config.rs index d945829d..8e75d73d 100644 --- a/rog-core/src/config.rs +++ b/asus-nb-ctrl/src/config.rs @@ -1,9 +1,9 @@ -use rog_client::aura_modes::AuraModes; +use asus_nb::aura_modes::AuraModes; use serde_derive::{Deserialize, Serialize}; use std::fs::{File, OpenOptions}; use std::io::{Read, Write}; -pub static CONFIG_PATH: &str = "/etc/rogcore.conf"; +pub static CONFIG_PATH: &str = "/etc/asusd.conf"; #[derive(Default, Deserialize, Serialize)] pub struct Config { diff --git a/rog-core/src/ctrl_anime.rs b/asus-nb-ctrl/src/ctrl_anime.rs similarity index 99% rename from rog-core/src/ctrl_anime.rs rename to asus-nb-ctrl/src/ctrl_anime.rs index e8e149ba..0ddd5963 100644 --- a/rog-core/src/ctrl_anime.rs +++ b/asus-nb-ctrl/src/ctrl_anime.rs @@ -11,7 +11,7 @@ const SET: u8 = 0xc4; use crate::config::Config; use log::{error, info, warn}; -use rog_client::error::AuraError; +use asus_nb::error::AuraError; use rusb::{Device, DeviceHandle}; use std::error::Error; use std::sync::Arc; diff --git a/rog-core/src/ctrl_charge.rs b/asus-nb-ctrl/src/ctrl_charge.rs similarity index 98% rename from rog-core/src/ctrl_charge.rs rename to asus-nb-ctrl/src/ctrl_charge.rs index 1371a986..fa75b282 100644 --- a/rog-core/src/ctrl_charge.rs +++ b/asus-nb-ctrl/src/ctrl_charge.rs @@ -47,7 +47,7 @@ impl crate::Controller for CtrlCharge { } impl CtrlCharge { - pub(super) fn new() -> Result> { + pub fn new() -> Result> { let path = CtrlCharge::get_battery_path()?; info!("Device has battery charge threshold control"); Ok(CtrlCharge { path }) diff --git a/rog-core/src/ctrl_fan_cpu.rs b/asus-nb-ctrl/src/ctrl_fan_cpu.rs similarity index 99% rename from rog-core/src/ctrl_fan_cpu.rs rename to asus-nb-ctrl/src/ctrl_fan_cpu.rs index dbcaa874..9fd1c478 100644 --- a/rog-core/src/ctrl_fan_cpu.rs +++ b/asus-nb-ctrl/src/ctrl_fan_cpu.rs @@ -71,7 +71,7 @@ impl crate::Controller for CtrlFanAndCPU { } impl CtrlFanAndCPU { - pub(super) fn new() -> Result> { + pub fn new() -> Result> { let path = CtrlFanAndCPU::get_fan_path()?; info!("Device has thermal throttle control"); Ok(CtrlFanAndCPU { path }) diff --git a/rog-core/src/ctrl_leds.rs b/asus-nb-ctrl/src/ctrl_leds.rs similarity index 99% rename from rog-core/src/ctrl_leds.rs rename to asus-nb-ctrl/src/ctrl_leds.rs index 7c2842ae..e0eee74d 100644 --- a/rog-core/src/ctrl_leds.rs +++ b/asus-nb-ctrl/src/ctrl_leds.rs @@ -5,7 +5,7 @@ static LED_SET: [u8; 17] = [0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 use crate::{config::Config, error::RogError}; use dbus::{channel::Sender, nonblock::SyncConnection, tree::Signal}; use log::{info, warn}; -use rog_client::{ +use asus_nb::{ aura_brightness_bytes, aura_modes::AuraModes, fancy::KeyColourArray, DBUS_IFACE, DBUS_PATH, LED_MSG_LEN, }; diff --git a/rog-core/src/daemon.rs b/asus-nb-ctrl/src/daemon.rs similarity index 91% rename from rog-core/src/daemon.rs rename to asus-nb-ctrl/src/daemon.rs index 2237b51e..f25a9ed9 100644 --- a/rog-core/src/daemon.rs +++ b/asus-nb-ctrl/src/daemon.rs @@ -1,17 +1,33 @@ -use crate::{ +use daemon::{ config::Config, ctrl_anime::CtrlAnimeDisplay, ctrl_charge::CtrlCharge, ctrl_fan_cpu::CtrlFanAndCPU, ctrl_leds::CtrlKbdBacklight, dbus::dbus_create_tree, laptops::match_laptop, }; use dbus::{channel::Sender, nonblock::SyncConnection, tree::Signal}; -use crate::Controller; +use daemon::Controller; use dbus_tokio::connection; -use log::{error, warn}; -use rog_client::{DBUS_IFACE, DBUS_NAME, DBUS_PATH}; +use log::{error, warn, info}; +use asus_nb::{DBUS_IFACE, DBUS_NAME, DBUS_PATH}; use std::error::Error; use std::sync::Arc; use tokio::sync::Mutex; +use std::io::Write; +use log::LevelFilter; + +#[tokio::main] +pub async fn main() -> Result<(), Box> { + let mut logger = env_logger::Builder::new(); + logger + .target(env_logger::Target::Stdout) + .format(|buf, record| writeln!(buf, "{}: {}", record.level(), record.args())) + .filter(None, LevelFilter::Info) + .init(); + + info!("Version: {}", daemon::VERSION); + start_daemon().await?; + Ok(()) +} // Timing is such that: // - interrupt write is minimum 1ms (sometimes lower) diff --git a/rog-core/src/dbus.rs b/asus-nb-ctrl/src/dbus.rs similarity index 98% rename from rog-core/src/dbus.rs rename to asus-nb-ctrl/src/dbus.rs index ae1c445d..321f47e9 100644 --- a/rog-core/src/dbus.rs +++ b/asus-nb-ctrl/src/dbus.rs @@ -1,7 +1,7 @@ use crate::config::Config; use dbus::tree::{Factory, MTSync, Method, MethodErr, Signal, Tree}; use log::warn; -use rog_client::{aura_modes::AuraModes, DBUS_IFACE, DBUS_PATH}; +use asus_nb::{aura_modes::AuraModes, DBUS_IFACE, DBUS_PATH}; use std::sync::Arc; use tokio::sync::{ mpsc::{channel, Receiver, Sender}, @@ -171,7 +171,7 @@ fn set_charge_limit(sender: Mutex>) -> Method { } #[allow(clippy::type_complexity)] -pub(super) fn dbus_create_tree( +pub fn dbus_create_tree( config: Arc>, ) -> ( Tree, diff --git a/rog-core/src/error.rs b/asus-nb-ctrl/src/error.rs similarity index 100% rename from rog-core/src/error.rs rename to asus-nb-ctrl/src/error.rs diff --git a/rog-core/src/laptops.rs b/asus-nb-ctrl/src/laptops.rs similarity index 92% rename from rog-core/src/laptops.rs rename to asus-nb-ctrl/src/laptops.rs index de48cc64..d5c62653 100644 --- a/rog-core/src/laptops.rs +++ b/asus-nb-ctrl/src/laptops.rs @@ -1,12 +1,12 @@ use log::{info, warn}; -use rog_client::aura_modes::{ +use asus_nb::aura_modes::{ AuraModes, BREATHING, COMET, FLASH, HIGHLIGHT, LASER, MULTISTATIC, PULSE, RAIN, RAINBOW, RGB, RIPPLE, SINGLE, STAR, STROBE, }; -static HELP_ADDRESS: &str = "https://github.com/flukejones/rog-core"; +static HELP_ADDRESS: &str = "https://gitlab.com/asus-linux/asus-nb-ctrl"; -pub(crate) fn match_laptop() -> LaptopBase { +pub fn match_laptop() -> LaptopBase { for device in rusb::devices().unwrap().iter() { let device_desc = device.device_descriptor().unwrap(); if device_desc.vendor_id() == 0x0b05 { @@ -107,16 +107,16 @@ fn select_1866_device(prod: String) -> LaptopBase { laptop } -pub(super) struct LaptopBase { +pub struct LaptopBase { usb_product: String, supported_modes: Vec, } impl LaptopBase { - pub(super) fn usb_product(&self) -> &str { + pub fn usb_product(&self) -> &str { &self.usb_product } - pub(super) fn supported_modes(&self) -> &[u8] { + pub fn supported_modes(&self) -> &[u8] { &self.supported_modes } } diff --git a/rog-core/src/lib.rs b/asus-nb-ctrl/src/lib.rs similarity index 85% rename from rog-core/src/lib.rs rename to asus-nb-ctrl/src/lib.rs index f3903934..c71aeefc 100644 --- a/rog-core/src/lib.rs +++ b/asus-nb-ctrl/src/lib.rs @@ -1,20 +1,18 @@ #![deny(unused_must_use)] /// Configuration loading, saving -mod config; +pub mod config; /// -mod ctrl_anime; +pub mod ctrl_anime; /// -mod ctrl_charge; +pub mod ctrl_charge; /// pub mod ctrl_fan_cpu; /// -mod ctrl_leds; -/// Start the daemon loop -pub mod daemon; +pub mod ctrl_leds; /// -mod dbus; +pub mod dbus; /// Laptop matching to determine capabilities -mod laptops; +pub mod laptops; mod error; @@ -25,6 +23,8 @@ use std::sync::Arc; use tokio::sync::{mpsc::Receiver, Mutex}; use tokio::task::JoinHandle; +pub static VERSION: &str = "1.0.0"; + use ::dbus::{nonblock::SyncConnection, tree::Signal}; #[async_trait] diff --git a/rog-core/src/main.rs b/asus-nb-ctrl/src/main.rs similarity index 86% rename from rog-core/src/main.rs rename to asus-nb-ctrl/src/main.rs index 4e95fe97..da78b180 100644 --- a/rog-core/src/main.rs +++ b/asus-nb-ctrl/src/main.rs @@ -1,24 +1,18 @@ use daemon::ctrl_fan_cpu::FanLevel; -use daemon::daemon::start_daemon; use gumdrop::Options; -use log::info; use log::LevelFilter; -use rog_client::{ +use asus_nb::{ cli_options::{LedBrightness, SetAuraBuiltin}, core_dbus::AuraDbusWriter, }; use std::io::Write; -static VERSION: &str = "0.15.3"; - #[derive(Options)] struct CLIStart { #[options(help = "print help message")] help: bool, #[options(help = "show program version number")] version: bool, - #[options(help = "start daemon")] - daemon: bool, #[options(meta = "VAL", help = "")] bright: Option, #[options(meta = "FAN", help = "")] @@ -53,12 +47,9 @@ pub async fn main() -> Result<(), Box> { .init(); let parsed = CLIStart::parse_args_default_or_exit(); - if parsed.daemon { - info!("Version: {}", VERSION); - start_daemon().await?; - } + if parsed.version { - println!("Version: {}", VERSION); + println!("Version: {}", daemon::VERSION); } let writer = AuraDbusWriter::new()?; diff --git a/rog-client/Cargo.toml b/asus-nb/Cargo.toml similarity index 74% rename from rog-client/Cargo.toml rename to asus-nb/Cargo.toml index 8e4aa058..8bfa020b 100644 --- a/rog-client/Cargo.toml +++ b/asus-nb/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "rog-client" +name = "asus-nb" version = "0.15.0" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] -repository = "https://github.com/flukejones/rog-core" -homepage = "https://github.com/flukejones/rog-core" +repository = "https://gitlab.com/asus-linux/asus-nb-ctrl" +homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl" description = "A small library of effect types and conversions for ROG Aura" edition = "2018" diff --git a/rog-client/examples/animatrix.rs b/asus-nb/examples/animatrix.rs similarity index 79% rename from rog-client/examples/animatrix.rs rename to asus-nb/examples/animatrix.rs index b3a85b2d..0af15557 100644 --- a/rog-client/examples/animatrix.rs +++ b/asus-nb/examples/animatrix.rs @@ -1,5 +1,5 @@ -use rog_client::anime_dbus::AniMeDbusWriter; -use rog_client::anime_matrix::{AniMeMatrix, AniMePacketType, HEIGHT, WIDTH}; +use asus_nb::anime_dbus::AniMeDbusWriter; +use asus_nb::anime_matrix::{AniMeMatrix, AniMePacketType, HEIGHT, WIDTH}; use tinybmp::{Bmp, Pixel}; fn main() { @@ -15,10 +15,8 @@ fn main() { // Aligned left for px in pixels { - if (px.x as usize / 2) < WIDTH && (px.y as usize) < HEIGHT { - if px.x % 2 == 0 { - matrix.get_mut()[px.y as usize][px.x as usize / 2] = px.color as u8; - } + if (px.x as usize / 2) < WIDTH && (px.y as usize) < HEIGHT && px.x % 2 == 0 { + matrix.get_mut()[px.y as usize][px.x as usize / 2] = px.color as u8; } } diff --git a/rog-client/examples/ball.rs b/asus-nb/examples/ball.rs similarity index 99% rename from rog-client/examples/ball.rs rename to asus-nb/examples/ball.rs index 9d5c446e..8e4c4e7d 100644 --- a/rog-client/examples/ball.rs +++ b/asus-nb/examples/ball.rs @@ -1,4 +1,4 @@ -use rog_client::{ +use asus_nb::{ core_dbus::AuraDbusWriter, fancy::{GX502Layout, Key, KeyColourArray, KeyLayout}, }; diff --git a/rog-client/examples/comet.rs b/asus-nb/examples/comet.rs similarity index 97% rename from rog-client/examples/comet.rs rename to asus-nb/examples/comet.rs index 35a54eb1..9e12585d 100644 --- a/rog-client/examples/comet.rs +++ b/asus-nb/examples/comet.rs @@ -1,4 +1,4 @@ -use rog_client::{ +use asus_nb::{ core_dbus::AuraDbusWriter, fancy::{GX502Layout, KeyColourArray, KeyLayout}, }; diff --git a/rog-client/examples/iterate-keys.rs b/asus-nb/examples/iterate-keys.rs similarity index 99% rename from rog-client/examples/iterate-keys.rs rename to asus-nb/examples/iterate-keys.rs index 1240fda3..88418b5c 100644 --- a/rog-client/examples/iterate-keys.rs +++ b/asus-nb/examples/iterate-keys.rs @@ -1,4 +1,4 @@ -use rog_client::{ +use asus_nb::{ core_dbus::AuraDbusWriter, fancy::{GX502Layout, Key, KeyColourArray, KeyLayout}, }; diff --git a/rog-client/examples/non-skewed.bmp b/asus-nb/examples/non-skewed.bmp similarity index 100% rename from rog-client/examples/non-skewed.bmp rename to asus-nb/examples/non-skewed.bmp diff --git a/rog-client/examples/non-skewed_r.bmp b/asus-nb/examples/non-skewed_r.bmp similarity index 100% rename from rog-client/examples/non-skewed_r.bmp rename to asus-nb/examples/non-skewed_r.bmp diff --git a/rog-client/examples/per-key-effect-2.rs b/asus-nb/examples/per-key-effect-2.rs similarity index 98% rename from rog-client/examples/per-key-effect-2.rs rename to asus-nb/examples/per-key-effect-2.rs index 50ae2150..91070eac 100644 --- a/rog-client/examples/per-key-effect-2.rs +++ b/asus-nb/examples/per-key-effect-2.rs @@ -1,4 +1,4 @@ -use rog_client::{ +use asus_nb::{ core_dbus::AuraDbusWriter, fancy::{Key, KeyColourArray}, }; diff --git a/rog-client/examples/pulser.rs b/asus-nb/examples/pulser.rs similarity index 98% rename from rog-client/examples/pulser.rs rename to asus-nb/examples/pulser.rs index f7eaf329..df800def 100644 --- a/rog-client/examples/pulser.rs +++ b/asus-nb/examples/pulser.rs @@ -1,4 +1,4 @@ -use rog_client::{ +use asus_nb::{ core_dbus::AuraDbusWriter, fancy::{GX502Layout, KeyColourArray, KeyLayout}, }; diff --git a/rog-client/examples/rust.bmp b/asus-nb/examples/rust.bmp similarity index 100% rename from rog-client/examples/rust.bmp rename to asus-nb/examples/rust.bmp diff --git a/rog-client/examples/test-skinny-45deg.bmp b/asus-nb/examples/test-skinny-45deg.bmp similarity index 100% rename from rog-client/examples/test-skinny-45deg.bmp rename to asus-nb/examples/test-skinny-45deg.bmp diff --git a/rog-client/examples/test.bmp b/asus-nb/examples/test.bmp similarity index 100% rename from rog-client/examples/test.bmp rename to asus-nb/examples/test.bmp diff --git a/rog-client/examples/test2.bmp b/asus-nb/examples/test2.bmp similarity index 100% rename from rog-client/examples/test2.bmp rename to asus-nb/examples/test2.bmp diff --git a/rog-client/src/anime_dbus.rs b/asus-nb/src/anime_dbus.rs similarity index 100% rename from rog-client/src/anime_dbus.rs rename to asus-nb/src/anime_dbus.rs diff --git a/rog-client/src/anime_matrix.rs b/asus-nb/src/anime_matrix.rs similarity index 100% rename from rog-client/src/anime_matrix.rs rename to asus-nb/src/anime_matrix.rs diff --git a/rog-client/src/aura_modes.rs b/asus-nb/src/aura_modes.rs similarity index 100% rename from rog-client/src/aura_modes.rs rename to asus-nb/src/aura_modes.rs diff --git a/rog-client/src/cli_options.rs b/asus-nb/src/cli_options.rs similarity index 100% rename from rog-client/src/cli_options.rs rename to asus-nb/src/cli_options.rs diff --git a/rog-client/src/core_dbus.rs b/asus-nb/src/core_dbus.rs similarity index 100% rename from rog-client/src/core_dbus.rs rename to asus-nb/src/core_dbus.rs diff --git a/rog-client/src/error.rs b/asus-nb/src/error.rs similarity index 100% rename from rog-client/src/error.rs rename to asus-nb/src/error.rs diff --git a/rog-client/src/fancy.rs b/asus-nb/src/fancy.rs similarity index 100% rename from rog-client/src/fancy.rs rename to asus-nb/src/fancy.rs diff --git a/rog-client/src/lib.rs b/asus-nb/src/lib.rs similarity index 98% rename from rog-client/src/lib.rs rename to asus-nb/src/lib.rs index 6b6f8321..0ba55170 100644 --- a/rog-client/src/lib.rs +++ b/asus-nb/src/lib.rs @@ -1,6 +1,6 @@ -pub static DBUS_NAME: &str = "org.rogcore.Daemon"; -pub static DBUS_PATH: &str = "/org/rogcore/Daemon"; -pub static DBUS_IFACE: &str = "org.rogcore.Daemon"; +pub static DBUS_NAME: &str = "org.asus-linux.Daemon"; +pub static DBUS_PATH: &str = "/org/asus-linux/Daemon"; +pub static DBUS_IFACE: &str = "org.asus-linux.Daemon"; pub const LED_MSG_LEN: usize = 17; pub mod aura_modes; diff --git a/data/asusd.conf b/data/asusd.conf new file mode 100644 index 00000000..a2d0dca6 --- /dev/null +++ b/data/asusd.conf @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/data/rog-core.rules b/data/asusd.rules similarity index 72% rename from data/rog-core.rules rename to data/asusd.rules index 6a30414e..f799bb3a 100644 --- a/data/rog-core.rules +++ b/data/asusd.rules @@ -1 +1 @@ -ACTION=="add|change", SUBSYSTEM=="input", ENV{ID_VENDOR_ID}=="0b05", ENV{ID_MODEL_ID}=="18[0-9][0-9]", ENV{ID_TYPE}=="hid", TAG+="systemd", ENV{SYSTEMD_WANTS}="rog-core.service" \ No newline at end of file +ACTION=="add|change", SUBSYSTEM=="input", ENV{ID_VENDOR_ID}=="0b05", ENV{ID_MODEL_ID}=="18[0-9][0-9]", ENV{ID_TYPE}=="hid", TAG+="systemd", ENV{SYSTEMD_WANTS}="asusd.service" \ No newline at end of file diff --git a/data/asusd.service b/data/asusd.service new file mode 100644 index 00000000..82bea9d8 --- /dev/null +++ b/data/asusd.service @@ -0,0 +1,8 @@ +[Unit] +Description=ASUS Notebook Control + +[Service] +ExecStart=/usr/bin/asusd +Restart=on-failure +Type=dbus +BusName=org.asus-linux.Daemon \ No newline at end of file diff --git a/data/rog-core.conf b/data/rog-core.conf deleted file mode 100644 index d32e6285..00000000 --- a/data/rog-core.conf +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/data/rog-core.service b/data/rog-core.service deleted file mode 100644 index 36f7baa6..00000000 --- a/data/rog-core.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=ROG Core Daemon - -[Service] -ExecStart=/usr/bin/rog-core -d -Restart=on-failure -Type=dbus -BusName=org.rogcore.Daemon \ No newline at end of file