Backend: don't handle QMK features on non-QMK board

Author: ids1024

backend/src/keycode.rs

@@ -127,6 +127,7 @@ impl std::fmt::Display for Keycode {
                         write!(f, " | ")?;
                     }
                     write!(f, "{}", mod_name)?;
+                    has_mod = true;
                 }
                 if !(scancode_name == "NONE" && has_mod) {
                     write!(f, "{}", scancode_name)?;
@@ -140,6 +141,7 @@ impl std::fmt::Display for Keycode {
                         write!(f, " | ")?;
                     }
                     write!(f, "{}", mod_name)?;
+                    has_mod = true;
                 }
                 write!(f, ", {})", scancode_name)?;
             }

backend/src/layout/mod.rs

@@ -140,35 +140,36 @@ impl Layout {
 
     /// Get the scancode number corresponding to a name
     pub fn scancode_to_name(&self, scancode: u16) -> Option<Keycode> {
-        // XXX only on QMK?
-        if scancode >= QK_MOD_TAP && scancode <= QK_MOD_TAP_MAX {
-            let mods = Mods::from_bits((scancode >> 8) & 0x1f)?;
-            let kc = scancode & 0xff;
-            let kc_name = self.scancode_names.get(&kc)?;
-            Some(Keycode::MT(mods, kc_name.clone()))
-        } else if scancode >= QK_LAYER_TAP && scancode <= QK_LAYER_TAP_MAX {
-            let layer = ((scancode >> 8) & 0xf) as u8;
-            let kc = scancode & 0xff;
-            let kc_name = self.scancode_names.get(&kc)?;
-            Some(Keycode::LT(layer, kc_name.clone()))
-        } else if scancode >= QK_MODS && scancode <= QK_MODS_MAX {
-            let mods = Mods::from_bits((scancode >> 8) & 0x1f)?;
-            let kc = scancode & 0xff;
-            let kc_name = self.scancode_names.get(&kc)?;
-            Some(Keycode::Basic(mods, kc_name.clone()))
-        } else {
-            let kc_name = self.scancode_names.get(&scancode)?;
-            if let Some(mods) = Mods::from_mod_str(kc_name) {
-                Some(Keycode::Basic(mods, "NONE".to_string()))
-            } else {
-                Some(Keycode::Basic(Mods::empty(), kc_name.clone()))
+        if self.meta.is_qmk {
+            if scancode >= QK_MOD_TAP && scancode <= QK_MOD_TAP_MAX {
+                let mods = Mods::from_bits((scancode >> 8) & 0x1f)?;
+                let kc = scancode & 0xff;
+                let kc_name = self.scancode_names.get(&kc)?;
+                return Some(Keycode::MT(mods, kc_name.clone()));
+            } else if scancode >= QK_LAYER_TAP && scancode <= QK_LAYER_TAP_MAX {
+                let layer = ((scancode >> 8) & 0xf) as u8;
+                let kc = scancode & 0xff;
+                let kc_name = self.scancode_names.get(&kc)?;
+                return Some(Keycode::LT(layer, kc_name.clone()));
+            } else if scancode >= QK_MODS && scancode <= QK_MODS_MAX {
+                let mods = Mods::from_bits((scancode >> 8) & 0x1f)?;
+                let kc = scancode & 0xff;
+                let kc_name = self.scancode_names.get(&kc)?;
+                return Some(Keycode::Basic(mods, kc_name.clone()));
             }
         }
+        let kc_name = self.scancode_names.get(&scancode)?;
+        if let Some(mods) = Mods::from_mod_str(kc_name) {
+            Some(Keycode::Basic(mods, "NONE".to_string()))
+        } else {
+            Some(Keycode::Basic(Mods::empty(), kc_name.clone()))
+        }
     }
 
     /// Get the name corresponding to a scancode number
     pub fn scancode_from_name(&self, name: &Keycode) -> Option<u16> {
         match name {
+            Keycode::MT(_, _) | Keycode::LT(_, _) if !self.meta.is_qmk => None,
             Keycode::MT(mods, keycode_name) => {
                 let kc = *self.keymap.get(keycode_name)?;
                 Some(QK_MOD_TAP | (mods.bits() << 8) | (kc & 0xff))
@@ -189,8 +190,12 @@ impl Layout {
                         return self.keymap.get(mod_name).copied();
                     }
                 }
-                let kc = *self.keymap.get(keycode_name)?;
-                Some((mods.bits() << 8) | (kc & 0xff))
+                if self.meta.is_qmk {
+                    let kc = *self.keymap.get(keycode_name)?;
+                    Some((mods.bits() << 8) | (kc & 0xff))
+                } else {
+                    None
+                }
             }
         }
     }