Commit a5112f49 authored by Lorenz Meier's avatar Lorenz Meier

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

parents d55937a1 6f8553bb
......@@ -220,6 +220,8 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcMappedNormalizedValue[i] = 0.0f;
}
firmwareMenuButtonClicked();
updateTimer.setInterval(150);
connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView()));
updateTimer.start();
......
......@@ -33,7 +33,7 @@
</font>
</property>
<property name="text">
<string>Configuration</string>
<string/>
</property>
</widget>
</item>
......@@ -819,8 +819,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>492</width>
<height>828</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
......@@ -856,8 +856,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>491</width>
<height>828</height>
<width>98</width>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment