优化modem

heyuanjie87 · May 7, 2021 · 3227e9c · 3227e9c
1 parent ede1854
commit 3227e9c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Modem/Modem.cpp b/Modem/Modem.cpp
@@ -12,7 +12,7 @@ Modem::Modem(QWidget *parent) :
     ui->setupUi(this);
 
     ym = new Ymodem(this);
-    connect(ym, SIGNAL(showTransfer()), this, SLOT(showTransfer()));
+    connect(ym, SIGNAL(showTransfer(int, int, float)), this, SLOT(showTransfer(int, int, float)));
     connect(ym, SIGNAL(finished()), this, SLOT(closed()));
 }
 

diff --git a/Modem/Modem.h b/Modem/Modem.h
@@ -20,7 +20,7 @@ class Modem : public QDialog
 
     void setFile(QString &name);
     void getFile(QString &name);
-    void startTransfer(char type = 'x');
+    void startTransfer(char type = 'y');
     void showStatus(const char *s);
     void showStatus(QString &s);
 

diff --git a/Modem/Ymodem.cpp b/Modem/Ymodem.cpp
@@ -282,6 +282,9 @@ void Ymodem::run()
                     msgq_push(mcACK);
                 }
                 break;
+            case mcREQ:
+                Stage = msFirst;
+                break;
             }
         }
         break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -282,6 +282,9 @@ void Ymodem::run() @@
                         msgq_push(mcACK);
                     }
                     break;
+                case mcREQ:
+                    Stage = msFirst;
+                    break;
                 }
             }
             break;
@@ Expand Down @@