Browse Source

Corrected Bug with a few UAS.h signals which where defined twice.

QGC4.4
oberion 14 years ago
parent
commit
fdedaa4ed2
  1. 6
      src/uas/UAS.h
  2. 14
      src/ui/CommConfigurationWindow.cc

6
src/uas/UAS.h

@ -388,16 +388,16 @@ public slots: @@ -388,16 +388,16 @@ public slots:
signals:
/** @brief The main/battery voltage has changed/was updated */
void voltageChanged(int uasId, double voltage);
//void voltageChanged(int uasId, double voltage); // Defined in UASInterface already
/** @brief An actuator value has changed */
void actuatorChanged(UASInterface*, int actId, double value);
//void actuatorChanged(UASInterface*, int actId, double value); // Defined in UASInterface already
/** @brief An actuator value has changed */
void actuatorChanged(UASInterface* uas, QString actuatorName, double min, double max, double value);
void motorChanged(UASInterface* uas, QString motorName, double min, double max, double value);
/** @brief The system load (MCU/CPU usage) changed */
void loadChanged(UASInterface* uas, double load);
/** @brief Propagate a heartbeat received from the system */
void heartbeat(UASInterface* uas);
//void heartbeat(UASInterface* uas); // Defined in UASInterface already
void imageStarted(quint64 timestamp);
/** @brief A new camera image has arrived */
void imageReady(UASInterface* uas);

14
src/ui/CommConfigurationWindow.cc

@ -232,13 +232,6 @@ void CommConfigurationWindow::setLinkType(int linktype) @@ -232,13 +232,6 @@ void CommConfigurationWindow::setLinkType(int linktype)
break;
}
#endif // XBEELINK
case 0:
{
SerialLink *serial = new SerialLink();
tmpLink = serial;
MainWindow::instance()->addLink(tmpLink);
break;
}
/* case 1:
{
UDPLink *udp = new UDPLink();
@ -258,7 +251,12 @@ void CommConfigurationWindow::setLinkType(int linktype) @@ -258,7 +251,12 @@ void CommConfigurationWindow::setLinkType(int linktype)
#endif // OPAL_RT
default:
{
MainWindow::instance()->addLink();
}
case 0:
{
SerialLink *serial = new SerialLink();
tmpLink = serial;
MainWindow::instance()->addLink(tmpLink);
break;
}
}

Loading…
Cancel
Save