rog-aura: Cleanup layouts, add gl504_US.toml

rog-aura/src/key_to_str.rs

@@ -91,6 +91,14 @@ impl From<&Key> for &str {
             Key::M => "M",
             Key::Comma => ",",
             Key::Period => ".",
+            Key::Star => "*",
+            Key::NumPadDel => "Delete",
+            Key::NumPadPlus => "+",
+            Key::NumPadEnter => "Enter",
+            Key::NumPadPause => "Pause",
+            Key::NumPadPrtSc => "Print Screen",
+            Key::NumPadHome => "Home",
+            Key::NumLock => "Num-Lock",
             Key::FwdSlash => "/",
             Key::Rshift => "Right Shift",
             Key::RshiftSmall => "Right Shift",
@@ -112,6 +120,8 @@ impl From<&Key> for &str {
             Key::RAlt => "Right Alt",
             Key::PrtSc => "Print Screen",
             Key::RCtrl => "Right Control",
+            Key::RCtrlLarge => "Right Control",
+            Key::Pause => "Pause",
             Key::Up => "Up",
             Key::Down => "Down",
             Key::Left => "Left",

rog-aura/src/keys.rs

@@ -85,6 +85,14 @@ pub enum Key {
     Comma,
     Period,
     FwdSlash,
+    Star,
+    NumPadDel,
+    NumPadPlus,
+    NumPadEnter,
+    NumPadPause,
+    NumPadPrtSc,
+    NumPadHome,
+    NumLock,
     Rshift,
     RshiftSmall,
     Rshift3_1,
@@ -102,9 +110,11 @@ pub enum Key {
     Space5_3,
     Space5_4,
     Space5_5,
+    Pause,
     RAlt,
     PrtSc,
     RCtrl,
+    RCtrlLarge,
     Up,
     Down,
     Left,
@@ -214,7 +224,7 @@ impl KeyShape {
     }
     pub const fn uy(&self) -> f32 {
         match self {
-            Self::Func => 0.8,
+            Self::Func | Self::RowEndSpacer => 0.8,
             Self::FuncBlank => 0.8,
             Self::FuncSpacer => 0.8,
             Self::Arrow | Self::ArrowBlank | Self::ArrowSpacer => 0.6,
@@ -292,7 +302,7 @@ impl From<Key> for KeyShape {
             Key::LCtrlMed => KeyShape::LCtrlMed,
             Key::LShift => KeyShape::LShift,
 
-            Key::Rshift => KeyShape::RShift,
+            Key::Rshift | Key::RCtrlLarge => KeyShape::RShift,
             Key::RshiftSmall => KeyShape::RshiftSmall,
             Key::Rshift3_1 | Key::Rshift3_2 | Key::Rshift3_3 => KeyShape::RShift3,
 
@@ -301,6 +311,10 @@ impl From<Key> for KeyShape {
                 KeyShape::Space5
             }
 
+            Key::NumPadPause | Key::NumPadPrtSc | Key::NumPadHome | Key::NumPadDel => {
+                KeyShape::Func
+            }
+
             Key::NormalBlank => KeyShape::NormalBlank,
             Key::NormalSpacer => KeyShape::NormalSpacer,
 

rog-aura/src/per_key_rgb.rs

@@ -197,6 +197,16 @@ impl KeyColourArray {
             | Key::MediaStop
             | Key::MediaPrev
             | Key::MediaNext
+            | Key::Pause
+            | Key::NumLock
+            | Key::Star
+            | Key::NumPadDel
+            | Key::NumPadPlus
+            | Key::NumPadEnter
+            | Key::NumPadPause
+            | Key::NumPadPrtSc
+            | Key::NumPadHome
+            | Key::RCtrlLarge
             | Key::RowEndSpacer => return None,
             Key::Fan | Key::Space | Key::BkSpc => return None,
         };