From 4d6fd32183293e5ebb9b414fc3d69258e09d79c4 Mon Sep 17 00:00:00 2001 From: Armas Spann Date: Wed, 10 Jun 2020 20:54:57 +0200 Subject: [PATCH] fixed build errors on rust - removed RGB support for GA502 --- rog-client/src/aura_dbus.rs | 4 ++-- rog-core/src/daemon.rs | 2 +- rog-core/src/laptops.rs | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/rog-client/src/aura_dbus.rs b/rog-client/src/aura_dbus.rs index c29ef998..c9774704 100644 --- a/rog-client/src/aura_dbus.rs +++ b/rog-client/src/aura_dbus.rs @@ -83,8 +83,8 @@ impl AuraDbusWriter { pub fn write_multizone( &mut self, group: &[[u8; LED_MSG_LEN]; 4], - ) -> Result> { - let msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "LedWriteMultizone")? + ) -> Result<(), Box> { + let mut msg = Message::new_method_call(DBUS_NAME, DBUS_PATH, DBUS_IFACE, "LedWriteMultizone")? .append1(&group[0].to_vec()) .append1(&group[1].to_vec()) .append1(&group[2].to_vec()) diff --git a/rog-core/src/daemon.rs b/rog-core/src/daemon.rs index 3d2b6979..d678d8e8 100644 --- a/rog-core/src/daemon.rs +++ b/rog-core/src/daemon.rs @@ -11,7 +11,7 @@ use dbus::{channel::Sender, nonblock::Process}; use dbus_tokio::connection; use log::{error, info, warn}; -use rog_aura::{DBUS_IFACE, DBUS_NAME, DBUS_PATH}; +use rog_client::{DBUS_IFACE, DBUS_NAME, DBUS_PATH}; use std::error::Error; use std::sync::{mpsc, Arc}; use std::time::{Duration, Instant}; diff --git a/rog-core/src/laptops.rs b/rog-core/src/laptops.rs index db5d8709..bac6a1fe 100644 --- a/rog-core/src/laptops.rs +++ b/rog-core/src/laptops.rs @@ -56,8 +56,8 @@ fn choose_1866_device(prod: u16) -> LaptopBase { //backlight: Backlight::new("intel_backlight").unwrap(), }; match &board_name.as_str()[..5] { - "GX502" | "GA502" => { - info!("Found GX502 or GA502 series"); + "GX502" => { + info!("Found GX502 series"); laptop.supported_modes = vec![ BuiltInModeByte::Single, BuiltInModeByte::Breathing, @@ -82,6 +82,10 @@ fn choose_1866_device(prod: u16) -> LaptopBase { BuiltInModeByte::Rainbow, ]; } + "GA502" => { + // Has no RGB control + info!("Found GA502 series"); + } "GA401" => { // Has no RGB control info!("Found GA401 series");