You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/07/30 08:20:41 UTC

[nuttx-apps] branch master updated (fb7dafc7e -> c08feedcf)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git


    from fb7dafc7e netutils/rexec/rexecd: supports remote execution and interaction
     new 8fd4b4d45 ymodem:fix ymodem bug
     new 55b0d4a11 ymodem:support sbrb.py use serial to transport
     new c08feedcf ymodem:fix compile warnings

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 system/ymodem/rb_main.c |   4 +-
 system/ymodem/sbrb.py   | 155 ++++++++++++++++++++++++++++++++++++------------
 system/ymodem/ymodem.c  |  16 ++---
 3 files changed, 128 insertions(+), 47 deletions(-)


[nuttx-apps] 02/03: ymodem:support sbrb.py use serial to transport

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit 55b0d4a110b45cd609c2f0c405f627e74f7ba222
Author: anjiahao <an...@xiaomi.com>
AuthorDate: Fri Jul 28 20:06:51 2023 +0800

    ymodem:support sbrb.py use serial to transport
    
    Get help to use ./sbrb.py -h
    ./sbrb.py -h
    usage: sbrb.py [-h] [-k KBLOCKSIZE] [-t TTY] [-b BAUDRATE] [-r [RECVFROM ...]] [-s SENDTO] [--debug DEBUG] [filelist ...]
    
    positional arguments:
      filelist              if filelist is valid, that is sb, else is rb
    
    options:
      -h, --help            show this help message and exit
      -k KBLOCKSIZE, --kblocksize KBLOCKSIZE
                            This opthin can set a customsize block size to transfer
      -t TTY, --tty TTY     Serial path
      -b BAUDRATE, --baudrate BAUDRATE
      -r [RECVFROM ...], --recvfrom [RECVFROM ...]
                            recvfile from board path like this: ./sbrb.py -r <file1 [file2 [file 3]...]> -t /dev/ttyUBS0
      -s SENDTO, --sendto SENDTO
                            send file to board path like this: ./sbrb.py -s <path on board> -t /dev/ttyUBS0 <file1 [file2 [file3] ...]>
      --debug DEBUG         This opthin is save debug log on host
    
    Signed-off-by: anjiahao <an...@xiaomi.com>
---
 system/ymodem/sbrb.py | 155 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 117 insertions(+), 38 deletions(-)

diff --git a/system/ymodem/sbrb.py b/system/ymodem/sbrb.py
index 37c542001..7c8dd191f 100755
--- a/system/ymodem/sbrb.py
+++ b/system/ymodem/sbrb.py
@@ -25,6 +25,8 @@ import signal
 import sys
 import termios
 
+import serial
+
 SOH = b"\x01"  # Start of 128-byte data packet
 STX = b"\x02"  # Start of 1024-byte data packet
 STC = b"\x03"  # Start of a customsize data packet
@@ -71,8 +73,8 @@ def ymodem_stdread(size):
         new_settings = termios.tcgetattr(fd)
         new_settings[3] &= ~(termios.ICANON | termios.ECHO)
         termios.tcsetattr(fd, termios.TCSADRAIN, new_settings)
-        sys.stdin.flush()
         data = sys.stdin.buffer.read(size)
+        sys.stdin.flush()
         return data
     except Timeout:
         return
@@ -100,6 +102,19 @@ def ymodem_stdprogress(data):
     sys.stderr.flush()
 
 
+def ymodem_ser_read(size):
+    global fd_serial
+
+    data = fd_serial.read(size)
+    return data
+
+
+def ymodem_ser_write(data):
+    global fd_serial
+    fd_serial.write(data)
+    fd_serial.flush()
+
+
 def calc_crc16(data, crc=0):
     crctable = [
         0x0000,
@@ -453,20 +468,20 @@ class ymodem:
         base = float(int(now.timestamp() * 1000)) / 1000
         totolbytes = 0
 
+        while retries < 10:
+            self.write(CRC)
+            chunk = self.read(1)
+            if chunk == CRC:
+                break
+            else:
+                retries += 1
+
+        if retries == 10:
+            return False
+
         while need_sendfile_num != 0:
             now = datetime.datetime.now()
             start = float(int(now.timestamp() * 1000)) / 1000
-            while retries < 10:
-                self.write(CRC)
-                chunk = self.read(1)
-                if chunk == CRC:
-                    break
-                else:
-                    retries += 1
-
-            if retries == 10:
-                return False
-
             self.init_pkt()
             self.head = SOH
             filename = os.path.basename(filelist[cnt])
@@ -508,11 +523,16 @@ class ymodem:
                 sendbytes = len(self.data)
                 self.data = self.data.ljust(self.get_pkt_size(), b"\x00")
 
-                self.send_pkt()
-                ret = self.recv_cmd(ACK)
-                if ret == -EAGAIN:
-                    continue
-                elif ret == -EINVAL:
+                retry = 0
+                while retry < 10:
+                    self.send_pkt()
+                    ret = self.recv_cmd(ACK)
+                    if ret < 0:
+                        retry += 1
+                    else:
+                        break
+
+                if retry >= 10:
                     return ret
 
                 self.add_seq()
@@ -637,34 +657,35 @@ class ymodem:
 
     def recv(self):
         retries = 0
-        start_recv = False
         now = datetime.datetime.now()
         base = float(int(now.timestamp() * 1000)) / 1000
         totolbytes = 0
+        self.write(CRC)
         while True:
-            self.write(CRC)
             now = datetime.datetime.now()
             start = float(int(now.timestamp() * 1000)) / 1000
             self.init_pkt()
             ret = self.recv_packet()
-            if ret < 0:
+
+            if ret == -EEOT:
+                self.write(ACK)
+                self.write(CRC)
+                continue
+
+            elif ret < 0:
                 if retries > RETRIESMAX:
                     return -1
+
+                self.progress("recv ret %d\n" % ret)
+                self.debug("recv frist packet\n")
                 retries += 1
                 continue
 
-            self.debug("recv frist packet\n")
             filename = bytes.decode(self.data.split(b"\x00")[0], "utf-8")
             if not filename:
-                if start_recv:
-                    self.debug("recv last packet\n")
-                    break
-
                 self.debug("recv a none file\n")
-                retries += 1
-                continue
+                break
 
-            start_recv = True
             self.progress("name:" + filename + " ")
             size_str = bytes.decode(self.data.split(b"\x00")[1], "utf-8")
             filesize = int(size_str)
@@ -704,15 +725,6 @@ class ymodem:
 
                 self.write(ACK)
 
-            ret = self.recv_packet()
-            if ret == -EEOT:
-                self.debug("recv EOT cmd\n")
-            elif ret < 0:
-                self.debug("recv error packet")
-                return -EINVAL
-
-            self.write(ACK)
-            self.write(CRC)
             now = datetime.datetime.now()
             time = float(now.timestamp() * 1000) / 1000
             time = time - start
@@ -732,6 +744,7 @@ class ymodem:
 
 
 if __name__ == "__main__":
+    global fd_serial
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "filelist", help="if filelist is valid, that is sb, else is rb", nargs="*"
@@ -745,16 +758,82 @@ if __name__ == "__main__":
         default=0,
     )
 
+    parser.add_argument("-t", "--tty", default=None, help="Serial path")
+
+    parser.add_argument(
+        "-b",
+        "--baudrate",
+        type=int,
+        default=921600,
+    )
+
+    parser.add_argument(
+        "-r",
+        "--recvfrom",
+        type=str,
+        nargs="*",
+        help="""
+            recvfile from board path
+            like this:
+                ./sbrb.py -r <file1 [file2 [file 3]...]> -t /dev/ttyUBS0
+            """,
+    )
+
+    parser.add_argument(
+        "-s",
+        "--sendto",
+        type=str,
+        nargs=1,
+        help="""
+            send file to board path
+            like this:
+                ./sbrb.py -s <path on board> -t /dev/ttyUBS0 <file1 [file2 [file3] ...]>
+            """,
+    )
+
     parser.add_argument(
         "--debug", help="This opthin is save debug log on host", default=""
     )
 
     args = parser.parse_args()
 
-    sbrb = ymodem(debug=args.debug, customsize=args.kblocksize * 1024)
+    if args.tty:
+        fd_serial = serial.Serial(args.tty, baudrate=args.baudrate)
+        fd_serial.reset_input_buffer()
+        if args.recvfrom:
+            recvfile = ""
+            for i in args.recvfrom:
+                recvfile += i + " "
+
+            fd_serial.write(("sb %s\r\n" % (recvfile)).encode())
+            tmp = fd_serial.read(len(("sb %s\r\n" % (recvfile)).encode()))
+        else:
+            if args.sendto:
+                fd_serial.write("rb\r\n".encode())
+                fd_serial.read(len("rb\r\n".encode()))
+            else:
+                fd_serial.write(("rb\r\n").encode())
+                fd_serial.read(len(("rb\r\n").encode()))
+
+            fd_serial.reset_input_buffer()
+        sbrb = ymodem(
+            debug=args.debug,
+            customsize=args.kblocksize * 1024,
+            read=ymodem_ser_read,
+            write=ymodem_ser_write,
+        )
+    else:
+        sbrb = ymodem(debug=args.debug, customsize=args.kblocksize * 1024)
+
     if len(args.filelist) == 0:
         sbrb.progress("receiving\n")
         sbrb.recv()
+        sbrb.progress("\n")
     else:
         sbrb.progress("sending\n")
         sbrb.send(args.filelist)
+        sbrb.progress("\n")
+
+    if args.tty:
+        fd_serial.write("\n".encode())
+        fd_serial.close()


[nuttx-apps] 03/03: ymodem:fix compile warnings

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit c08feedcfdc14076b89f039ddc6d15f6067d773d
Author: anjiahao <an...@xiaomi.com>
AuthorDate: Fri Jul 28 20:26:39 2023 +0800

    ymodem:fix compile warnings
    
    rb_main.c:219:42: warning: 'snprintf' output may be truncated before the last format character [-Wformat-truncation=]
      219 |           snprintf(temp, PATH_MAX, "%s/%s", priv->foldname,
    
    Signed-off-by: anjiahao <an...@xiaomi.com>
---
 system/ymodem/rb_main.c | 4 ++--
 system/ymodem/ymodem.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/ymodem/rb_main.c b/system/ymodem/rb_main.c
index 41878eae1..1beb8c2a2 100644
--- a/system/ymodem/rb_main.c
+++ b/system/ymodem/rb_main.c
@@ -171,7 +171,7 @@ static int handler(FAR struct ymodem_ctx_s *ctx)
 
   if (ctx->packet_type == YMODEM_FILENAME_PACKET)
     {
-      char temp[PATH_MAX];
+      char temp[PATH_MAX + 1];
       FAR char *filename;
 
       if (priv->fd > 0)
@@ -216,7 +216,7 @@ static int handler(FAR struct ymodem_ctx_s *ctx)
 
       if (priv->foldname != NULL)
         {
-          snprintf(temp, PATH_MAX, "%s/%s", priv->foldname,
+          snprintf(temp, sizeof(temp), "%s/%s", priv->foldname,
                    filename);
           filename = temp;
         }
diff --git a/system/ymodem/ymodem.c b/system/ymodem/ymodem.c
index ca7e30ec9..1f8cf6ff6 100644
--- a/system/ymodem/ymodem.c
+++ b/system/ymodem/ymodem.c
@@ -231,7 +231,7 @@ recv_packet:
   if ((total_seq & 0xff) - 1 == ctx->header[1])
     {
       ymodem_debug("recv_file: Received the previous packet that has"
-                   "been received, continue %lu %u\n", total_seq,
+                   "been received, continue %" PRIu32 " %u\n", total_seq,
                    ctx->header[1]);
 
       ctx->header[0] = ACK;
@@ -239,7 +239,7 @@ recv_packet:
     }
   else if ((total_seq & 0xff) != ctx->header[1])
     {
-      ymodem_debug("recv_file: total seq error:%lu %u\n", total_seq,
+      ymodem_debug("recv_file: total seq error:%" PRIu32 " %u\n", total_seq,
                    ctx->header[1]);
       ctx->header[0] = CRC;
       goto recv_packet;


[nuttx-apps] 01/03: ymodem:fix ymodem bug

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit 8fd4b4d45bbe45847586fb7e06417430c092418a
Author: anjiahao <an...@xiaomi.com>
AuthorDate: Mon May 15 17:24:05 2023 +0800

    ymodem:fix ymodem bug
    
    1.Timeout processing
    2.clear error count when received successfully once
    3.fix the bug of insufficient header memory application
    
    Signed-off-by: anjiahao <an...@xiaomi.com>
---
 system/ymodem/ymodem.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/system/ymodem/ymodem.c b/system/ymodem/ymodem.c
index aff8c61ff..ca7e30ec9 100644
--- a/system/ymodem/ymodem.c
+++ b/system/ymodem/ymodem.c
@@ -215,6 +215,7 @@ recv_packet:
     {
       /* other errors, like ETIMEDOUT, EILSEQ, EBADMSG... */
 
+      tcflush(ctx->recvfd, TCIOFLUSH);
       if (++retries > MAX_RETRIES)
         {
           ymodem_debug("recv_file: too many errors, cancel!!\n");
@@ -295,6 +296,7 @@ recv_packet:
   ctx->header[0] = ACK;
   total_seq++;
   ymodem_debug("recv_file: recv data success\n");
+  retries = 0;
   goto recv_packet;
 
 cancel:
@@ -553,11 +555,11 @@ int ymodem_recv(FAR struct ymodem_ctx_s *ctx)
 
   if (ctx->custom_size != 0)
     {
-      ctx->header = calloc(1, + ctx->custom_size + 2);
+      ctx->header = calloc(1, 3 + ctx->custom_size + 2);
     }
   else
     {
-      ctx->header = calloc(1, + YMODEM_PACKET_1K_SIZE + 2);
+      ctx->header = calloc(1, 3 + YMODEM_PACKET_1K_SIZE + 2);
     }
 
   if (ctx->header == NULL)
@@ -579,7 +581,7 @@ int ymodem_recv(FAR struct ymodem_ctx_s *ctx)
   tcgetattr(ctx->recvfd, &term);
   memcpy(&saveterm, &term, sizeof(struct termios));
   cfmakeraw(&term);
-  term.c_cc[VTIME] = 30;
+  term.c_cc[VTIME] = 15;
   term.c_cc[VMIN] = 255;
   tcsetattr(ctx->recvfd, TCSANOW, &term);
 
@@ -607,11 +609,11 @@ int ymodem_send(FAR struct ymodem_ctx_s *ctx)
 
   if (ctx->custom_size != 0)
     {
-      ctx->header = calloc(1, + ctx->custom_size + 2);
+      ctx->header = calloc(1, 3 + ctx->custom_size + 2);
     }
   else
     {
-      ctx->header = calloc(1, + YMODEM_PACKET_1K_SIZE + 2);
+      ctx->header = calloc(1, 3 + YMODEM_PACKET_1K_SIZE + 2);
     }
 
   if (ctx->header == NULL)