temporarily remove special punctuation

dupontgu · Jul 1, 2022 · 930e92a · 930e92a
1 parent dfb981f
commit 930e92a
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 13 deletions.
diff --git a/fw/core/code.py b/fw/core/code.py
@@ -1,8 +1,8 @@
 import time
 from led import Led
 from t9_keypad import Keypad
-from keyboard import Keyboard
-from keyboard import Keycode
+from t9_keyboard import Keyboard
+from t9_keyboard import Keycode
 from t9_display import Display
 from key_map import key_map
 from character_map import character_map

diff --git a/fw/core/key_map.py b/fw/core/key_map.py
@@ -1 +1 @@
-key_map = {'1':["1"],'2':["a","b","c"],'3':["d","e","f"],'4':["g","h","i"],'5':["j","k","l"],'6':["m","n","o"],'7':["p","q","r","s"],'8':["t","u","v"],'9':["w","x","y","z"],'0':[" ","0","\n"],'#':[".",",","?","!","\u00BF","\u00A1"]}
+key_map = {'1':["1"],'2':["a","b","c"],'3':["d","e","f"],'4':["g","h","i"],'5':["j","k","l"],'6':["m","n","o"],'7':["p","q","r","s"],'8':["t","u","v"],'9':["w","x","y","z"],'0':[" ","0","\n"],'#':[".",",","?","!"]}
diff --git a/fw/macos/keyboard.py → fw/macos/t9_keyboard.py b/fw/macos/keyboard.py → fw/macos/t9_keyboard.py
diff --git a/fw/pico/README.md b/fw/pico/README.md
@@ -5,7 +5,7 @@
     * `adafruit_hid/consumer_control_code.mpy`
     * `adafruit_hid/consumer_control.mpy`
     * `adafruit_hid/gamepad.mpy`
-    * `adafruit_hid/keyboard_layout_us.mpy`
+    * `adafruit_hid/keyboard_layout.mpy` (It may be called `keyboard_layout_us.py` - if so, rename it without the `_us`)
     * `adafruit_hid/keyboard.mpy`
     * `adafruit_hid/keycode.mpy`
     * `adafruit_hid/mouse.mpy`

diff --git a/fw/pico/keyboard.py → fw/pico/t9_keyboard.py b/fw/pico/keyboard.py → fw/pico/t9_keyboard.py
@@ -1,12 +1,12 @@
 import usb_hid
 import adafruit_hid.keyboard
-from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
+from adafruit_hid.keyboard_layout import KeyboardLayout
 import adafruit_hid.keycode
 
 class Keyboard():
     def __init__(self):
         self.keyboard = adafruit_hid.keyboard.Keyboard(usb_hid.devices)
-        self.keyboard_layout = KeyboardLayoutUS(self.keyboard)
+        self.keyboard_layout = KeyboardLayout(self.keyboard)
 
     def press(self, key):
         self.keyboard.press(key)

diff --git a/fw/qtpy2040/README.md b/fw/qtpy2040/README.md
@@ -5,7 +5,7 @@
     * `adafruit_hid/consumer_control_code.mpy`
     * `adafruit_hid/consumer_control.mpy`
     * `adafruit_hid/gamepad.mpy`
-    * `adafruit_hid/keyboard_layout_us.mpy`
+    * `adafruit_hid/keyboard_layout.mpy` (It may be called `keyboard_layout_us.py` - if so, rename it without the `_us`)
     * `adafruit_hid/keyboard.mpy`
     * `adafruit_hid/keycode.mpy`
     * `adafruit_hid/mouse.mpy`

diff --git a/fw/qtpy2040/keyboard.py → fw/qtpy2040/t9_keyboard.py b/fw/qtpy2040/keyboard.py → fw/qtpy2040/t9_keyboard.py
@@ -1,12 +1,12 @@
 import usb_hid
 import adafruit_hid.keyboard
-from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
+from adafruit_hid.keyboard_layout import KeyboardLayout
 import adafruit_hid.keycode
 
 class Keyboard():
     def __init__(self):
         self.keyboard = adafruit_hid.keyboard.Keyboard(usb_hid.devices)
-        self.keyboard_layout = KeyboardLayoutUS(self.keyboard)
+        self.keyboard_layout = KeyboardLayout(self.keyboard)
 
     def press(self, key):
         self.keyboard.press(key)

diff --git a/fw/test/keyboard.py → fw/test/t9_keyboard.py b/fw/test/keyboard.py → fw/test/t9_keyboard.py
diff --git a/fw/tiny2040/README.md b/fw/tiny2040/README.md
@@ -5,7 +5,7 @@
     * `adafruit_hid/consumer_control_code.mpy`
     * `adafruit_hid/consumer_control.mpy`
     * `adafruit_hid/gamepad.mpy`
-    * `adafruit_hid/keyboard_layout_us.mpy`
+    * `adafruit_hid/keyboard_layout.mpy` (It may be called `keyboard_layout_us.py` - if so, rename it without the `_us`)
     * `adafruit_hid/keyboard.mpy`
     * `adafruit_hid/keycode.mpy`
     * `adafruit_hid/mouse.mpy`

diff --git a/fw/tiny2040/keyboard.py → fw/tiny2040/t9_keyboard.py b/fw/tiny2040/keyboard.py → fw/tiny2040/t9_keyboard.py
@@ -1,12 +1,12 @@
 import usb_hid
 import adafruit_hid.keyboard
-from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
+from adafruit_hid.keyboard_layout import KeyboardLayout
 import adafruit_hid.keycode
 
 class Keyboard():
     def __init__(self):
         self.keyboard = adafruit_hid.keyboard.Keyboard(usb_hid.devices)
-        self.keyboard_layout = KeyboardLayoutUS(self.keyboard)
+        self.keyboard_layout = KeyboardLayout(self.keyboard)
 
     def press(self, key):
         self.keyboard.press(key)

diff --git a/fw/win32/keyboard.py → fw/win32/t9_keyboard.py b/fw/win32/keyboard.py → fw/win32/t9_keyboard.py
diff --git a/library_generator/src/main/kotlin/com/dupontgu/t9/Languages.kt b/library_generator/src/main/kotlin/com/dupontgu/t9/Languages.kt
@@ -79,7 +79,7 @@ val globalKeyMap = mapOf(
     '8' to listOf('t', 'u', 'v', 'þ', 'û', 'ü', 'ù', 'ú', 'ū'),
     '9' to listOf('w', 'x', 'y', 'z'),
     '0' to listOf(' ', '0', '\n'),
-    '#' to listOf('.', ',', '?', '!', '¿', '¡')
+    '#' to listOf('.', ',', '?', '!')
 )
 
 // These characters should be available in every language