Updated. /JL

morsekode/vis_morse/main.py

@@ -30,13 +30,14 @@ morse = {
 
 tegn_skiller = "/"
 ord_skiller = "//"
+stop = "$"
 
 prik = 200 # tid, i millisekunder
 streg = prik * 3 # 600 millisekunder
 bogstav = streg # 600 millisekunder pause
 ord = prik * 7 # 1.4 sekund pause
 
-test_ord = "coding pirates rules"
+test_ord = "er$"
 
 running = True
 
@@ -46,27 +47,22 @@ def alfa_2_morse(tegn):
 def morse_2_alfa(kode):
     return morse[kode]
 
-def vis_prik():
+def vis_prik(t):
-    display.set_pixel(2, 2, 9)
+    display.show(t)
     sleep(prik)
     display.clear()
 
-def vis_streg():
+def vis_streg(t):
-    display.set_pixel(2, 2, 9)
+    display.show(t)
     sleep(streg)
     display.clear()
     
 # Code in a 'while True:' loop repeats forever
 while running:
     for t in test_ord:
-        if t == " ":
+        if t == "$":
-            sleep(ord)
+            running = False
             continue
-        mors = alfa_2_morse(t)
+        m = alfa_2_morse(t)
-        for k in mors:
+        vis_prik(m) if m == "." else vis_streg(m)
-            if k == ".":
+        sleep(bogstav)
-                vis_prik()
-            elif k == "-":
-                vis_streg()
-        sleep(bogstav)
-    running = False