From 483f9cc525bf120d68cd8b3ca2e80ecf4109b6da Mon Sep 17 00:00:00 2001
From: Clover Johnson <95094165+callmeclover@users.noreply.github.com>
Date: Thu, 16 May 2024 09:11:44 -0400
Subject: [PATCH] fix issues

---
 src/func.rs  | 4 ++--
 src/lists.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/func.rs b/src/func.rs
index 57d1f46..843dac7 100644
--- a/src/func.rs
+++ b/src/func.rs
@@ -242,7 +242,6 @@ pub async fn main_logic(options: &[(&str, usize)], tts: &mut Tts, enigo: &mut En
 }
 
 #[cfg(feature = "advanced")]
-{
     fn gamepad(gamepad: &mut GamepadInjector, rng: &mut rand::rngs::ThreadRng) {
         let lists: Vec<(Vec<(&str, usize)>, usize)> = vec![
             (GAMEPAD_BUTTONS.to_vec(), 5),
@@ -287,6 +286,7 @@ pub async fn main_logic(options: &[(&str, usize)], tts: &mut Tts, enigo: &mut En
         gamepad.inject();
     }
 
+    #[cfg(feature = "advanced")]
     fn pen(pen: &mut PenInjector, rng: &mut rand::rngs::ThreadRng) {
         let lists: Vec<(Vec<(&str, usize)>, usize)> = vec![
             (PEN_BUTTONS.to_vec(), 5),
@@ -328,6 +328,7 @@ pub async fn main_logic(options: &[(&str, usize)], tts: &mut Tts, enigo: &mut En
         pen.inject();
     }
 
+#[cfg(feature = "advanced")]
 pub async fn main_logic_adv(options: &[(&str, usize)], tts: &mut Tts, enigo: &mut Enigo, gamepadobj: &mut GamepadInjector, penobj: &mut PenInjector) {
     let mut rng: rand::prelude::ThreadRng = thread_rng();
 
@@ -347,5 +348,4 @@ pub async fn main_logic_adv(options: &[(&str, usize)], tts: &mut Tts, enigo: &mu
     }
 
     sleep(Duration::from_millis(1500)).await;
-}
 }
\ No newline at end of file
diff --git a/src/lists.rs b/src/lists.rs
index f63b39c..93dbc55 100644
--- a/src/lists.rs
+++ b/src/lists.rs
@@ -239,14 +239,14 @@ pub static PEN_BUTTONS: [(&str, usize); 3] = [
 ];
 
 #[allow(dead_code)]
-pub static PEN_MOVE: [(&str, usize); 2] = [
+pub static PEN_MOVE: [(&str, usize); 3] = [
     ("XY_Move", 2),
     ("X_Move", 1),
     ("Y_Move", 1)
 ];
 
 #[allow(dead_code)]
-pub static PEN_SPECIAL: [(&str, usize); 4] = [
+pub static PEN_SPECIAL: [(&str, usize); 3] = [
     ("Pressure", 1),
     ("Tilt", 1),
     ("Rotation", 1)