From 0a5532acd27877283ea1ad81dff9061a9ce76008 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 13:55:48 +0200 Subject: [PATCH 01/16] Part1 --- pd_key_maps/keymap_de.py | 163 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 pd_key_maps/keymap_de.py diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py new file mode 100644 index 0000000..5e1aebd --- /dev/null +++ b/pd_key_maps/keymap_de.py @@ -0,0 +1,163 @@ +#!/bin/python3 +commap = { + "LCTRL": 1, + "LSHIFT": 2, + "LALT": 4, + "LMETA": 8, + "RCTRL": 16, + "RSHIFT": 32, + "RALT": 64, + "RMETA": 128, +} +c1map = { + "a": 4, + "b": 5, + "c": 6, + "d": 7, + "e": 8, + "f": 9, + "g": 10, + "h": 11, + "i": 12, + "j": 13, + "k": 14, + "l": 15, + "m": 16, + "n": 17, + "o": 18, + "p": 19, + "q": 20, + "r": 21, + "s": 22, + "t": 23, + "u": 24, + "v": 25, + "w": 26, + "x": 27, + "z": 28, + "y": 29, + "1": 30, + "2": 31, + "3": 32, + "4": 33, + "5": 34, + "6": 35, + "7": 36, + "8": 37, + "9": 38, + "0": 39, + "RETURN": 40, + "ESC": 41, + "BACKSPACE": 42, + "TAB": 43, + "SPACE": 44, + "ß": 45, + "´": 46, + "ü": 47, + "+": 48, + "#": 49, + # "#": 50, # Non us only + "ö": 51, + "ä": 52, + "^": 53, + ",": 54, + ".": 55, + "-": 56, + "CAPSLOCK": 57, + "F1": 58, + "F2": 59, + "F3": 60, + "F4": 61, + "F5": 62, + "F6": 63, + "F7": 64, + "F8": 65, + "F9": 66, + "F10": 67, + "F11": 68, + "F12": 69, + "PRINT": 70, + "SCROLLLOCK": 71, + "PAUSE": 72, + "INSERT": 73, + "HOME": 74, + "PAGEUP": 75, + "DELETE": 76, + "END": 77, + "PAGEDOWN": 78, + "RIGHT": 79, + "LEFT": 80, + "DOWN": 81, + "UP": 82, + "NUMLOCK": 83, + # kp-divide:"54", + # kp-multiply:"55", + # kp-minus:"56", + # kp-plus:"57", + # kp-return:"58", + # kp-1:"59", + # kp-2:"5a", + # kp-3:"5b", + # kp-4:"5c", + # kp-5:"5d", + # kp-6:"5e", + # kp-7:"5f", + # kp-8:"60", + # kp-9:"61", + # kp-0:"62", + # kp-period:"63", + # application:"65", + # power:"66", + # kp-equal:"67", + "F13": 104, + "F14": 105, + "F15": 106, + "F16": 107, + "F17": 108, + "F18": 109, + "F19": 110, + "F20": 111, + "F21": 112, + "F22": 113, + "F23": 114, + "F24": 115, + # execute:116, + # help:117, + # menu:118, + # select:119, + # cancel:120, + # redo:121, + # undo:122, + # cut:123, + # copy:124, + # paste:125, + # find:126, + # mute:127, + # volume-up:128, + # volume-down:129, +} +c2map = { + "°": "SHIFT ^", + "!": "SHIFT 1", + '"': "SHIFT 2", + "§": "SHIFT 3", + "$": "SHIFT 4", + "%": "SHIFT 5", + "&": "SHIFT 6", + "/": "SHIFT 7", + "(": "SHIFT 8", + ")": "SHIFT 9", + "=": "SHIFT 0", + "_": "SHIFT -", + "+": "SHIFT =", + "<": "SHIFT ,", + ">": "SHIFT .", + "?": "SHIFT /", + '"': "SHIFT '", + ":": "SHIFT ;", + "{": "SHIFT [", + "}": "SHIFT ]", + "|": "SHIFT \\", +} +for i in range(65, 91): + c2map[chr(i)] = "SHIFT " + chr(i).lower() From 28597529d95cf62c6177a35acc2b70481762f100 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 13:59:28 +0200 Subject: [PATCH 02/16] fix --- pd_key_maps/keymap_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 5e1aebd..bbdbf24 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -153,7 +153,7 @@ "<": "SHIFT ,", ">": "SHIFT .", "?": "SHIFT /", - '"': "SHIFT '", + # '"': "SHIFT '", ":": "SHIFT ;", "{": "SHIFT [", "}": "SHIFT ]", From 28264de808d277e2e2018d263ea5cf7171b901c3 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:03:06 +0200 Subject: [PATCH 03/16] fix2 --- pd_key_maps/keymap_de.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index bbdbf24..01e57d0 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -148,11 +148,11 @@ "(": "SHIFT 8", ")": "SHIFT 9", "=": "SHIFT 0", - "_": "SHIFT -", - "+": "SHIFT =", + "?": "SHIFT ß", + "`": "SHIFT ´", "<": "SHIFT ,", ">": "SHIFT .", - "?": "SHIFT /", + # "?": "SHIFT /", # '"': "SHIFT '", ":": "SHIFT ;", "{": "SHIFT [", From 5524bcbcd023763706099656e28fea7f60306f8c Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:06:09 +0200 Subject: [PATCH 04/16] fix3 --- pd_key_maps/keymap_de.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 01e57d0..98e6aac 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -150,8 +150,9 @@ "=": "SHIFT 0", "?": "SHIFT ß", "`": "SHIFT ´", - "<": "SHIFT ,", - ">": "SHIFT .", + "*": "SHIFT +", + ";": "SHIFT ,", + ":": "SHIFT .", # "?": "SHIFT /", # '"': "SHIFT '", ":": "SHIFT ;", From cc9381ea7a586438a50289af08cb2aef4c8b389c Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:20:41 +0200 Subject: [PATCH 05/16] fix4 --- pd_key_maps/keymap_de.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 98e6aac..1b469bc 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -145,20 +145,24 @@ "%": "SHIFT 5", "&": "SHIFT 6", "/": "SHIFT 7", + "{": "RALT 7", "(": "SHIFT 8", + "[": "RALT 8", ")": "SHIFT 9", + "]": "RALT 9", "=": "SHIFT 0", + "}": "RALT 0", "?": "SHIFT ß", + "\\": "RALT ß", "`": "SHIFT ´", "*": "SHIFT +", + "~": "RALT +", + "'": "SHIFT #", + "_": "SHIFT -", ";": "SHIFT ,", ":": "SHIFT .", - # "?": "SHIFT /", - # '"': "SHIFT '", - ":": "SHIFT ;", - "{": "SHIFT [", - "}": "SHIFT ]", - "|": "SHIFT \\", + ">": "SHIFT <", + "|": "RALT <", } for i in range(65, 91): c2map[chr(i)] = "SHIFT " + chr(i).lower() From 99f9c45ec46b17bd3d7c83c879be44f928752803 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:21:55 +0200 Subject: [PATCH 06/16] try --- pd_key_maps/keymap_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 1b469bc..5f7445f 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -56,7 +56,7 @@ "ü": 47, "+": 48, "#": 49, - # "#": 50, # Non us only + "<": 50, # try "ö": 51, "ä": 52, "^": 53, From f26e84936aa2aeb8cc54756f51a43f1b22eebbeb Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:23:01 +0200 Subject: [PATCH 07/16] fix --- pd_key_maps/keymap_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 5f7445f..1b469bc 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -56,7 +56,7 @@ "ü": 47, "+": 48, "#": 49, - "<": 50, # try + # "#": 50, # Non us only "ö": 51, "ä": 52, "^": 53, From e09d2f76e75461b0bdc4b948cd7d56d49ed2bd89 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:26:30 +0200 Subject: [PATCH 08/16] fix5 --- pd_key_maps/keymap_de.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 1b469bc..1115b6b 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -163,6 +163,9 @@ ":": "SHIFT .", ">": "SHIFT <", "|": "RALT <", + "µ": "RALT µ", + "@": "RALT q", + "€": "RALT e", } for i in range(65, 91): c2map[chr(i)] = "SHIFT " + chr(i).lower() From 7d66f4ee0d9a1af63952b6c6a76533971d1897dc Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:31:17 +0200 Subject: [PATCH 09/16] fix6 --- pd_key_maps/keymap_de.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 1115b6b..1a2cd1d 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -166,6 +166,9 @@ "µ": "RALT µ", "@": "RALT q", "€": "RALT e", + "Ü": "SHIFT ü", + "Ö": "SHIFT ö", + "Ä": "SHIFT ä", } for i in range(65, 91): c2map[chr(i)] = "SHIFT " + chr(i).lower() From 0df774e72303ee3e4ae5f8515eae7e3af48e6a4b Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:49:29 +0200 Subject: [PATCH 10/16] Add CHAR special command --- piduck.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/piduck.py b/piduck.py index 3c2859f..0039620 100755 --- a/piduck.py +++ b/piduck.py @@ -83,6 +83,14 @@ def pharse_p2(line, known, deltrue): elif command[0] in aliasmap: pharse_p2(aliasmap[command[0]] + " " + " ".join(command[1:]), known, True) return + elif command[0] == "CHAR": + if command[1].isdigit(): + known[1].append(command[1]) + if len(command) > 2: + pharse_p2(" ".join(command[2:]), known, True) + else: + out(known) + return else: eprint('Could not find "' + command[0] + '"') exit(2) From 4356fd5a7f7521172d7bca9edcb0026b3923b867 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 14:51:12 +0200 Subject: [PATCH 11/16] fix --- piduck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piduck.py b/piduck.py index 0039620..519e88e 100755 --- a/piduck.py +++ b/piduck.py @@ -85,7 +85,7 @@ def pharse_p2(line, known, deltrue): return elif command[0] == "CHAR": if command[1].isdigit(): - known[1].append(command[1]) + known[1].append(int(command[1])) if len(command) > 2: pharse_p2(" ".join(command[2:]), known, True) else: From 6b04fd40c8cf41dd946d070440315b24c095bf99 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 18:43:50 +0200 Subject: [PATCH 12/16] Emergency error fix --- pd_key_maps/keymap_de.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 1a2cd1d..bfb921d 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -163,7 +163,7 @@ ":": "SHIFT .", ">": "SHIFT <", "|": "RALT <", - "µ": "RALT µ", + "µ": "RALT m", "@": "RALT q", "€": "RALT e", "Ü": "SHIFT ü", From 43e785d12c34c7b8574d9a1528d572404ec682b3 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Thu, 8 Jul 2021 20:36:10 +0200 Subject: [PATCH 13/16] add more special chars --- pd_key_maps/keymap_de.py | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index bfb921d..5841a43 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -138,37 +138,70 @@ } c2map = { "°": "SHIFT ^", + "′": "RALT ^", + "″": "SHIFT RALT ^", "!": "SHIFT 1", + "¹": "RALT 1", + "¡": "SHIFT RALT 1", '"': "SHIFT 2", + "²": "RALT 2", + "⅛": "SHIFT RALT 2", "§": "SHIFT 3", + "³": "RALT 3", + "£": "SHIFT RALT 3", "$": "SHIFT 4", + "¼": "RALT 4", + "¤": "SHIFT RALT 4", "%": "SHIFT 5", + "½": "RALT 5", + "⅜": "SHIFT RALT 5", "&": "SHIFT 6", + "¬": "RALT 6", + "⅝": "SHIFT RALT 6", "/": "SHIFT 7", "{": "RALT 7", + "⅞": "SHIFT RALT 7", "(": "SHIFT 8", "[": "RALT 8", + "™": "SHIFT RALT 9", ")": "SHIFT 9", "]": "RALT 9", + "±": "SHIFT RALT 9", "=": "SHIFT 0", "}": "RALT 0", + # "°": "SHIFT RALT 0", Duplicate "?": "SHIFT ß", "\\": "RALT ß", + "¿": "SHIFT RALT ß", "`": "SHIFT ´", + "¸": "RALT ´", + "˛": "SHIFT RALT ´", "*": "SHIFT +", "~": "RALT +", + "¯": "SHIFT RALT +", "'": "SHIFT #", + "’": "RALT #", + "˘": "SHIFT RALT #", "_": "SHIFT -", + "–": "RALT -", + "—": "SHIFT RALT -", ";": "SHIFT ,", + "·": "RALT ,", + "×": "SHIFT RALT ,", ":": "SHIFT .", + "…": "RALT .", + "÷": "SHIFT RALT .", ">": "SHIFT <", "|": "RALT <", - "µ": "RALT m", - "@": "RALT q", - "€": "RALT e", "Ü": "SHIFT ü", + "¨": "RALT ü", "Ö": "SHIFT ö", + "˝": "RALT ö", "Ä": "SHIFT ä", + "^": "RALT ä", + "µ": "RALT m", + "@": "RALT q", + "€": "RALT e", } for i in range(65, 91): c2map[chr(i)] = "SHIFT " + chr(i).lower() From 27b10e70deb2cdd8919f66478f742175d1f3e773 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:59:52 +0200 Subject: [PATCH 14/16] small fix --- pd_key_maps/keymap_de.py | 2 +- pd_key_maps/keymap_us.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index 5841a43..f29ac64 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -1,4 +1,4 @@ -#!/bin/python3 +#!/usr/bin/env python3 commap = { "LCTRL": 1, "LSHIFT": 2, diff --git a/pd_key_maps/keymap_us.py b/pd_key_maps/keymap_us.py index 73d8125..52623e7 100644 --- a/pd_key_maps/keymap_us.py +++ b/pd_key_maps/keymap_us.py @@ -1,4 +1,4 @@ -#!/bin/python3 +#!/usr/bin/env python3 commap = { "LCTRL": 1, "LSHIFT": 2, From 3b8990ba0df8bcddba4679c34c52c08c706a50e5 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Sat, 14 Aug 2021 12:01:43 +0200 Subject: [PATCH 15/16] Add "<>|" --- pd_key_maps/keymap_de.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pd_key_maps/keymap_de.py b/pd_key_maps/keymap_de.py index f29ac64..01dc1fd 100644 --- a/pd_key_maps/keymap_de.py +++ b/pd_key_maps/keymap_de.py @@ -106,6 +106,7 @@ # kp-9:"61", # kp-0:"62", # kp-period:"63", + "<": 100, # application:"65", # power:"66", # kp-equal:"67", @@ -170,6 +171,8 @@ "=": "SHIFT 0", "}": "RALT 0", # "°": "SHIFT RALT 0", Duplicate + ">": "SHIFT <", + "|": "RALT <", "?": "SHIFT ß", "\\": "RALT ß", "¿": "SHIFT RALT ß", From 1ef2586038f53b8ad315ed4af0804a9b84a63988 Mon Sep 17 00:00:00 2001 From: gitdev-bash <63194733+gitdev-bash@users.noreply.github.com> Date: Sat, 14 Aug 2021 10:13:14 +0000 Subject: [PATCH 16/16] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cdf3107..d3fdba0 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,8 @@ If you want to reinstall or update piduck, please rerun the script. `./install.sh` ## Usage -Syntax of [Ducky-Script-v1][Ducky-Script-v1-Syntax] +Syntax of [Ducky-Script-v1][Ducky-Script-v1-Syntax] with additions: +CHAR: Uses key with the specified hid keyboard id as argument Root is needed (again) ### Using Script File `piduck -i inject.txt`