From f1238a788a664ae2756d9b63d199149a43c284c9 Mon Sep 17 00:00:00 2001 From: Juan Ezquerro LLanes Date: Tue, 18 Apr 2017 17:38:40 +0200 Subject: [PATCH 1/3] support uppercase --- ducky/RaspiDucky/DuckyScript.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ducky/RaspiDucky/DuckyScript.py b/ducky/RaspiDucky/DuckyScript.py index 91b5425..75c7d33 100644 --- a/ducky/RaspiDucky/DuckyScript.py +++ b/ducky/RaspiDucky/DuckyScript.py @@ -49,8 +49,10 @@ def _parse_cmd(self, cmd): return "escape" elif (cmd[0] == "PRINTSCREEN"): return "print" + elif cmd[0].isupper(): + return "left-shift " + cmd[0].lower() else: - return cmd[0].lower() + return cmd[0] def run(self, cmd): if (cmd[0] == "STRING"): From 2de616a1d1da52531fa92cd92eaa361254c71ee9 Mon Sep 17 00:00:00 2001 From: arrase Date: Wed, 19 Apr 2017 18:37:23 +0200 Subject: [PATCH 2/3] fix --- ducky/RaspiDucky/DuckyScript.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ducky/RaspiDucky/DuckyScript.py b/ducky/RaspiDucky/DuckyScript.py index 75c7d33..d74d300 100644 --- a/ducky/RaspiDucky/DuckyScript.py +++ b/ducky/RaspiDucky/DuckyScript.py @@ -18,7 +18,10 @@ def _getKBCode(self, char): try: return kb.KEYBOARD_LAYOUT[char] except KeyError: - return char.lower() + if char.isupper(): + return "left-shift " + char.lower() + else: + return char.lower() def _exec_code(self, code, code_type="keyboard"): p1 = subprocess.Popen(["echo", code], stdout=subprocess.PIPE) @@ -49,10 +52,8 @@ def _parse_cmd(self, cmd): return "escape" elif (cmd[0] == "PRINTSCREEN"): return "print" - elif cmd[0].isupper(): - return "left-shift " + cmd[0].lower() else: - return cmd[0] + return cmd[0].lower() def run(self, cmd): if (cmd[0] == "STRING"): From 3f41c4bc81220b5839c23a73a0f0fbbcc7e7bdd5 Mon Sep 17 00:00:00 2001 From: arrase Date: Wed, 19 Apr 2017 18:55:06 +0200 Subject: [PATCH 3/3] fix --- ducky/RaspiDucky/DuckyScript.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ducky/RaspiDucky/DuckyScript.py b/ducky/RaspiDucky/DuckyScript.py index d74d300..c60b60a 100644 --- a/ducky/RaspiDucky/DuckyScript.py +++ b/ducky/RaspiDucky/DuckyScript.py @@ -63,10 +63,10 @@ def run(self, cmd): self._exec_code(self._getKBCode(c)) elif (cmd[0] == "DELAY"): self._last_cmd = "UNS" - sleep(float(cmd[1]) / 1000000.0) + sleep(float(cmd[1]) / 1000.0) elif cmd[0] in ["DEFAULTDELAY", "DEFAULT_DELAY"]: self._last_cmd = "UNS" - self._def_delay = float(cmd[1]) / 1000000.0 + self._def_delay = float(cmd[1]) / 1000.0 elif (cmd[0] == "REM"): self._last_cmd = "REM" print(cmd[1])