fix nonascii characters and dvorak and german layouts

Author: Neradoc

libraries/keyboard_layout.py

@@ -92,7 +92,7 @@ def keycodes(self, char):
 
         return codes
 
-    def _above128charval_to_keycode(self, char_val):
+    def _above128char_to_keycode(self, char):
         """Return keycode for above 128 ascii codes.
 
         Since the values are sparse, this may be more space efficient than bloating the table above
@@ -101,12 +101,15 @@ def _above128charval_to_keycode(self, char_val):
         :param char_val: ascii char value
         :return: keycode, with modifiers if needed
         """
-        if char_val in self.HIGHER_ASCII:
-            return self.HIGHER_ASCII[char_val]
-        if ord(char_val) in self.HIGHER_ASCII:
-            return self.HIGHER_ASCII[char_val]
+        if char in self.HIGHER_ASCII:
+            return self.HIGHER_ASCII[char]
+        if ord(char) in self.HIGHER_ASCII:
+            return self.HIGHER_ASCII[ord(char)]
 
-        raise ValueError("Unsupported non-ASCII character \\x{}.".format(ord(char_val)))
+        raise ValueError(
+            "Unsupported non-ASCII character {} \\x{}."
+            .format(str(char), ord(char))
+        )
 
     def _char_to_keycode(self, char):
         """Return the HID keycode for the given ASCII character, with the SHIFT_FLAG possibly set.
@@ -115,9 +118,12 @@ def _char_to_keycode(self, char):
         You must clear this bit before passing the keycode in a USB report.
         """
         char_val = ord(char)
-        if char_val > 128:
-            return self._above128charval_to_keycode(char)
+        if char_val > len(self.ASCII_TO_KEYCODE):
+            return self._above128char_to_keycode(char)
         keycode = self.ASCII_TO_KEYCODE[char_val]
         if keycode == 0:
-            raise ValueError("No keycode available for character.")
+            raise ValueError(
+                "No keycode available for character {} \\x{}."
+                .format(str(char), char_val)
+            )
         return keycode

libraries/keyboard_layout_us_dvo.py

@@ -90,7 +90,7 @@ class KeyboardLayoutWinDeDe(KeyboardLayout):
         b"\xa7"     # =
         b"\xe4"     # >
         b"\xad"     # ?
-        b"\x14",      # @
+        b"\x14"      # @
         b"\x84"     # A
         b"\x85"     # B
         b"\x86"     # C
@@ -117,9 +117,9 @@ class KeyboardLayoutWinDeDe(KeyboardLayout):
         b"\x9b"     # X
         b"\x9d"     # Y
         b"\x9c"     # Z
-        b"\x25",      # [
-        b"\x2d",      # bslash \
-        b"\x26",      # ]
+        b"\x25"      # [
+        b"\x2d"      # bslash \
+        b"\x26"      # ]
         b"\x35"                         # ^
         b"\xb8"     # _
         b"\xae"     # `
@@ -149,10 +149,10 @@ class KeyboardLayoutWinDeDe(KeyboardLayout):
         b"\x1b"                         # x
         b"\x1d"                         # y
         b"\x1c"                         # z
-        b"\x24",      # {
-        b"\x64",      # |
-        b"\x27",      # }
-        b"\x30",      # ~
+        b"\x24"      # {
+        b"\x64"      # |
+        b"\x27"      # }
+        b"\x30"      # ~
         b"\x4c"				            # DEL
         b"\x00" # [NOT printable] in some docs shown as € symbol, but not so in python
         b"\x00" # [not printable]
@@ -204,10 +204,10 @@ class KeyboardLayoutWinDeDe(KeyboardLayout):
         b"\x00" # ¯
         b"\xb5"     # °
         b"\x00" # ±
-        b"\x1f",      # ²
-        b"\x20",      # ³
+        b"\x1f"      # ²
+        b"\x20"      # ³
         b"\x2e"                         # ´
-        b"\x10",      # µ
+        b"\x10"      # µ
         b"\x00" # ¶
         b"\x00" # ·
         b"\x00" # ¸