Merge branch 'ui-enhance' into lan-alpha

commhandler.cpp

@@ -102,6 +102,22 @@ void commHandler::receiveDataIn()
     // new code:
     port->startTransaction();
     inPortData = port->readAll();
+
+    if(inPortData.size() == 1)
+    {
+        // Generally for baud <= 9600
+        if (inPortData == "\xFE")
+        {
+            // This will get hit twice.
+            // After the FE FE, we transition into
+            // the normal .startsWith FE FE block
+            // where the normal rollback code can handle things.
+            port->rollbackTransaction();
+            rolledBack = true;
+            return;
+        }
+    }
+
     if(inPortData.startsWith("\xFE\xFE"))
     {
         if(inPortData.endsWith("\xFD"))

wfmain.cpp

@@ -754,13 +754,15 @@ void wfmain::openRig()
         {
             // Find the ICOM
             // qInfo(logSystem()) << "Searching for serial port...";
-            QDirIterator it73("/dev/serial", QStringList() << "*IC-7300*", QDir::Files, QDirIterator::Subdirectories);
+            QDirIterator it73("/dev/serial/by-id", QStringList() << "*IC-7300*", QDir::Files, QDirIterator::Subdirectories);
             QDirIterator it97("/dev/serial", QStringList() << "*IC-9700*A*", QDir::Files, QDirIterator::Subdirectories);
             QDirIterator it785x("/dev/serial", QStringList() << "*IC-785*A*", QDir::Files, QDirIterator::Subdirectories);
             QDirIterator it705("/dev/serial", QStringList() << "*IC-705*A", QDir::Files, QDirIterator::Subdirectories);
             QDirIterator it7610("/dev/serial", QStringList() << "*IC-7610*A", QDir::Files, QDirIterator::Subdirectories);
             QDirIterator itR8600("/dev/serial", QStringList() << "*IC-R8600*A", QDir::Files, QDirIterator::Subdirectories);
+            QDirIterator itTest("/tmp/test", QStringList() << "*radio*", QDir::NoFilter, QDirIterator::Subdirectories);
 
+            qDebug() << "test iterator isEmpty: " << itTest.filePath().isEmpty();
 
             if(!it73.filePath().isEmpty())
             {
@@ -788,6 +790,8 @@ void wfmain::openRig()
                 serialPortRig = itR8600.filePath();
             } else {
                 //fall back:
+
+
                 qInfo(logSystem()) << "Could not find Icom serial port. Falling back to OS default. Use --port to specify, or modify preferences.";
 #ifdef Q_OS_MAC
                 serialPortRig = QString("/dev/tty.SLAB_USBtoUART");
@@ -848,20 +852,32 @@ void wfmain::receiveFoundRigID(rigCapabilities rigCaps)
     //now we know what the rig ID is:
     //qInfo(logSystem()) << "In wfview, we now have a reply to our request for rig identity sent to CIV BROADCAST.";
 
+    // baud on the serial port reflects the actual rig connection,
+    // even if a client-server connection is being used.
+    // Computed time for a 10 byte message, with a safety factor of 2.
+    unsigned int usPerByte = 9600*1000 / prefs.serialPortBaud;
+    unsigned int msMinTiming=usPerByte * 10*2/1000;
+    if(msMinTiming < 35)
+        msMinTiming = 35;
+
+    delayedCommand->setInterval( msMinTiming * 2); // 20 byte message
+    periodicPollingTimer->setInterval( msMinTiming ); // slower for s-meter poll
+
+    // Normal:
+    delayedCmdIntervalLAN_ms =  msMinTiming * 2;
+    delayedCmdIntervalSerial_ms =  msMinTiming * 2;
+
+    // startup initial state:
+    delayedCmdStartupInterval_ms =  msMinTiming * 2;
+
     if(rig->usingLAN())
     {
         usingLAN = true;
-        delayedCommand->setInterval(delayedCmdIntervalLAN_ms);
+        //delayedCommand->setInterval(delayedCmdIntervalLAN_ms);
     } else {
         usingLAN = false;
-        if(prefs.serialPortBaud < 115200)
-        {
-            delayedCommand->setInterval(delayedCmdIntervalSerial_ms*2);
-            periodicPollingTimer->setInterval(200); // slower for s-meter polling
-        } else {
-            delayedCommand->setInterval(delayedCmdIntervalSerial_ms);
-        }
     }
+
     receiveRigID(rigCaps);
     getInitialRigState();