Merge branch 'main' into 'devel'

Add custom image and gif support for G835L with other minor fixes

See merge request asus-linux/asusctl!249

CHANGELOG.md

@@ -5,8 +5,6 @@
 ### Changes
 - Improve the notification area, @shevchenko0013 strikes again!
 - Improve firmware attributes handling
-- Very good looking UI restyling from @shevchenko0013
-- Added support for GA402NV matrix: thanks @Ghoul4500
 
 ## [6.3.1]
 

asusd/src/asus_armoury.rs

@@ -211,24 +211,17 @@ impl crate::Reloadable for AsusArmouryAttribute {
             }
         };
 
-        match apply_value {
-            AttrValue::None => {
-                info!(
-                    "No saved value for attribute {}: skipping.",
-                    self.attr.name()
-                );
-            }
-            _ => {
-                info!("Applying value {apply_value:?} to attribute {name}");
-                self.attr.set_current_value(&apply_value).map_err(|e| {
-                    error!("Could not set {name} value: {e:?}");
-                    self.attr.base_path_exists();
-                    e
-                })?;
+        self.attr.set_current_value(&apply_value).map_err(|e| {
+            error!("Could not set {} value: {e:?}", self.attr.name());
+            self.attr.base_path_exists();
+            e
+        })?;
 
-                info!("Restored asus-armoury setting {name} to {apply_value:?}");
-            }
-        }
+        info!(
+            "Restored asus-armoury setting {} to {:?}",
+            self.attr.name(),
+            apply_value
+        );
 
         Ok(())
     }

rog-anime/src/data.rs

@@ -96,10 +96,7 @@ impl AnimeType {
         let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase();
         if board_name.contains("GA401I") || board_name.contains("GA401Q") {
             AnimeType::GA401
-        } else if board_name.contains("GA402R")
-            || board_name.contains("GA402X")
-            || board_name.contains("GA402N")
-        {
+        } else if board_name.contains("GA402R") || board_name.contains("GA402X") {
             AnimeType::GA402
         } else if board_name.contains("GU604V") {
             AnimeType::GU604

rog-anime/src/usb.rs

@@ -247,10 +247,7 @@ pub fn get_anime_type() -> AnimeType {
 
     if board_name.contains("GA401I") || board_name.contains("GA401Q") {
         AnimeType::GA401
-    } else if board_name.contains("GA402R")
-        || board_name.contains("GA402X")
-        || board_name.contains("GA402N")
-    {
+    } else if board_name.contains("GA402R") || board_name.contains("GA402X") {
         AnimeType::GA402
     } else if board_name.contains("GU604V") {
         AnimeType::GU604