변경된 인터럽트 프로토콜에 따라서 파이썬 코드 변경 (oprom modules)

Author: EcmaXp

src/modules/_boot.py

@@ -1,4 +1,8 @@
-from handler import print_handler, signal_handler
+import machine
+from handler import print_handler, signal_handler, input_handler
+machine.interrupt_hook(signal_handler)
+machine.input_hook(input_handler)
+machine.print_hook(print_handler)
 
 __all__ = ["print_handler", "signal_handler"]
 del __all__

src/modules/component.py

@@ -59,10 +59,13 @@ def scroll(self):
         self.gpu.copy(1, 2, self.widthSize, self.heightSize, 0, - 1)
         self.gpu.fill(1, self.heightSize, self.widthSize, 1, " ")
 
+    def put(self, buf: str):
+        for char in buf:
+            self.putChar(char)
+
     def putChar(self, char):
-        if char == "\r":
-            self.widthPos = 1
         if char == "\n":
+            self.widthPos = 1
             self.heightPos += 1
 
         if self.widthPos > self.widthSize:

src/modules/handler.py

@@ -1,6 +1,4 @@
-import micropython
-from machine import signal as pop_signal, set_stdin_char, debug
-import ujson
+from machine import signal as pop_signal, debug
 
 from component import Component, Monitor, devices
 
@@ -12,51 +10,49 @@
 monitor = Monitor(gpu)
 gpu.fill(1, 1, monitor.widthSize, monitor.heightSize, " ")
 
+buf = []
+
+
+def input_handler():
+    while not buf:
+        signal_handler()
+
+    return int(buf.pop(0))
+
 
 def print_handler(buf):
     try:
-        for char in buf:
-            monitor.putChar(char)
+        monitor.put(buf)
     except BaseException as e:
-        debug("exc%s: %s" % (type(e).__name__ , e))
+        debug("print_handler exc =? %s: %s" % (type(e).__name__, e))
 
 
-def signal_handler(_):
-    micropython.schedule(signal_handle, None)
-
-
-def signal_handle(_):
+def signal_handler():
     DEBUG = False
-    while True:
-        try:
-            # TODO: sleeping is possble with ticks=n
-            #       sleeping with some ticks but signal available then resume computer and give signal
-            #       ExecutionResult.Sleep(inf) => when signal is available then return signal
-            signal = pop_signal()
-            # debug("check signal " + repr(signal))
-            if not signal:
-                break
-
-            debug(ujson.dumps(signal) + '\n')
-
-            name, args = signal  # type: str, tuple
-            if name == "key_down" and len(args) >= 4:
-                # when redirectKeyEvent set then never called
-                _, char, _, _, *_ = args
-                set_stdin_char(int(char))
-            elif name == "clipboard" and len(args) >= 3:
-                _, value, _, *_ = args
-                for char in value:
-                    set_stdin_char(ord(char))
-            elif name == "key_up" and len(args) >= 4:
-                pass
-            elif name == "component_added" and len(args) >= 2:
-                if DEBUG:
-                    debug("signal", name, args, len(args))
-                address, device_type, *_ = args
-                devices[device_type] = Component(address, device_type)
-            else:
-                if DEBUG:
-                    debug("signal", name, args, len(args))
-        except BaseException as e:
-            debug("exc%s: %s" % (type(e).__name__ , e))
+    try:
+        signal = pop_signal(20)
+        if signal is None:
+            return
+
+        # debug(ujson.dumps(signal) + '\n')
+        name, args = signal  # type: str, tuple
+        if name == "key_down" and len(args) >= 4:
+            # when redirectKeyEvent set then never called
+            _, char, _, _, *_ = args
+            buf.append(char)
+        elif name == "clipboard" and len(args) >= 3:
+            _, value, _, *_ = args
+            # for char in value:
+            #     set_stdin_char(ord(char))
+        elif name == "key_up" and len(args) >= 4:
+            pass
+        elif name == "component_added" and len(args) >= 2:
+            if DEBUG:
+                debug("signal", name, args, len(args))
+            address, device_type, *_ = args
+            devices[device_type] = Component(address, device_type)
+        else:
+            if DEBUG:
+                debug("signal", name, args, len(args))
+    except BaseException as e:
+        debug("signal_handler exc => %s: %s" % (type(e).__name__, e))