fix: Make color and brightness Daemon methods take a board ID

Currently ignored.

Author: ids1024

src/application/keyboard.rs

@@ -411,7 +411,7 @@ button {
 
         let max_brightness = if let Some(ref daemon) = self.daemon_opt {
             let mut daemon = daemon.borrow_mut();
-            match daemon.max_brightness() {
+            match daemon.max_brightness(self.daemon_board) {
                 Ok(value) => value as f64,
                 Err(err) => {
                     eprintln!("{}", err);
@@ -432,7 +432,7 @@ button {
             let value = this.get_value() as i32;
             if let Some(ref daemon) = kb.daemon_opt {
                 let mut daemon = daemon.borrow_mut();
-                if let Err(err) = daemon.set_brightness(value) {
+                if let Err(err) = daemon.set_brightness(kb.daemon_board, value) {
                     eprintln!("{}", err);
                 }
             }
@@ -447,7 +447,7 @@ button {
 
         let color_rgba = if let Some(ref daemon) = self.daemon_opt {
             let mut daemon = daemon.borrow_mut();
-            match daemon.color() {
+            match daemon.color(self.daemon_board) {
                 Ok(value) => {
                     let (red, green, blue) = value.to_floats();
                     gdk::RGBA { red, green, blue, alpha: 1. }
@@ -469,7 +469,7 @@ button {
             let color = Rgb::from_floats(rgba.red, rgba.green, rgba.blue);
             if let Some(ref daemon) = kb.daemon_opt {
                 let mut daemon = daemon.borrow_mut();
-                if let Err(err) = daemon.set_color(color) {
+                if let Err(err) = daemon.set_color(kb.daemon_board, color) {
                     eprintln!("{}", err);
                 }
             }

src/daemon/mod.rs

@@ -69,11 +69,11 @@ commands! {
     fn boards(&mut self) -> Result<Vec<String>, String>;
     fn keymap_get(&mut self, board: usize, layer: u8, output: u8, input: u8) -> Result<u16, String>;
     fn keymap_set(&mut self, board: usize, layer: u8, output: u8, input: u8, value: u16) -> Result<(), String>;
-    fn color(&mut self) -> Result<Rgb, String>;
-    fn set_color(&mut self, color: Rgb) -> Result<(), String>;
-    fn max_brightness(&mut self) -> Result<i32, String>;
-    fn brightness(&mut self) -> Result<i32, String>;
-    fn set_brightness(&mut self, brightness: i32) -> Result<(), String>;
+    fn color(&mut self, board: usize) -> Result<Rgb, String>;
+    fn set_color(&mut self, board: usize, color: Rgb) -> Result<(), String>;
+    fn max_brightness(&mut self, board: usize) -> Result<i32, String>;
+    fn brightness(&mut self, board: usize) -> Result<i32, String>;
+    fn set_brightness(&mut self, board: usize, brightness: i32) -> Result<(), String>;
     fn exit(&mut self) -> Result<(), String>;
 }
 

src/daemon/server.rs

@@ -182,7 +182,7 @@ impl<R: Read, W: Write> Daemon for DaemonServer<R, W> {
         }
     }
 
-    fn color(&mut self) -> Result<Rgb, String> {
+    fn color(&mut self, board: usize) -> Result<Rgb, String> {
         let path = "/sys/class/leds/system76_acpi::kbd_backlight/color";
         match fs::read_to_string(&path) {
             Ok(string) => {
@@ -196,7 +196,7 @@ impl<R: Read, W: Write> Daemon for DaemonServer<R, W> {
         }
     }
 
-    fn set_color(&mut self, color: Rgb) -> Result<(), String> {
+    fn set_color(&mut self, board: usize, color: Rgb) -> Result<(), String> {
         let path = "/sys/class/leds/system76_acpi::kbd_backlight/color";
         match fs::write(path, &color.to_string()) {
             Ok(()) => Ok(()),
@@ -205,7 +205,7 @@ impl<R: Read, W: Write> Daemon for DaemonServer<R, W> {
 
     }
 
-    fn max_brightness(&mut self) -> Result<i32, String> {
+    fn max_brightness(&mut self, board: usize) -> Result<i32, String> {
         let path = "/sys/class/leds/system76_acpi::kbd_backlight/max_brightness";
         match fs::read_to_string(&path) {
             Ok(string) => {
@@ -223,7 +223,7 @@ impl<R: Read, W: Write> Daemon for DaemonServer<R, W> {
         }
     }
 
-    fn brightness(&mut self) -> Result<i32, String> {
+    fn brightness(&mut self, board: usize) -> Result<i32, String> {
         let path = "/sys/class/leds/system76_acpi::kbd_backlight/brightness";
         match fs::read_to_string(&path) {
             Ok(string) => {
@@ -241,7 +241,7 @@ impl<R: Read, W: Write> Daemon for DaemonServer<R, W> {
         }
     }
 
-    fn set_brightness(&mut self, brightness: i32) -> Result<(), String> {
+    fn set_brightness(&mut self, board: usize, brightness: i32) -> Result<(), String> {
         let path = "/sys/class/leds/system76_acpi::kbd_backlight/brightness";
         match fs::write(path, &format!("{}", brightness)) {
             Ok(()) => Ok(()),