Changeset 1633 in ntrip

Timestamp:

Feb 20, 2009, 11:51:16 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (3 diffs)
• test_serial.cpp (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -261 +261 @@
     }
 
-    _serialPort->setTimeout(3600,0);
+    _serialPort->setTimeout(0,100);
     _serialPort->setFlowControl(FLOW_OFF);
   }
@@ -395 +395 @@
       }
       if (_serialPort) {
+        slotSerialReadyRead();
         _serialPort->write(data);
       }
@@ -593 +594 @@
 void bncGetThread::slotSerialReadyRead() {
   if (_serialPort) {
-    QByteArray data = _serialPort->readAll();
-    if (_serialOutFile) {
-      _serialOutFile->write(data);
-      _serialOutFile->flush();
-    }
-  }
-}
+    int nb = _serialPort->bytesAvailable();
+    if (nb > 0) {
+      QByteArray data = _serialPort->read(nb);
+      if (_serialOutFile) {
+        _serialOutFile->write(data);
+        _serialOutFile->flush();
+      }
+    }
+  }
+}

trunk/BNC/test_serial.cpp

@@ -6 +6 @@
 int main(int argc, char* argv[]) {
 
-  FILE* fp = fopen("/dev/ttyS0", "w");
+  FILE* fp = fopen("/dev/ttyS0", "r");
 
   if (!fp) {
@@ -13 +13 @@
   }
 
-  const char* msg = "message\n";
+  char msg[100];
 
   while (true) {
-    int nb = fprintf(fp, msg, sizeof(msg));
-    fflush(fp);
-    printf("written %d\n", nb);
+    int nb = fread(msg, sizeof(msg), 1, fp);
+    printf("read %d\n", nb);
     sleep(1);
   }