diff --git a/docs/requirements/004-radio-set.md b/docs/requirements/004-radio-set.md index 5d068bc..2a4fea0 100644 --- a/docs/requirements/004-radio-set.md +++ b/docs/requirements/004-radio-set.md @@ -350,8 +350,9 @@ flowchart TD MAYDAY keys SOS as one sign, PAN-PAN "PAN PAN", SÉCURITÉ "SECURITE", broadcast and newsletter CQ, post KA as one sign, and a call the called stations' clear names in place of a prosign, so it keys - ` DE `. Letters are case-folded; Ä, Ö, Ü and the - other accented letters with a Morse code of their own key that code, any + ` DE `. Letters are case-folded; A, O and U with + umlaut and the other accented letters with a Morse code of their own key + that code, any other accented letter keys its base letter, and every other character without a code is skipped. 3. **Speed**: a hub setting `morse.wpm`, whole numbers from 5 to 40, default diff --git a/orchestrator/templates/morse.js b/orchestrator/templates/morse.js index b6e4c92..9a8524c 100644 --- a/orchestrator/templates/morse.js +++ b/orchestrator/templates/morse.js @@ -6,7 +6,8 @@ const Morse = (() => { 0: "-----", 1: ".----", 2: "..---", 3: "...--", 4: "....-", 5: ".....", 6: "-....", 7: "--...", 8: "---..", 9: "----.", ".": ".-.-.-", ",": "--..--", "?": "..--..", "'": ".----.", "!": "-.-.--", "/": "-..-.", "(": "-.--.", ")": "-.--.-", "&": ".-...", ":": "---...", ";": "-.-.-.", "=": "-...-", "+": ".-.-.", "-": "-....-", _: "..--.-", "\"": ".-..-.", $: "...-..-", "@": ".--.-.", - ä: ".-.-", æ: ".-.-", à: ".--.-", å: ".--.-", ç: "-.-..", è: ".-..-", é: "..-..", ñ: "--.--", ö: "---.", ø: "---.", ü: "..--", ß: "...--..", + "\u00e4": ".-.-", æ: ".-.-", à: ".--.-", å: ".--.-", ç: "-.-..", è: ".-..-", é: "..-..", ñ: "--.--", "\u00f6": "---.", ø: "---.", + "\u00fc": "..--", "\u00df": "...--..", }; const UNITS = {dot: 1, dash: 3, inner: 1, letter: 3, word: 7}; const PARIS = 50; diff --git a/tests/test_hub_morse.py b/tests/test_hub_morse.py index 72b2819..1981fb1 100644 --- a/tests/test_hub_morse.py +++ b/tests/test_hub_morse.py @@ -188,7 +188,7 @@ class TestMorseCode(unittest.TestCase): [radio_row("mayday", TEXT), radio_set("morse", ["s1"]), offline], [radio_row("broadcast", "word " * 600), radio_set("morse", []), offline], ] - words = ["PARIS", "paris", "Grüße, Ëva! 😀 ~ À ÿ"] + words = ["PARIS", "paris", "Gr\u00fc\u00dfe, Ëva! 😀 ~ À ÿ"] cls.data = node(CODES_PROBE, str(MORSE), str(RADIOSET), json.dumps({"words": words, "plans": plans})) def test_paris_at_20_wpm_lasts_exactly_50_dot_units_of_60_ms(self): diff --git a/tests/test_lock.py b/tests/test_lock.py index 5e3a598..943154b 100644 --- a/tests/test_lock.py +++ b/tests/test_lock.py @@ -26,7 +26,7 @@ class TestSkillsLock(unittest.TestCase): self.lock = json.loads(LOCK_FILE.read_text(encoding="utf-8")) def test_version_is_supported(self): - self.assertEqual(self.lock.get("version"), 1) + self.assertEqual(self.lock.get("version"), 2) def test_skills_present(self): self.assertTrue(self.lock.get("skills"), "lock holds no skills")