From c04f184e8bdc3ecae9ec580ac2ec39c66f89cc1c Mon Sep 17 00:00:00 2001 From: vextrixes <113197359+vextrixes@users.noreply.github.com> Date: Sat, 6 Jun 2026 16:07:34 +0200 Subject: [PATCH] Renamed the Rgb struct to Color --- src/{rgb.rs => color.rs} | 4 +-- src/lib.rs | 4 +-- src/rgb_controller/controller.rs | 44 ++++++++++++++++---------------- src/rgb_controller/keymap.rs | 6 ++--- 4 files changed, 29 insertions(+), 29 deletions(-) rename src/{rgb.rs => color.rs} (83%) diff --git a/src/rgb.rs b/src/color.rs similarity index 83% rename from src/rgb.rs rename to src/color.rs index 0765692..ffdc1db 100644 --- a/src/rgb.rs +++ b/src/color.rs @@ -1,11 +1,11 @@ #[derive(Default)] -pub struct Rgb { +pub struct Color { pub red: u8, pub green: u8, pub blue: u8, } -impl Rgb { +impl Color { pub fn to_array(self) -> [u8; 3] { [self.red, self.green, self.blue] } diff --git a/src/lib.rs b/src/lib.rs index 3e15dbb..7d2fb15 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,9 @@ mod hid_wrapper; -mod rgb; +mod color; mod rgb_controller; pub use hid_wrapper::HidWrapperError; -pub use rgb::Rgb; +pub use color::Color; pub use rgb_controller::controller::RGBController; pub use rgb_controller::effects::Effects; pub use rgb_controller::keymap::{Keymap, KeymapKeys}; diff --git a/src/rgb_controller/controller.rs b/src/rgb_controller/controller.rs index 8014207..9e17631 100644 --- a/src/rgb_controller/controller.rs +++ b/src/rgb_controller/controller.rs @@ -1,7 +1,7 @@ use crate::Effects; use crate::HidWrapperError; use crate::Keymap; -use crate::Rgb; +use crate::Color; use crate::hid_wrapper::HidWrapper; pub struct RGBController { @@ -207,7 +207,7 @@ impl RGBController { pub fn set_effect( &mut self, effect: Effects, - rgb: Rgb, + rgb: Color, full_color: bool, brightness: u8, speed: u8, @@ -257,7 +257,7 @@ impl RGBController { pub fn set_static_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, full_color: Option, ) -> Result<(), HidWrapperError> { @@ -274,7 +274,7 @@ impl RGBController { pub fn set_single_off_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -292,7 +292,7 @@ impl RGBController { pub fn set_single_on_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -310,7 +310,7 @@ impl RGBController { pub fn set_glittering_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -328,7 +328,7 @@ impl RGBController { pub fn set_rain_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -346,7 +346,7 @@ impl RGBController { pub fn set_colorful_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -364,7 +364,7 @@ impl RGBController { pub fn set_breath_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -387,7 +387,7 @@ impl RGBController { ) -> Result<(), HidWrapperError> { self.set_effect( Effects::Spectrum, - Rgb::default(), + Color::default(), false, brightness, speed, @@ -398,7 +398,7 @@ impl RGBController { pub fn set_centrifugal_wave_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -416,7 +416,7 @@ impl RGBController { pub fn set_vertical_wave_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, direction: u8, @@ -435,7 +435,7 @@ impl RGBController { pub fn set_horizontal_wave_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, direction: u8, @@ -454,7 +454,7 @@ impl RGBController { pub fn set_rotating_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -472,7 +472,7 @@ impl RGBController { pub fn set_explosion_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -490,7 +490,7 @@ impl RGBController { pub fn set_launch_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -508,7 +508,7 @@ impl RGBController { pub fn set_ripples_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -526,7 +526,7 @@ impl RGBController { pub fn set_snake_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -544,7 +544,7 @@ impl RGBController { pub fn set_pulse_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -562,7 +562,7 @@ impl RGBController { pub fn set_tilt_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -580,7 +580,7 @@ impl RGBController { pub fn set_shuttle_effect( &mut self, - rgb: Rgb, + rgb: Color, brightness: u8, speed: u8, full_color: Option, @@ -603,7 +603,7 @@ impl RGBController { ) -> Result<(), HidWrapperError> { self.set_effect( Effects::StaticPerKey, - Rgb::default(), + Color::default(), false, brightness, 1, diff --git a/src/rgb_controller/keymap.rs b/src/rgb_controller/keymap.rs index 086d382..ee9d721 100644 --- a/src/rgb_controller/keymap.rs +++ b/src/rgb_controller/keymap.rs @@ -1,4 +1,4 @@ -use crate::rgb::Rgb; +use crate::color::Color; pub enum KeymapKeys { Escape, @@ -237,11 +237,11 @@ impl Default for Keymap { } impl Keymap { - pub fn set_key(&mut self, key: KeymapKeys, color: Rgb) { + pub fn set_key(&mut self, key: KeymapKeys, color: Color) { self.map[key.to_usize()] = color.to_array(); } - pub fn set_all_keys(&mut self, color: Rgb) { + pub fn set_all_keys(&mut self, color: Color) { self.map = [color.to_array(); 144]; } }