added @device.code_follow decorator

Author: Carglglz

examples/decorators/test_dec.py

@@ -1,34 +1,66 @@
 from upydevice import Device
 
-# pyb = Device('/dev/tty.usbmodem3370377430372')
-espd = Device('espdev.local', "oXQdh0wQ", init=True)
-bled = Device('00FEFE2D-5983-4D6C-9679-01F732CBA9D9', init=True)
-#@pyb.code
-#def led_toggle(led):
-#    pyb.LED(led).toggle()
-@bled.code
-def led_toggle():
-    led.value(not led.value())
+pyb = Device('/dev/tty.usbmodem3370377430372')
+# espd = Device('espdev.local', "oXQdh0wQ:espkeyhack", init=True)
+# bled = Device('00FEFE2D-5983-4D6C-9679-01F732CBA9D9', init=True)
 
 
+@pyb.code
+def led_toggle(led):
+    pyb.LED(led).toggle()
 
 
-print('Toggling led..')
-#for i in range(1,5):
-led_toggle()
+# @bled.code
+# def led_esp_toggle():
+#     led.value(not led.value())
+
 
+print('Toggling led..')
+for i in range(1,5):
+    led_toggle(i)
 
-# espd = Device('espdev.local', "oXQdh0wQ", init=True)
 
-@espd.code
-def esp_led_toggle():
-    led.value(not led.value())
-    return 1
+@pyb.code_follow
+def dothis():
+    import time
+    for i in range(5):
+        print("hello")
+        time.sleep(0.5)
 
 
+dothis()
 
-print('Toggling esp led..')
+#espd = Device('espdev.local', "oXQdh0wQ", init=True)
 
-res1 = esp_led_toggle()
-# res2 = espd.wr_cmd('esp_led_toggle()', rtn=True, rtn_resp=True)
-print(res1 + 1)
+# @espd.code
+# def esp_led_toggle():
+#     led.value(not led.value())
+#     return 1
+#
+#
+#
+# print('Toggling esp led..')
+#
+# res1=esp_led_toggle()
+# led_esp_toggle()
+#
+# @bled.code_follow
+# def dothat():
+#     for i in range(5):
+#         print("hello")
+#         time.sleep(0.5)
+#
+#
+# dothat()
+#
+#
+# @espd.code_follow
+# def doit():
+#     for i in range(5):
+#         print("hello")
+#         time.sleep(0.5)
+#
+#
+# doit()
+#res2 = espd.wr_cmd('esp_led_toggle()', rtn=True, rtn_resp=True)
+#print(res1 + 1)

upydevice/bledevice.py

@@ -1243,7 +1243,7 @@ def paste_buff(self, cmd, **kargs):
             print(e)
 
     def code(self, func):
-        str_func = uparser_dec(getsource(func)).replace('\r', '\n    ')
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
         self.paste_buff(str_func)
         self.cmd('\x04', silent=True)
 
@@ -1261,6 +1261,25 @@ def wrapper_cmd(*args, **kwargs):
                 return self.output
         return wrapper_cmd
 
+    def code_follow(self, func):
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
+        self.paste_buff(str_func)
+        self.cmd('\x04', silent=True)
+
+        @functools.wraps(func)
+        def wrapper_cmd(*args, **kwargs):
+            flags = ['>', '<', 'object', 'at', '0x']
+            args_repr = [repr(a) for a in args if any(
+                f not in repr(a) for f in flags)]
+            kwargs_repr = [f"{k}={v!r}" if not callable(
+                v) else f"{k}={v.__name__}" for k, v in kwargs.items()]
+            signature = ", ".join(args_repr + kwargs_repr)
+            cmd_ = f"{func.__name__}({signature})"
+            self.wr_cmd(cmd_, rtn=True, follow=True)
+            if self.output:
+                return self.output
+        return wrapper_cmd
+
     def load(self, file):
         with open(file, 'r') as upy_file:
             upy_content = upy_file.read()

upydevice/serialdevice.py

@@ -599,7 +599,7 @@ def __init__(self, *args, **kargs):
         super().__init__(*args, **kargs)
 
     def code(self, func):
-        str_func = uparser_dec(getsource(func)).replace('\r', '\n    ')
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
         self.paste_buff(str_func)
         self.cmd('\x04', silent=True)
 
@@ -616,7 +616,25 @@ def wrapper_cmd(*args, **kwargs):
             if self.output:
                 return self.output
         return wrapper_cmd
-        # return decorator_cmd_str
+
+    def code_follow(self, func):
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
+        self.paste_buff(str_func)
+        self.cmd('\x04', silent=True)
+
+        @functools.wraps(func)
+        def wrapper_cmd(*args, **kwargs):
+            flags = ['>', '<', 'object', 'at', '0x']
+            args_repr = [repr(a) for a in args if any(
+                f not in repr(a) for f in flags)]
+            kwargs_repr = [f"{k}={v!r}" if not callable(
+                v) else f"{k}={v.__name__}" for k, v in kwargs.items()]
+            signature = ", ".join(args_repr + kwargs_repr)
+            cmd_ = f"{func.__name__}({signature})"
+            self.wr_cmd(cmd_, rtn=True, follow=True)
+            if self.output:
+                return self.output
+        return wrapper_cmd
 
     def load(self, file):
         with open(file, 'r') as upy_file:

upydevice/websocketdevice.py

@@ -906,7 +906,7 @@ def __init__(self, *args, **kargs):
         super().__init__(*args, **kargs)
 
     def code(self, func):
-        str_func = uparser_dec(getsource(func)).replace('\r', '\n    ')
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
         self.paste_buff(str_func)
         self.cmd('\x04', silent=True)
 
@@ -924,6 +924,25 @@ def wrapper_cmd(*args, **kwargs):
                 return self.output
         return wrapper_cmd
 
+    def code_follow(self, func):
+        str_func = '\n'.join(getsource(func).split('\n')[1:])
+        self.paste_buff(str_func)
+        self.cmd('\x04', silent=True)
+
+        @functools.wraps(func)
+        def wrapper_cmd(*args, **kwargs):
+            flags = ['>', '<', 'object', 'at', '0x']
+            args_repr = [repr(a) for a in args if any(
+                f not in repr(a) for f in flags)]
+            kwargs_repr = [f"{k}={v!r}" if not callable(
+                v) else f"{k}={v.__name__}" for k, v in kwargs.items()]
+            signature = ", ".join(args_repr + kwargs_repr)
+            cmd_ = f"{func.__name__}({signature})"
+            self.wr_cmd(cmd_, rtn=True, follow=True)
+            if self.output:
+                return self.output
+        return wrapper_cmd
+
     def load(self, file):
         with open(file, 'r') as upy_file:
             upy_content = upy_file.read()