Merge branch 'lan-alpha' of gitlab.com:eliggett/wfview into lan-alpha

wfmain.cpp

@@ -798,7 +798,13 @@ void wfmain::receiveFoundRigID(rigCapabilities rigCaps)
         delayedCommand->setInterval(delayedCmdIntervalLAN_ms);
     } else {
         usingLAN = false;
-        delayedCommand->setInterval(delayedCmdIntervalSerial_ms);
+        if(prefs.serialPortBaud < 115200)
+        {
+            delayedCommand->setInterval(delayedCmdIntervalSerial_ms*2);
+            periodicPollingTimer->setInterval(100); // slower for s-meter polling
+        } else {
+            delayedCommand->setInterval(delayedCmdIntervalSerial_ms);
+        }
     }
     receiveRigID(rigCaps);
     getInitialRigState();

wfview.pro

@@ -33,8 +33,8 @@ DEFINES += QCUSTOMPLOT_COMPILE_LIBRARY
 DEFINES += OUTSIDE_SPEEX
 DEFINES += RANDOM_PREFIX=wf
 
-macx:INCLUDEPATH += /usr/local/include
-macx:LIBS += -L/usr/local/lib
+macx:INCLUDEPATH += /usr/local/include /opt/local/include
+macx:LIBS += -L/usr/local/lib -L/opt/local/lib
 
 macx:ICON = wfview.icns
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13