Merge pull request #642 from pavel-demin/develop

fix cancel command in vna
pavel-demin · Nov 30, 2017 · 0fe665e · 0fe665e
2 parents 413e251 + a20ece9
commit 0fe665e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/projects/vna/client/vna.py b/projects/vna/client/vna.py
@@ -672,7 +672,7 @@ def cancel(self):
     self.sweepTimer.stop()
     self.auto = False
     self.reading = False
-    self.socket.write(struct.pack('<I', 8<<28))
+    self.socket.write(struct.pack('<I', 9<<28))
     self.progressBar.setValue(0)
     self.set_enabled(True)
 

diff --git a/projects/vna/server/vna.c b/projects/vna/server/vna.c
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
           }
           *rst |= 1;
           break;
-        case 8:
+        case 9:
           /* cancel */
           *rst &= ~3;
           *rst |= 4;