tweaks & fix examples

s-light · s-light · commit b9b3fddfce5b · 2022-01-04T23:50:29.000+01:00
diff --git a/examples/nonblocking_serialinput_advanced_class.py b/examples/nonblocking_serialinput_advanced_class.py
@@ -40,32 +40,32 @@ def __init__(self):
 
     def userinput_print_help(self):
         """Print Help."""
-        print(
+        text = (
             "you can change some things:\n"
             "- 'tr': toggle print runtime ({runtime_print})\n"
             "- 'time set:???': set print runtime intervall ({runtime_print_intervall: > 7.2f}s)\n"
-            "- 'exit'  stop program\n"
+            "- 'exit'  stop program"
             "".format(
                 runtime_print=self.runtime_print,
                 runtime_print_intervall=self.runtime_print_intervall,
-            ),
-            end="",
+            )
         )
+        self.my_input.print(text)
 
     def userinput_event_handling(self, input_string):
         """Handle user input."""
         if "tr" in input_string:
             self.runtime_print = not self.runtime_print
         if "time set" in input_string:
-            print("time set:")
+            self.my_input.print("time set:")
             value = nb_serialin.parse_value(input_string, "time set")
             if nb_serialin.is_number(value):
                 self.runtime_print_intervall = value
                 self.runtime_print_next = (
                     time.monotonic() + self.runtime_print_intervall
                 )
         if "exit" in input_string:
-            print("Stop Program running.")
+            self.my_input.print("Stop Program running.")
             self.running = False
 
     ##########################################
@@ -78,7 +78,7 @@ def runtime_update(self):
                 self.runtime_print_next = (
                     time.monotonic() + self.runtime_print_intervall
                 )
-                print("{: > 7.2f}s".format(time.monotonic()))
+                self.my_input.print("{: > 7.2f}s".format(time.monotonic()))
                 self.led.value = not self.led.value
 
     def update(self):
@@ -93,7 +93,7 @@ def run(self):
             try:
                 self.update()
             except KeyboardInterrupt as e:
-                print("KeyboardInterrupt - Stop Program.", e)
+                self.my_input.print("KeyboardInterrupt - Stop Program.", e)
                 self.running = False
 
 
@@ -105,7 +105,7 @@ def main():
     """Main."""
     # wait some time untill the computer / terminal is ready
     # for i in range(10):
-    #     print(".", end="")
+    #     self.my_input.print(".", end="")
     #     time.sleep(0.5 / 10)
     print("")
     print(42 * "*")
@@ -115,7 +115,7 @@ def main():
     print(42 * "*")
 
     myproject = MyProjectMainClass()
-    print("run")
+    myproject.my_input.print("run")
     myproject.run()
 
 
diff --git a/examples/nonblocking_serialinput_advanced_statusline.py b/examples/nonblocking_serialinput_advanced_statusline.py
@@ -25,6 +25,8 @@ def __init__(self):
         self.my_input = nb_serialin.NonBlockingSerialInput(
             input_handling_fn=self.userinput_event_handling,
             print_help_fn=self.userinput_print_help,
+            statusline=True,
+            statusline_intervall=1.2,
         )
         self.running = False
 
@@ -33,39 +35,39 @@ def __init__(self):
 
         self.runtime_print = True
         self.runtime_print_next = time.monotonic()
-        self.runtime_print_intervall = 1.0
+        self.runtime_print_intervall = 3.0
 
     ##########################################
     # menu
 
     def userinput_print_help(self):
         """Print Help."""
-        print(
+        text = (
             "you can change some things:\n"
             "- 'tr': toggle print runtime ({runtime_print})\n"
             "- 'time set:???': set print runtime intervall ({runtime_print_intervall: > 7.2f}s)\n"
-            "- 'exit'  stop program\n"
+            "- 'exit'  stop program"
             "".format(
                 runtime_print=self.runtime_print,
                 runtime_print_intervall=self.runtime_print_intervall,
-            ),
-            end="",
+            )
         )
+        self.my_input.print(text)
 
     def userinput_event_handling(self, input_string):
         """Handle user input."""
         if "tr" in input_string:
             self.runtime_print = not self.runtime_print
         if "time set" in input_string:
-            print("time set:")
+            self.my_input.print("time set:")
             value = nb_serialin.parse_value(input_string, "time set")
             if nb_serialin.is_number(value):
                 self.runtime_print_intervall = value
                 self.runtime_print_next = (
                     time.monotonic() + self.runtime_print_intervall
                 )
         if "exit" in input_string:
-            print("Stop Program running.")
+            self.my_input.print("Stop Program running.")
             self.running = False
 
     ##########################################
@@ -78,7 +80,8 @@ def runtime_update(self):
                 self.runtime_print_next = (
                     time.monotonic() + self.runtime_print_intervall
                 )
-                print("{: > 7.2f}s".format(time.monotonic()))
+                self.my_input.print(":-)")
+                self.my_input.print("{: > 7.2f}s".format(time.monotonic()))
                 self.led.value = not self.led.value
 
     def update(self):
@@ -93,7 +96,7 @@ def run(self):
             try:
                 self.update()
             except KeyboardInterrupt as e:
-                print("KeyboardInterrupt - Stop Program.", e)
+                self.my_input.print("KeyboardInterrupt - Stop Program.", e)
                 self.running = False
 
 
@@ -105,7 +108,7 @@ def main():
     """Main."""
     # wait some time untill the computer / terminal is ready
     # for i in range(10):
-    #     print(".", end="")
+    #     self.my_input.print(".", end="")
     #     time.sleep(0.5 / 10)
     print("")
     print(42 * "*")
@@ -115,7 +118,7 @@ def main():
     print(42 * "*")
 
     myproject = MyProjectMainClass()
-    print("run")
+    myproject.my_input.print("run")
     myproject.run()
 
 
diff --git a/examples/nonblocking_serialinput_simpletest_statusline.py b/examples/nonblocking_serialinput_simpletest_statusline.py
@@ -21,9 +21,7 @@
 ##########################################
 # menu
 
-my_input = nb_serialin.NonBlockingSerialInput(
-    statusline=True, echo=False, statusline_intervall=0.5
-)
+my_input = nb_serialin.NonBlockingSerialInput(statusline=True, statusline_intervall=0.2)
 
 ##########################################
 # main
@@ -38,7 +36,7 @@ def main():
     my_input.print(42 * "*")
 
     runtime_print_next = time.monotonic()
-    runtime_print_intervall = 1.7
+    runtime_print_intervall = 1
     running = True
     while running:
         # input handling
@@ -57,7 +55,7 @@ def main():
         # live sign
         if runtime_print_next < time.monotonic():
             runtime_print_next = time.monotonic() + runtime_print_intervall
-            my_input.print("ping")
+            my_input.print(":-)")
             my_input.print("{: > 7.2f}s".format(time.monotonic()))
             led.value = not led.value
 
diff --git a/nonblocking_serialinput.py b/nonblocking_serialinput.py
@@ -32,7 +32,7 @@
 import usb_cdc
 import ansi_escape_code as terminal
 
-__version__ = "0.0.0-auto.0"
+__version__ = "1.0.0-auto.0"
 __repo__ = "https://github.com/s-light/CircuitPython_nonblocking_serialinput.git"
 
 # pylint: disable=too-many-instance-attributes
@@ -142,7 +142,7 @@ def _statusline_fn_default():
 
     def _statusline_update_check_intervall(self):
         """Update the Statusline if intervall is over."""
-        if self.statusline_next_update <= time.monotonic():
+        if self.statusline and self.statusline_next_update <= time.monotonic():
             self.statusline_next_update = time.monotonic() + self.statusline_intervall
             self.print(content=None)
 
@@ -190,8 +190,8 @@ def print(self, *args, content=True):
                     move += terminal.ANSIControl.cursor.previous_line(1)
                 # earease statusline
                 move += terminal.ANSIControl.erase_line(2)
-                if self.echo:
-                    move += terminal.ANSIControl.cursor.next_line(1)
+                # if self.echo:
+                #     move += terminal.ANSIControl.cursor.next_line(1)
             # move += terminal.ANSIControl.cursor.position("1, 1")
             move += terminal.ANSIControl.cursor.horizontal_absolute(1)
             # print("\n\n\n{}\n\n\n".format(repr(move)))
@@ -205,9 +205,13 @@ def print(self, *args, content=True):
             # print statement is finished.
             # now we have to reprint echo & statusline
             if self.statusline:
-                print(self._get_statusline(), end="")
-                # print(terminal.ANSIControl.cursor.next_line(1), end="")
+                if self.echo:
+                    print(self._get_statusline())
+                else:
+                    print(self._get_statusline(), end="")
+                    # print(terminal.ANSIControl.cursor.next_line(1), end="")
             if self.echo:
+                print(terminal.ANSIControl.cursor.horizontal_absolute(1), end="")
                 print(self._get_echo_line(), end="")
                 # print(self._get_echo_line())
             # if not self.echo and not self.statusline:
@@ -284,7 +288,10 @@ def input(self):
         """
         try:
             result = self.input_list.pop(0)
-            self.print(result)
+            if self.echo:
+                self.print(self.echo_pre_text, result)
+            else:
+                self.print(result)
             if self.verbose:
                 self.print("result: {}".format(repr(result)))
         except IndexError:
@@ -294,8 +301,7 @@ def input(self):
     ##########################################
     # main handling
 
-    def update(self):
-        """Main update funciton. please call as often as possible."""
+    def _handle_input(self):
         if self.serial.connected:
             available = self.serial.in_waiting
             while available:
@@ -311,21 +317,34 @@ def update(self):
                 # errors="strict",
                 self._buffer_check_and_handle_line_ends()
                 available = self.serial.in_waiting
+
+    def _handle_input_handling_fn(self):
         parsed_input = False
         if self.input_handling_fn:
             while self.input_list:
                 # first in first out
                 oldest_input = self.input_list.pop(0)
-                self.print(oldest_input)
+                text = oldest_input
+                # isprintable is not implemented in CP
+                # if not text.isprintable():
+                #     text = repr(text)
+                if len(text) == 0:
+                    text = repr(text)
+                if self.echo:
+                    text = self.echo_pre_text + text
+                self.print(text)
                 self.input_handling_fn(oldest_input)
                 parsed_input = True
         if parsed_input and self.print_help_fn:
             self.print_help_fn()
-            if self.echo:
-                # self.echo_print()
-                self.print()
-        if self.statusline:
-            self._statusline_update_check_intervall()
+            if self.echo or self.statusline:
+                self.print(content=None)
+
+    def update(self):
+        """Main update funciton. please call as often as possible."""
+        self._handle_input()
+        self._handle_input_handling_fn()
+        self._statusline_update_check_intervall()
 
 
 ##########################################
