modificaciones en metodos para uso desde codigo

Author: sasilva1998

cli.py

@@ -170,7 +170,7 @@ def mkdir(directory, exists_okay):
     is_flag=True,
     help="recursively list all files and (empty) directories.",
 )
-def ls(directory, long_format, recursive):
+def ls(board,directory, long_format, recursive):
     """List contents of a directory on the board.
 
     Can pass an optional argument which is the path to the directory.  The
@@ -190,7 +190,7 @@ def ls(directory, long_format, recursive):
       ampy --port /board/serial/port ls -l /foo/bar
     """
     # List each file/directory on a separate line.
-    board_files = files.Files(_board)
+    board_files = files.Files(board)
     for f in board_files.ls(directory, long_format=long_format, recursive=recursive):
         print(f)
 
@@ -258,10 +258,7 @@ def put(local, remote=None, board=None):
             board_files = files.Files(board)
             board_files.put(remote, infile.read())
 
-
-@cli.command()
-@click.argument("remote_file")
-def rm(remote_file):
+def rm(remote_file,board):
     """Remove a file from the board.
 
     Remove the specified file from the board's filesystem.  Must specify one
@@ -274,7 +271,7 @@ def rm(remote_file):
       ampy --port /board/serial/port rm main.py
     """
     # Delete the provided file/directory on the board.
-    board_files = files.Files(_board)
+    board_files = files.Files(board)
     board_files.rm(remote_file)
 
 

pyboard.py

@@ -148,6 +148,8 @@ def __init__(self, device, baudrate=115200, user='micro', password='python', wai
             if delayed:
                 print('')
 
+        self.uioutput=""
+
     def close(self):
         self.serial.close()
 
@@ -160,8 +162,41 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
             if data.endswith(ending):
                 break
             elif self.serial.inWaiting() > 0:
-                new_data = self.serial.read(1)
+                new_data = self.serial.read(1)     
+                data = data + new_data
+                if data_consumer:
+                    data_consumer(new_data)
+                timeout_count = 0
+            else:
+                timeout_count += 1
+                if timeout is not None and timeout_count >= 100 * timeout:
+                    break
+                time.sleep(0.01)
+        return data
+
+    def read_until_output(self, min_num_bytes, ending, timeout=10, data_consumer=None,ter=None):
+        data = self.serial.read(min_num_bytes)
+        if data_consumer:
+            data_consumer(data)
+        timeout_count = 0
+        while True:
+            if data.endswith(ending):
+                break
+            elif self.serial.inWaiting() > 0:
+                new_data = self.serial.read(1)     
                 data = data + new_data
+                try:
+                    ded=str(data).split("\\")
+                    if ded[-1]=="n'" and ded[-2]=="r":
+                        ded=str(data)[2:-5]
+                        self.uioutput=self.uioutput+ded+"\n"
+                        print(self.uioutput)
+                        ter.value=self.uioutput
+                        ded=None
+                        data=b''
+                except Exception as e:
+                    print(e)
+
                 if data_consumer:
                     data_consumer(new_data)
                 timeout_count = 0
@@ -215,21 +250,23 @@ def exit_raw_repl(self):
         self.serial.write(b'\r\x02') # ctrl-B: enter friendly REPL
 
     def follow(self, timeout, data_consumer=None):
+
         # wait for normal output
         data = self.read_until(1, b'\x04', timeout=timeout, data_consumer=data_consumer)
         if not data.endswith(b'\x04'):
             raise PyboardError('timeout waiting for first EOF reception')
         data = data[:-1]
-
         # wait for error output
         data_err = self.read_until(1, b'\x04', timeout=timeout)
         if not data_err.endswith(b'\x04'):
             raise PyboardError('timeout waiting for second EOF reception')
         data_err = data_err[:-1]
-
         # return normal and error output
         return data, data_err
 
+    def follow_output(self, timeout, data_consumer=None,term=None):
+        data = self.read_until_output(1, b'\x04', timeout=timeout, data_consumer=data_consumer,ter=term)
+
     def exec_raw_no_follow(self, command):
         if isinstance(command, bytes):
             command_bytes = command
@@ -280,11 +317,13 @@ def get_time(self):
 # but for Python3 we want to provide the nicer version "exec"
 setattr(Pyboard, "exec", Pyboard.exec_)
 
-def execfile(filename, device='/dev/ttyACM0', baudrate=115200, user='micro', password='python'):
+def execfile(filename, device='/dev/ttyACM0', baudrate=115200, user='micro', password='python',terminal=None):
     pyb = Pyboard(device, baudrate, user, password)
     pyb.enter_raw_repl()
-    output = pyb.execfile(filename)
-    stdout_write_bytes(output)
+    with open(filename, 'rb') as f:
+        pyfile = f.read()
+    pyb.exec_raw_no_follow(pyfile)
+    pyb.follow_output(10, None, term=terminal)
     pyb.exit_raw_repl()
     pyb.close()