Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

src/uas/UASParameterCommsMgr.cc

@@ -387,7 +387,7 @@ void UASParameterCommsMgr::updateSilenceTimer()
 
 void UASParameterCommsMgr::setParameterStatusMsg(const QString& msg, ParamCommsStatusLevel_t level)
 {
-    qDebug() << "parameterStatusMsg: " << msg;
+    //qDebug() << "parameterStatusMsg: " << msg;
     emit parameterStatusMsgUpdated(msg,level);
 }
 
@@ -395,7 +395,7 @@ void UASParameterCommsMgr::receivedParameterUpdate(int uas, int compId, int para
 {
     Q_UNUSED(uas); //this object is assigned to one UAS only
     lastReceiveTime = QGC::groundTimeMilliseconds();
-    qDebug() << "compId" << compId << "receivedParameterUpdate:" << paramName;
+    // qDebug() << "compId" << compId << "receivedParameterUpdate:" << paramName;
 
     //notify the data model that we have an updated param
     paramDataModel->handleParamUpdate(compId,paramName,value);

src/ui/QGCToolBar.cc

@@ -464,7 +464,9 @@ void QGCToolBar::updateView()
             }
         }
 
-        toolBarBatteryVoltageLabel->setText(tr("%1 V").arg(batteryVoltage, 4, 'f', 1, ' '));
+    }
+    if (toolBarBatteryVoltageLabel->isVisible()) {
+	toolBarBatteryVoltageLabel->setText(tr("%1 V").arg(batteryVoltage, 4, 'f', 1, ' '));
     }