Updating instructions for adding keyboard layouts

README.md

@@ -20,13 +20,13 @@
 
 Install and have your USB Rubber Ducky working in less than 5 minutes.
 
-1. Download [CircuitPython for the Raspberry Pi Pico](https://circuitpython.org/board/raspberry_pi_pico/). *Updated to 7.0.0
+1. Download [CircuitPython for the Raspberry Pi Pico](https://circuitpython.org/board/raspberry_pi_pico/).
 
 2. Plug the device into a USB port. It will show up as a removable media device named `RPI-RP2`.
 
 3. Copy the downloaded `.uf2` file to the root of the Pico (`RPI-RP2`). The device will reboot and after a second or so, it will reconnect as `CIRCUITPY`.
 
-4. Download `adafruit-circuitpython-bundle-7.x-mpy-YYYYMMDD.zip` [here](https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest) and extract it outside the device.
+4. Download `adafruit-circuitpython-bundle-6.x-mpy-YYYYMMDD.zip` [here](https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest) and extract it outside the device.
 
 5. Navigate to `lib` in the recently extracted folder and copy `adafruit_hid` to the `lib` folder in your Raspberry Pi Pico.
 
@@ -43,74 +43,9 @@ The easiest way to so is by using a jumper wire between those pins as seen bello
 
 ![Setup mode with a jumper](images/setup-mode.png)
 
-### USB enable/disable mode
+## Adding non-US keybaords
 
-If you need the pico-ducky to not show up as a USB mass storage device for stealth, follow these instructions.  
+Instructions for adding non-US keyboards can be found [here](keyboard-layouts.md).
-Enter setup mode.  
-Copy boot.py to the root of the pico-ducky.  
-Copy your payload script to the pico-ducky.  
-Disconnect the pico from your host PC.
-Connect a jumper wire between pin 18 and pin 20.
-This will prevent the pico-ducky from showing up as a USB drive when plugged into the target computer.  
-Remove the jumper and reconnect to your PC to reprogram.
-The default mode is USB mass storage enabled.   
-
-![USB enable/disable mode](images/usb-boot-mode.png)
-
-### Changing Keyboard Layouts
-
-Copied from [Neradoc/Circuitpython_Keyboard_Layouts](https://github.com/Neradoc/Circuitpython_Keyboard_Layouts/blob/main/PICODUCKY.md)  
-
-#### How to use one of these layouts with the pico-ducky repository.
-
-**Go to the [latest release page](https://github.com/Neradoc/Circuitpython_Keyboard_Layouts/releases/latest), look if your language is in the list.**
-
-#### If your language/layout is in the bundle
-
-Download the `py` zip, named `circuitpython-keyboard-layouts-py-XXXXXXXX.zip`
-
-**NOTE: You can use the mpy version targetting the version of Circuitpython that is on the device, but on Raspberry Pi Pico you don't need it - they only reduce file size and memory use on load, which the pico has plenty of.**
-
-#### If your language/layout is not in the bundle
-
-Try the online generator, it should get you a zip file with the bundles for yout language
-
-https://www.neradoc.me/layouts/
-
-#### Now you have a zip file
-
-#### Find your language/layout in the lib directory
-
-For a language `LANG`, copy the following files from the zip's `lib` folder to the `lib` directory of the board.  
-**DO NOT** modify the adafruit_hid directory. Your files go directly in `lib`.  
-**DO NOT** change the names or extensions of the files. Just pick the right ones.  
-Replace `LANG` with the letters for your language of choice.
-
-- `keyboard_layout.py`
-- `keyboard_layout_win_LANG.py`
-- `keycode_win_LANG.py`
-
-Don't forget to get [the adafruit_hid library](https://github.com/adafruit/Adafruit_CircuitPython_HID/releases/latest).
-
-This is what it should look like **if your language is French for example**.
-
-![CIRCUITPY drive screenshot](https://github.com/Neradoc/Circuitpython_Keyboard_Layouts/raw/main/docs/drive_pico_ducky.png)
-
-#### Modify the pico-ducky code to use your language file:
-
-At the start of the file comment out these lines:
-
-```py
-from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS as KeyboardLayout
-from adafruit_hid.keycode import Keycode
-```
-
-Uncomment these lines:  
-*Replace `LANG` with the letters for your language of choice. The name must match the file (without the py or mpy extension).*
-```py
-from keyboard_layout_win_LANG import KeyboardLayout
-from keycode_win_LANG import Keycode
-```
 
 ## Useful links and resources
 

boot.py

@@ -1,16 +0,0 @@
-from board import *
-import digitalio
-import storage
-
-noStorageStatus = False
-noStoragePin = digitalio.DigitalInOut(GP15)
-noStoragePin.switch_to_input(pull=digitalio.Pull.UP)
-noStorageStatus = not noStoragePin.value
-
-if(noStorageStatus == True):
-    # don't show USB drive to host PC
-    storage.disable_usb_drive()
-    print("Disabling USB drive")
-else:
-    # normal boot
-    print("USB drive enabled")

duckyinpython.py

@@ -1,59 +1,45 @@
 import usb_hid
 from adafruit_hid.keyboard import Keyboard
+kblayout = "DE"
 
-# comment out these lines for non_US keyboards
+if kblayout == "DE":
-from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS as KeyboardLayout
+    from keyboard_layout_win_de import KeyboardLayout
-from adafruit_hid.keycode import Keycode
+    from keycode_win_de import Keycode
-
+elif kblayout == "BR":
-# uncomment these lines for non_US keyboards
+    from keyboard_layout_win_br import KeyboardLayout
-# replace LANG with appropriate language
+    from keycode_win_br import Keycode
-#from keyboard_layout_win_LANG import KeyboardLayout
+else:
-#from keycode_win_LANG import Keycode
+    from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS as KeyboardLayout
-
+    from adafruit_hid.keycode import Keycode
 import time
 import digitalio
 from board import *
 
-duckyCommands = {
+duckyCommands = ["WINDOWS", "GUI", "APP", "MENU", "SHIFT", "ALT", "CONTROL", "CTRL", "DOWNARROW", "DOWN",
-    'WINDOWS': Keycode.WINDOWS, 'GUI': Keycode.GUI,
+"LEFTARROW", "LEFT", "RIGHTARROW", "RIGHT", "UPARROW", "UP", "BREAK", "PAUSE", "CAPSLOCK", "DELETE", "END",
-    'APP': Keycode.APPLICATION, 'MENU': Keycode.APPLICATION, 'SHIFT': Keycode.SHIFT,
+"ESC", "ESCAPE", "HOME", "INSERT", "NUMLOCK", "PAGEUP", "PAGEDOWN", "PRINTSCREEN", "SCROLLLOCK", "SPACE",
-    'ALT': Keycode.ALT, 'CONTROL': Keycode.CONTROL, 'CTRL': Keycode.CONTROL,
+"TAB", "ENTER", " a", " b", " c", " d", " e", " f", " g", " h", " i", " j", " k", " l", " m", " n", " o", " p", " q", " r", " s", " t",
-    'DOWNARROW': Keycode.DOWN_ARROW, 'DOWN': Keycode.DOWN_ARROW, 'LEFTARROW': Keycode.LEFT_ARROW,
+" u", " v", " w", " x", " y", " z", " A", " B", " C", " D", " E", " F", " G", " H", " I", " J", " K", " L", " M", " N", " O", " P",
-    'LEFT': Keycode.LEFT_ARROW, 'RIGHTARROW': Keycode.RIGHT_ARROW, 'RIGHT': Keycode.RIGHT_ARROW,
+" Q", " R", " S", " T", " U", " V", " W", " X", " Y", " Z", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12"]
-    'UPARROW': Keycode.UP_ARROW, 'UP': Keycode.UP_ARROW, 'BREAK': Keycode.PAUSE,
+
-    'PAUSE': Keycode.PAUSE, 'CAPSLOCK': Keycode.CAPS_LOCK, 'DELETE': Keycode.DELETE,
+keycodeCommands = [Keycode.WINDOWS, Keycode.GUI, Keycode.APPLICATION, Keycode.APPLICATION, Keycode.SHIFT, Keycode.ALT, Keycode.CONTROL,
-    'END': Keycode.END, 'ESC': Keycode.ESCAPE, 'ESCAPE': Keycode.ESCAPE, 'HOME': Keycode.HOME,
+Keycode.CONTROL, Keycode.DOWN_ARROW, Keycode.DOWN_ARROW ,Keycode.LEFT_ARROW, Keycode.LEFT_ARROW, Keycode.RIGHT_ARROW, Keycode.RIGHT_ARROW,
-    'INSERT': Keycode.INSERT, 'NUMLOCK': Keycode.KEYPAD_NUMLOCK, 'PAGEUP': Keycode.PAGE_UP,
+Keycode.UP_ARROW, Keycode.UP_ARROW, Keycode.PAUSE, Keycode.PAUSE, Keycode.CAPS_LOCK, Keycode.DELETE, Keycode.END, Keycode.ESCAPE,
-    'PAGEDOWN': Keycode.PAGE_DOWN, 'PRINTSCREEN': Keycode.PRINT_SCREEN, 'ENTER': Keycode.ENTER,
+Keycode.ESCAPE, Keycode.HOME, Keycode.INSERT, Keycode.KEYPAD_NUMLOCK, Keycode.PAGE_UP, Keycode.PAGE_DOWN, Keycode.PRINT_SCREEN,
-    'SCROLLLOCK': Keycode.SCROLL_LOCK, 'SPACE': Keycode.SPACE, 'TAB': Keycode.TAB,
+Keycode.SCROLL_LOCK, Keycode.SPACE, Keycode.TAB, Keycode.ENTER, Keycode.A, Keycode.B, Keycode.C, Keycode.D, Keycode.E, Keycode.F, Keycode.G,
-    'A': Keycode.A, 'B': Keycode.B, 'C': Keycode.C, 'D': Keycode.D, 'E': Keycode.E,
+Keycode.H, Keycode.I, Keycode.J, Keycode.K, Keycode.L, Keycode.M, Keycode.N, Keycode.O, Keycode.P, Keycode.Q, Keycode.R, Keycode.S, Keycode.T,
-    'F': Keycode.F, 'G': Keycode.G, 'H': Keycode.H, 'I': Keycode.I, 'J': Keycode.J,
+Keycode.U, Keycode.V, Keycode.W, Keycode.X, Keycode.Y, Keycode.Z, Keycode.A, Keycode.B, Keycode.C, Keycode.D, Keycode.E, Keycode.F,
-    'K': Keycode.K, 'L': Keycode.L, 'M': Keycode.M, 'N': Keycode.N, 'O': Keycode.O,
+Keycode.G, Keycode.H, Keycode.I, Keycode.J, Keycode.K, Keycode.L, Keycode.M, Keycode.N, Keycode.O, Keycode.P,
-    'P': Keycode.P, 'Q': Keycode.Q, 'R': Keycode.R, 'S': Keycode.S, 'T': Keycode.T,
+Keycode.Q, Keycode.R, Keycode.S, Keycode.T, Keycode.U, Keycode.V, Keycode.W, Keycode.X, Keycode.Y, Keycode.Z,
-    'U': Keycode.U, 'V': Keycode.V, 'W': Keycode.W, 'X': Keycode.X, 'Y': Keycode.Y,
+Keycode.F1, Keycode.F2, Keycode.F3, Keycode.F4, Keycode.F5, Keycode.F6, Keycode.F7, Keycode.F8, Keycode.F9,
-    'Z': Keycode.Z, 'F1': Keycode.F1, 'F2': Keycode.F2, 'F3': Keycode.F3,
+Keycode.F10, Keycode.F11, Keycode.F12]
-    'F4': Keycode.F4, 'F5': Keycode.F5, 'F6': Keycode.F6, 'F7': Keycode.F7,
-    'F8': Keycode.F8, 'F9': Keycode.F9, 'F10': Keycode.F10, 'F11': Keycode.F11,
-    'F12': Keycode.F12,
-}
 
 def convertLine(line):
     newline = []
     print(line)
-    # loop on each key - the filter removes empty values
+    for j in range(len(keycodeCommands)):
-    for key in filter(None, line.split(" ")):
+		    if line.find(duckyCommands[j]) != -1:
-        key = key.upper()
+		    	newline.append(keycodeCommands[j])
-        # find the keycode for the command in the list
-        command_keycode = duckyCommands.get(key, None)
-        if command_keycode is not None:
-            # if it exists in the list, use it
-            newline.append(command_keycode)
-        elif hasattr(Keycode, key):
-            # if it's in the Keycode module, use it (allows any valid keycode)
-            newline.append(getattr(Keycode, key))
-        else:
-            # if it's not a known key name, show the error for diagnosis
-            print(f"Unknown key: <{key}>")
     print(newline)
     return newline
 

keyboard-layouts.md

@@ -0,0 +1,26 @@
+## How to install non-US keyboard layouts
+
+Clone Circuitpython_Keyboard_Layouts  
+`git clone https://github.com/Neradoc/Circuitpython_Keyboard_Layouts`
+
+`cd Circuitpython_Keyboard_Layouts`
+
+Install dependencies  
+`pip3 install -r requirements-modules.txt`
+
+Install build dependencies  
+`pip3 install -r requirements-dev.txt`
+
+Build layouts  
+`python3 build.py`
+
+Copy libraries to pico  
+`cp _build/circuitpython-keyboard-layouts-6.x-mpy-<date>/lib/*.mpy /<Pico mount point>/lib`
+
+Update duckyinpython.py  
+Change  
+`kblayout="US"`  
+to  
+`kblayout="<keyboard layout>"`  
+
+Update `if kblayout ==` block to include the new keyboard layout if not already included