diff --git a/src/lib.rs b/src/lib.rs index f4d91d7..265dae6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,13 @@ mod color; mod hid_wrapper; -mod rgb_controller; mod keymap; +mod rgb_controller; pub use color::Color; pub use hid_wrapper::HidWrapperError; +pub use keymap::{Keymap, KeymapKeys}; pub use rgb_controller::controller::RGBController; pub use rgb_controller::effects::Effects; -pub use keymap::{Keymap, KeymapKeys}; #[cfg(feature = "access_hid_wrapper")] pub use hid_wrapper::HidWrapper; diff --git a/src/rgb_controller/controller.rs b/src/rgb_controller/controller.rs index 0613eed..f35ecf7 100644 --- a/src/rgb_controller/controller.rs +++ b/src/rgb_controller/controller.rs @@ -198,7 +198,7 @@ impl RGBController { Ok(()) } - /// Sets an effect + /// Sets an effect (set_x_effect should be used instead) /// /// # Errors /// ```HidWrapperError::HidApiError``` diff --git a/src/rgb_controller/effect_info.rs b/src/rgb_controller/effect_info.rs index dd807b0..ce2c3c4 100644 --- a/src/rgb_controller/effect_info.rs +++ b/src/rgb_controller/effect_info.rs @@ -8,6 +8,7 @@ pub struct EffectInfo<'a> { can_set_speed: bool, can_set_direction: DirectionPolicy, can_set_full_color: bool, + requires_keymap: bool, } #[allow(dead_code)] @@ -26,6 +27,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: false, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "SingleOn", @@ -34,6 +36,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "SingleOff", @@ -42,6 +45,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Glittering", @@ -50,6 +54,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Rain", @@ -58,14 +63,16 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Colorful", effect: Effects::Colorful, - can_set_color: true, + can_set_color: false, can_set_speed: true, can_set_direction: DirectionPolicy::None, - can_set_full_color: true, + can_set_full_color: false, + requires_keymap: false, }, EffectInfo { name: "Breath", @@ -74,6 +81,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Spectrum", @@ -82,6 +90,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: false, + requires_keymap: false, }, EffectInfo { name: "CentrifugalWave", @@ -90,6 +99,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "VerticalWave", @@ -98,6 +108,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::Vertical23, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "HorizontalWave", @@ -106,6 +117,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::Horizontal01, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Rotating", @@ -114,6 +126,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Explosion", @@ -122,6 +135,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Launch", @@ -130,6 +144,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Ripples", @@ -138,6 +153,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Snake", @@ -146,6 +162,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Pulse", @@ -154,6 +171,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Tilt", @@ -162,6 +180,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "Shuttle", @@ -170,6 +189,7 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: true, can_set_direction: DirectionPolicy::None, can_set_full_color: true, + requires_keymap: false, }, EffectInfo { name: "StaticPerKey", @@ -178,5 +198,6 @@ pub const EFFECTS: [EffectInfo; 20] = [ can_set_speed: false, can_set_direction: DirectionPolicy::None, can_set_full_color: false, + requires_keymap: true, }, ];