From 79650dcc2b5d4d9a8c81a1fc8267d5e0eb27a802 Mon Sep 17 00:00:00 2001
From: Christoffer Martinsson <cm@cmtec.se>
Date: Wed, 5 Jul 2023 19:25:47 +0200
Subject: [PATCH] Code cleanup

---
 rp2040/src/main.rs       | 24 ++++++++++++------------
 rp2040/src/status_led.rs | 18 +++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/rp2040/src/main.rs b/rp2040/src/main.rs
index b3e5a19..b6f9277 100644
--- a/rp2040/src/main.rs
+++ b/rp2040/src/main.rs
@@ -177,9 +177,9 @@ fn main() -> ! {
 
     // Check if esc key is pressed while power on. If yes then enter bootloader
     if button_matrix.buttons_pressed()[0] {
-        status_led.update(StatusMode::BOOTLOADER);
-        let gpio_activity_pin_mask = 0;
-        let disable_interface_mask = 0;
+        status_led.update(StatusMode::Bootloader);
+        let gpio_activity_pin_mask: u32 = 0;
+        let disable_interface_mask: u32 = 0;
         rp2040_hal::rom_data::reset_to_usb_boot(gpio_activity_pin_mask, disable_interface_mask);
     }
 
@@ -193,7 +193,7 @@ fn main() -> ! {
 
             fn_mode = get_fn_mode(pressed_keys);
 
-            if caps_lock_active == false {
+            if !caps_lock_active {
                 update_status_led(&mut status_led, caps_lock_active, gui_lock_active);
             }
             for (index, key) in pressed_keys.iter().enumerate() {
@@ -212,7 +212,7 @@ fn main() -> ! {
                 Err(UsbHidError::Duplicate) => {}
                 Ok(_) => {}
                 Err(e) => {
-                    status_led.update(StatusMode::ERROR);
+                    status_led.update(StatusMode::Error);
                     core::panic!("Failed to write keyboard report: {:?}", e)
                 }
             };
@@ -225,7 +225,7 @@ fn main() -> ! {
                 Err(UsbHidError::WouldBlock) => {}
                 Ok(_) => {}
                 Err(e) => {
-                    status_led.update(StatusMode::ERROR);
+                    status_led.update(StatusMode::Error);
                     core::panic!("Failed to process keyboard tick: {:?}", e)
                 }
             };
@@ -235,7 +235,7 @@ fn main() -> ! {
             match keyboard.device().read_report() {
                 Err(UsbError::WouldBlock) => {}
                 Err(e) => {
-                    status_led.update(StatusMode::ERROR);
+                    status_led.update(StatusMode::Error);
                     core::panic!("Failed to read keyboard report: {:?}", e)
                 }
                 Ok(leds) => {
@@ -267,11 +267,11 @@ fn update_status_led<P, SM, I>(
     SM: StateMachineIndex,
 {
     if caps_lock_active {
-        status_led.update(StatusMode::WARNING);
+        status_led.update(StatusMode::Warning);
     } else if gui_lock_active {
-        status_led.update(StatusMode::ACTIVITY);
+        status_led.update(StatusMode::Activity);
     } else {
-        status_led.update(StatusMode::NORMAL);
+        status_led.update(StatusMode::Normal);
     }
 }
 
@@ -323,7 +323,7 @@ fn get_keyboard_report(
         if key.pressed != key.previous_pressed
             && key.pressed
             && index == layout::GUI_LOCK_BUTTON[0] as usize
-            && *gui_lock_active == false
+            && !(*gui_lock_active)
             && fn_mode == layout::GUI_LOCK_BUTTON[1]
         {
             *gui_lock_active = true;
@@ -345,7 +345,7 @@ fn get_keyboard_report(
             keyboard_report[GUI_REPORT_INDEX] = Keyboard::LeftGUI;
         } else if *gui_lock_trigger_index as usize == index && key.pressed {
             keyboard_report[GUI_REPORT_INDEX] = Keyboard::LeftGUI;
-        } else if *gui_lock_trigger_index as usize == index && key.pressed == false {
+        } else if *gui_lock_trigger_index as usize == index && !key.pressed {
             *gui_lock_active = false;
         }
 
diff --git a/rp2040/src/status_led.rs b/rp2040/src/status_led.rs
index e03e534..d56af7b 100644
--- a/rp2040/src/status_led.rs
+++ b/rp2040/src/status_led.rs
@@ -23,13 +23,13 @@ use ws2812_pio::Ws2812Direct;
 #[allow(dead_code)]
 #[derive(PartialEq, Eq, Copy, Clone)]
 pub enum StatusMode {
-    OFF = 0,
-    NORMAL = 1,
-    ACTIVITY = 2,
-    OTHER = 3,
-    WARNING = 4,
-    ERROR = 5,
-    BOOTLOADER = 6,
+    Off = 0,
+    Normal = 1,
+    Activity = 2,
+    Other = 3,
+    Warning = 4,
+    Error = 5,
+    Bootloader = 6,
 }
 #[warn(dead_code)]
 
@@ -110,12 +110,12 @@ where
             (0, 10, 10).into(), // Purple
         ];
 
-        if mode == StatusMode::WARNING && self.state == false {
+        if mode == StatusMode::Warning && !self.state {
             self.ws2812_direct
                 .write([colors[mode as usize]].iter().copied())
                 .unwrap();
             self.state = true;
-        } else if mode == StatusMode::WARNING || mode == StatusMode::OFF {
+        } else if mode == StatusMode::Warning || mode == StatusMode::Off {
             self.ws2812_direct
                 .write([colors[0]].iter().copied())
                 .unwrap();