Skip to content

Q
qgroundcontrol
Commit 9f7ae75b authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

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

parents 88921e7d a5fb558a
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 72 deletions
src/QGCCore.cc
View file @ 9f7ae75b
...@@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc, ...@@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc,
// Set application name // Set application name
this->setApplicationName(QGC_APPLICATION_NAME); this->setApplicationName(QGC_APPLICATION_NAME);
this->setApplicationVersion(QGC_APPLICATION_VERSION); this->setApplicationVersion(QGC_APPLICATION_VERSION);
this->setOrganizationName(QLatin1String("diydrones")); this->setOrganizationName(QGC::ORG_NAME);
this->setOrganizationDomain("com.diydrones"); this->setOrganizationDomain(QGC::ORG_DOMAIN);
// Set settings format // Set settings format
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
......
src/comm/SerialLink.cc
View file @ 9f7ae75b
...@@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts() ...@@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts()
void SerialLink::loadSettings() void SerialLink::loadSettings()
{ {
// Load defaults from settings // Load defaults from settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME); QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.sync(); settings.sync();
if (settings.contains("SERIALLINK_COMM_PORT")) if (settings.contains("SERIALLINK_COMM_PORT"))
{ {
...@@ -122,7 +122,7 @@ void SerialLink::loadSettings() ...@@ -122,7 +122,7 @@ void SerialLink::loadSettings()
void SerialLink::writeSettings() void SerialLink::writeSettings()
{ {
// Store settings // Store settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME); QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.setValue("SERIALLINK_COMM_PORT", getPortName()); settings.setValue("SERIALLINK_COMM_PORT", getPortName());
settings.setValue("SERIALLINK_COMM_BAUD", getBaudRateType()); settings.setValue("SERIALLINK_COMM_BAUD", getBaudRateType());
settings.setValue("SERIALLINK_COMM_PARITY", getParityType()); settings.setValue("SERIALLINK_COMM_PARITY", getParityType());
...@@ -174,7 +174,7 @@ void SerialLink::run() ...@@ -174,7 +174,7 @@ void SerialLink::run()
} }
} }
if (isConnected() && (linkErrorCount > 100)) { if (isConnected() && (linkErrorCount > 1000)) {
qDebug() << "linkErrorCount too high: disconnecting!"; qDebug() << "linkErrorCount too high: disconnecting!";
linkErrorCount = 0; linkErrorCount = 0;
emit communicationUpdate(getName(), tr("Disconnecting on too many link errors")); emit communicationUpdate(getName(), tr("Disconnecting on too many link errors"));
......
src/configuration.h
View file @ 9f7ae75b
...@@ -11,14 +11,15 @@ ...@@ -11,14 +11,15 @@
#define WITH_TEXT_TO_SPEECH 1 #define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl" #define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v. 1.1.2 (beta)" #define QGC_APPLICATION_VERSION "v. 2.0.0 (beta)"
namespace QGC namespace QGC
{ {
const QString APPNAME = "QGROUNDCONTROL"; const QString APPNAME = "QGROUNDCONTROL";
const QString COMPANYNAME = "QGROUNDCONTROL"; const QString ORG_NAME = "QGROUNDCONTROL.ORG"; //can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps
const int APPLICATIONVERSION = 110; // 1.1.0 const QString ORG_DOMAIN = "org.qgroundcontrol";//can be customized by forks
const int APPLICATIONVERSION = 200; // 2.0.0
} }
#endif // QGC_CONFIGURATION_H #endif // QGC_CONFIGURATION_H
src/ui/configuration/terminalconsole.cpp
View file @ 9f7ae75b
...@@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index) ...@@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index)
void TerminalConsole::loadSettings() void TerminalConsole::loadSettings()
{ {
// Load defaults from settings // Load defaults from settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME); QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.sync(); settings.sync();
if (settings.contains("TERMINALCONSOLE_COMM_PORT")) if (settings.contains("TERMINALCONSOLE_COMM_PORT"))
{ {
...@@ -287,7 +287,7 @@ void TerminalConsole::loadSettings() ...@@ -287,7 +287,7 @@ void TerminalConsole::loadSettings()
void TerminalConsole::writeSettings() void TerminalConsole::writeSettings()
{ {
// Store settings // Store settings
QSettings settings(QGC::COMPANYNAME, QGC::APPNAME); QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
settings.setValue("TERMINALCONSOLE_COMM_PORT", m_settings.name); settings.setValue("TERMINALCONSOLE_COMM_PORT", m_settings.name);
settings.setValue("TERMINALCONSOLE_COMM_BAUD", m_settings.baudRate); settings.setValue("TERMINALCONSOLE_COMM_BAUD", m_settings.baudRate);
settings.setValue("TERMINALCONSOLE_COMM_PARITY", m_settings.parity); settings.setValue("TERMINALCONSOLE_COMM_PARITY", m_settings.parity);
......
src/ui/px4_configuration/QGCPX4SensorCalibration.ui
View file @ 9f7ae75b
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>657</width> <width>659</width>
<height>598</height> <height>603</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
...@@ -36,74 +36,37 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -36,74 +36,37 @@ QPushButton#gyroButton, QPushButton#accelButton {
border: 2px solid #465158; border: 2px solid #465158;
}</string> }</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" rowstretch="1,0,0,0,0,0,0,0,0,0" columnstretch="30,8,8,15"> <layout class="QGridLayout" name="gridLayout" rowstretch="20,0,0,0,0,0,0" columnstretch="30,0,0,0">
<item row="3" column="0" colspan="2"> <item row="3" column="0" colspan="2">
<widget class="QLabel" name="label"> <widget class="QPlainTextEdit" name="textView"/>
<property name="text">
<string>Autopilot and GPS / Compass Orientation</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<widget class="QLabel" name="instructionLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item> </item>
<item row="8" column="0" colspan="4"> <item row="6" column="2">
<spacer name="verticalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>498</width> <width>40</width>
<height>5</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="9" column="2"> <item row="5" column="0" colspan="4">
<spacer name="horizontalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>498</width>
<height>20</height> <height>5</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0"> <item row="6" column="0" colspan="2">
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="magComboBox"/>
</item>
<item row="0" column="2" rowspan="7" colspan="2">
<widget class="QPlainTextEdit" name="textView"/>
</item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="accelLabel"> <widget class="QLabel" name="accelLabel">
...@@ -170,19 +133,64 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -170,19 +133,64 @@ QPushButton#gyroButton, QPushButton#accelButton {
</item> </item>
</layout> </layout>
</item> </item>
<item row="4" column="0"> <item row="2" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Autopilot Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="autopilotLabel"> <widget class="QLabel" name="autopilotLabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="autopilotComboBox"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="iconLabel">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QLabel" name="instructionLabel">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="1" column="2" rowspan="4" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Magnetometer Orientation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="gpsLabel"> <widget class="QLabel" name="gpsLabel">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>150</height> <height>120</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
...@@ -190,6 +198,12 @@ QPushButton#gyroButton, QPushButton#accelButton { ...@@ -190,6 +198,12 @@ QPushButton#gyroButton, QPushButton#accelButton {
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QComboBox" name="magComboBox"/>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>
......
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