Created a preset struct

This commit is contained in:
vextrixes committed 2026-07-07 22:58:47 +02:00
1 parent 23fb6f662a
commit 17a8bbe42f
7 files changed
+86 -43

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
#[derive(Default)] #[derive(Default, PartialEq, Debug)]
pub struct Color { pub struct Color {
pub red: u8, pub red: u8,
pub green: u8, pub green: u8,
+1
View File
@@ -11,6 +11,7 @@ pub use rgb_controller::effect_info::{
DirectionPolicy, EFFECTS, EffectInfo, HorizontalDirections, VerticalDirections, DirectionPolicy, EFFECTS, EffectInfo, HorizontalDirections, VerticalDirections,
}; };
pub use rgb_controller::effects::Effects; pub use rgb_controller::effects::Effects;
pub use rgb_controller::preset::Preset;
#[cfg(feature = "access_hid_wrapper")] #[cfg(feature = "access_hid_wrapper")]
pub use hid_wrapper::HidWrapper; pub use hid_wrapper::HidWrapper;
+1
View File
@@ -1,3 +1,4 @@
pub mod controller; pub mod controller;
pub mod effect_info; pub mod effect_info;
pub mod effects; pub mod effects;
pub mod preset;
+23 -23
View File
@@ -2,8 +2,8 @@ use crate::Color;
use crate::Effects; use crate::Effects;
use crate::HidWrapperError; use crate::HidWrapperError;
use crate::Keymap; use crate::Keymap;
use crate::Preset;
use crate::hid_wrapper::HidWrapper; use crate::hid_wrapper::HidWrapper;
use crate::rgb_controller::effects::Effect;
pub struct RGBController { pub struct RGBController {
hid_wrapper: HidWrapper, hid_wrapper: HidWrapper,
@@ -225,7 +225,7 @@ impl RGBController {
speed: u8, speed: u8,
direction: u8, direction: u8,
keymap: Option<[[u8; 3]; 144]>, keymap: Option<[[u8; 3]; 144]>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.hid_wrapper.open_device()?; self.hid_wrapper.open_device()?;
self.prepare_device()?; self.prepare_device()?;
@@ -264,7 +264,7 @@ impl RGBController {
self.hid_wrapper.close_device(); self.hid_wrapper.close_device();
Ok(Effect { Ok(Preset {
effect, effect,
color, color,
full_color, full_color,
@@ -280,7 +280,7 @@ impl RGBController {
color: Color, color: Color,
brightness: u8, brightness: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Static, Effects::Static,
color, color,
@@ -298,7 +298,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::SingleOff, Effects::SingleOff,
color, color,
@@ -316,7 +316,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::SingleOn, Effects::SingleOn,
color, color,
@@ -334,7 +334,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Glittering, Effects::Glittering,
color, color,
@@ -352,7 +352,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Rain, Effects::Rain,
color, color,
@@ -368,7 +368,7 @@ impl RGBController {
&mut self, &mut self,
brightness: u8, brightness: u8,
speed: u8, speed: u8,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Colorful, Effects::Colorful,
Color::default(), Color::default(),
@@ -386,7 +386,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Breath, Effects::Breath,
color, color,
@@ -402,7 +402,7 @@ impl RGBController {
&mut self, &mut self,
brightness: u8, brightness: u8,
speed: u8, speed: u8,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Spectrum, Effects::Spectrum,
Color::default(), Color::default(),
@@ -420,7 +420,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::CentrifugalWave, Effects::CentrifugalWave,
color, color,
@@ -439,7 +439,7 @@ impl RGBController {
speed: u8, speed: u8,
direction: u8, direction: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::VerticalWave, Effects::VerticalWave,
color, color,
@@ -458,7 +458,7 @@ impl RGBController {
speed: u8, speed: u8,
direction: u8, direction: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::HorizontalWave, Effects::HorizontalWave,
color, color,
@@ -476,7 +476,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Rotating, Effects::Rotating,
color, color,
@@ -494,7 +494,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Explosion, Effects::Explosion,
color, color,
@@ -512,7 +512,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Launch, Effects::Launch,
color, color,
@@ -530,7 +530,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Ripples, Effects::Ripples,
color, color,
@@ -548,7 +548,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Snake, Effects::Snake,
color, color,
@@ -566,7 +566,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Pulse, Effects::Pulse,
color, color,
@@ -584,7 +584,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Tilt, Effects::Tilt,
color, color,
@@ -602,7 +602,7 @@ impl RGBController {
brightness: u8, brightness: u8,
speed: u8, speed: u8,
full_color: Option<bool>, full_color: Option<bool>,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::Shuttle, Effects::Shuttle,
color, color,
@@ -618,7 +618,7 @@ impl RGBController {
&mut self, &mut self,
brightness: u8, brightness: u8,
keymap: Keymap, keymap: Keymap,
) -> Result<Effect, HidWrapperError> { ) -> Result<Preset, HidWrapperError> {
self.set_effect( self.set_effect(
Effects::StaticPerKey, Effects::StaticPerKey,
Color::default(), Color::default(),
+9 -7
View File
@@ -1,15 +1,17 @@
use crate::Effects; use crate::Effects;
#[derive(Clone)]
pub struct EffectInfo<'a> { pub struct EffectInfo<'a> {
name: &'a str, pub name: &'a str,
effect: Effects, pub effect: Effects,
can_set_color: bool, pub can_set_color: bool,
can_set_speed: bool, pub can_set_speed: bool,
can_set_direction: DirectionPolicy, pub can_set_direction: DirectionPolicy,
can_set_full_color: bool, pub can_set_full_color: bool,
requires_keymap: bool, pub requires_keymap: bool,
} }
#[derive(PartialEq, Clone)]
pub enum DirectionPolicy { pub enum DirectionPolicy {
None, None,
Horizontal01, Horizontal01,
+2 -12
View File
@@ -4,10 +4,10 @@ use Effects::{
VerticalWave, VerticalWave,
}; };
use crate::Color;
/// Effects of the keyboard /// Effects of the keyboard
#[derive(Clone, Default, PartialEq, Debug)]
pub enum Effects { pub enum Effects {
#[default]
Static, Static,
SingleOn, SingleOn,
SingleOff, SingleOff,
@@ -83,13 +83,3 @@ impl Effects {
} }
} }
} }
pub struct Effect {
pub effect: Effects,
pub color: Color,
pub full_color: bool,
pub brightness: u8,
pub speed: u8,
pub direction: u8,
pub keymap: Option<[[u8; 3]; 144]>,
}
+49
View File
@@ -0,0 +1,49 @@
use crate::Color;
use crate::Effects;
#[derive(PartialEq, Debug)]
pub struct Preset {
pub effect: Effects,
pub color: Color,
pub full_color: bool,
pub brightness: u8,
pub speed: u8,
pub direction: u8,
pub keymap: Option<[[u8; 3]; 144]>,
}
impl Preset {
pub fn new(
effect: Effects,
color: Color,
full_color: bool,
brightness: u8,
speed: u8,
direction: u8,
keymap: Option<[[u8; 3]; 144]>,
) -> Self {
Self {
effect,
color,
full_color,
brightness: brightness.clamp(0, 16),
speed: speed.clamp(1, 16),
direction: direction.clamp(0, 3),
keymap,
}
}
}
impl Default for Preset {
fn default() -> Self {
Self::new(
Default::default(),
Default::default(),
Default::default(),
Default::default(),
Default::default(),
Default::default(),
Default::default(),
)
}
}