Renamed the Rgb struct to Color
This commit is contained in:
4 files changed
+29
-29
No files matched your search
@@ -1,11 +1,11 @@
|
|||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct Rgb {
|
pub struct Color {
|
||||||
pub red: u8,
|
pub red: u8,
|
||||||
pub green: u8,
|
pub green: u8,
|
||||||
pub blue: u8,
|
pub blue: u8,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Rgb {
|
impl Color {
|
||||||
pub fn to_array(self) -> [u8; 3] {
|
pub fn to_array(self) -> [u8; 3] {
|
||||||
[self.red, self.green, self.blue]
|
[self.red, self.green, self.blue]
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
mod hid_wrapper;
|
mod hid_wrapper;
|
||||||
mod rgb;
|
mod color;
|
||||||
mod rgb_controller;
|
mod rgb_controller;
|
||||||
|
|
||||||
pub use hid_wrapper::HidWrapperError;
|
pub use hid_wrapper::HidWrapperError;
|
||||||
pub use rgb::Rgb;
|
pub use color::Color;
|
||||||
pub use rgb_controller::controller::RGBController;
|
pub use rgb_controller::controller::RGBController;
|
||||||
pub use rgb_controller::effects::Effects;
|
pub use rgb_controller::effects::Effects;
|
||||||
pub use rgb_controller::keymap::{Keymap, KeymapKeys};
|
pub use rgb_controller::keymap::{Keymap, KeymapKeys};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use crate::Effects;
|
use crate::Effects;
|
||||||
use crate::HidWrapperError;
|
use crate::HidWrapperError;
|
||||||
use crate::Keymap;
|
use crate::Keymap;
|
||||||
use crate::Rgb;
|
use crate::Color;
|
||||||
use crate::hid_wrapper::HidWrapper;
|
use crate::hid_wrapper::HidWrapper;
|
||||||
|
|
||||||
pub struct RGBController {
|
pub struct RGBController {
|
||||||
@@ -207,7 +207,7 @@ impl RGBController {
|
|||||||
pub fn set_effect(
|
pub fn set_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
effect: Effects,
|
effect: Effects,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
full_color: bool,
|
full_color: bool,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
@@ -257,7 +257,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_static_effect(
|
pub fn set_static_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
) -> Result<(), HidWrapperError> {
|
) -> Result<(), HidWrapperError> {
|
||||||
@@ -274,7 +274,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_single_off_effect(
|
pub fn set_single_off_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -292,7 +292,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_single_on_effect(
|
pub fn set_single_on_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -310,7 +310,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_glittering_effect(
|
pub fn set_glittering_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -328,7 +328,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_rain_effect(
|
pub fn set_rain_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -346,7 +346,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_colorful_effect(
|
pub fn set_colorful_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -364,7 +364,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_breath_effect(
|
pub fn set_breath_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -387,7 +387,7 @@ impl RGBController {
|
|||||||
) -> Result<(), HidWrapperError> {
|
) -> Result<(), HidWrapperError> {
|
||||||
self.set_effect(
|
self.set_effect(
|
||||||
Effects::Spectrum,
|
Effects::Spectrum,
|
||||||
Rgb::default(),
|
Color::default(),
|
||||||
false,
|
false,
|
||||||
brightness,
|
brightness,
|
||||||
speed,
|
speed,
|
||||||
@@ -398,7 +398,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_centrifugal_wave_effect(
|
pub fn set_centrifugal_wave_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -416,7 +416,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_vertical_wave_effect(
|
pub fn set_vertical_wave_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
direction: u8,
|
direction: u8,
|
||||||
@@ -435,7 +435,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_horizontal_wave_effect(
|
pub fn set_horizontal_wave_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
direction: u8,
|
direction: u8,
|
||||||
@@ -454,7 +454,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_rotating_effect(
|
pub fn set_rotating_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -472,7 +472,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_explosion_effect(
|
pub fn set_explosion_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -490,7 +490,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_launch_effect(
|
pub fn set_launch_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -508,7 +508,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_ripples_effect(
|
pub fn set_ripples_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -526,7 +526,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_snake_effect(
|
pub fn set_snake_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -544,7 +544,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_pulse_effect(
|
pub fn set_pulse_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -562,7 +562,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_tilt_effect(
|
pub fn set_tilt_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -580,7 +580,7 @@ impl RGBController {
|
|||||||
|
|
||||||
pub fn set_shuttle_effect(
|
pub fn set_shuttle_effect(
|
||||||
&mut self,
|
&mut self,
|
||||||
rgb: Rgb,
|
rgb: Color,
|
||||||
brightness: u8,
|
brightness: u8,
|
||||||
speed: u8,
|
speed: u8,
|
||||||
full_color: Option<bool>,
|
full_color: Option<bool>,
|
||||||
@@ -603,7 +603,7 @@ impl RGBController {
|
|||||||
) -> Result<(), HidWrapperError> {
|
) -> Result<(), HidWrapperError> {
|
||||||
self.set_effect(
|
self.set_effect(
|
||||||
Effects::StaticPerKey,
|
Effects::StaticPerKey,
|
||||||
Rgb::default(),
|
Color::default(),
|
||||||
false,
|
false,
|
||||||
brightness,
|
brightness,
|
||||||
1,
|
1,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::rgb::Rgb;
|
use crate::color::Color;
|
||||||
|
|
||||||
pub enum KeymapKeys {
|
pub enum KeymapKeys {
|
||||||
Escape,
|
Escape,
|
||||||
@@ -237,11 +237,11 @@ impl Default for Keymap {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl 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();
|
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];
|
self.map = [color.to_array(); 144];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user