Skip to content

Q
qgroundcontrol
Commit dffc01d6 authored by Alejandro's avatar Alejandro
Browse files
Options

Working in SLUGS widgets for debug

parent 3b928588
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6369 additions and 7636 deletions
qgroundcontrol.pro
View file @ dffc01d6
This diff is collapsed.
src/uas/SlugsMAV.cc
View file @ dffc01d6
This diff is collapsed.
src/uas/SlugsMAV.h
View file @ dffc01d6
/*===================================================================== /*=====================================================================
QGroundControl Open Source Ground Control Station QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> (c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful, QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>. along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/ ======================================================================*/
#ifndef SLUGSMAV_H #ifndef SLUGSMAV_H
#define SLUGSMAV_H #define SLUGSMAV_H
#include "UAS.h" #include "UAS.h"
#include "mavlink.h" #include "mavlink.h"
#include <QTimer> #include <QTimer>
#define SLUGS_UPDATE_RATE 100 // in ms #define SLUGS_UPDATE_RATE 100 // in ms
class SlugsMAV : public UAS class SlugsMAV : public UAS
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(UASInterface) Q_INTERFACES(UASInterface)
public: public:
SlugsMAV(MAVLinkProtocol* mavlink, int id = 0); SlugsMAV(MAVLinkProtocol* mavlink, int id = 0);
public slots: public slots:
/** @brief Receive a MAVLink message from this MAV */ /** @brief Receive a MAVLink message from this MAV */
void receiveMessage(LinkInterface* link, mavlink_message_t message); void receiveMessage(LinkInterface* link, mavlink_message_t message);
void emitSignals (void); void emitSignals (void);
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
mavlink_pwm_commands_t* getPwmCommands(); mavlink_pwm_commands_t* getPwmCommands();
#endif #endif
signals: signals:
void slugsRawImu(int uasId, const mavlink_raw_imu_t& rawData); void slugsRawImu(int uasId, const mavlink_raw_imu_t& rawData);
void slugsGPSCogSog(int uasId, double cog, double sog); void slugsGPSCogSog(int uasId, double cog, double sog);
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
void slugsCPULoad(int systemId, const mavlink_cpu_load_t& cpuLoad); void slugsCPULoad(int systemId, const mavlink_cpu_load_t& cpuLoad);
void slugsAirData(int systemId, const mavlink_air_data_t& airData); void slugsAirData(int systemId, const mavlink_air_data_t& airData);
void slugsSensorBias(int systemId, const mavlink_sensor_bias_t& sensorBias); void slugsSensorBias(int systemId, const mavlink_sensor_bias_t& sensorBias);
void slugsDiagnostic(int systemId, const mavlink_diagnostic_t& diagnostic); void slugsDiagnostic(int systemId, const mavlink_diagnostic_t& diagnostic);
void slugsPilotConsolePWM(int systemId, const mavlink_pilot_console_t& pilotConsole); void slugsPilotConsolePWM(int systemId, const mavlink_pilot_console_t& pilotConsole);
void slugsPWM(int systemId, const mavlink_pwm_commands_t& pwmCommands); void slugsPWM(int systemId, const mavlink_pwm_commands_t& pwmCommands);
void slugsNavegation(int systemId, const mavlink_slugs_navigation_t& slugsNavigation); void slugsNavegation(int systemId, const mavlink_slugs_navigation_t& slugsNavigation);
void slugsDataLog(int systemId, const mavlink_data_log_t& dataLog); void slugsDataLog(int systemId, const mavlink_data_log_t& dataLog);
void slugsFilteredData(int systemId, const mavlink_filtered_data_t& filteredData); void slugsFilteredData(int systemId, const mavlink_filtered_data_t& filteredData);
void slugsGPSDateTime(int systemId, const mavlink_gps_date_time_t& gpsDateTime); void slugsGPSDateTime(int systemId, const mavlink_gps_date_time_t& gpsDateTime);
void slugsActionAck(int systemId, const mavlink_action_ack_t& actionAck); void slugsActionAck(int systemId, const mavlink_action_ack_t& actionAck);
void slugsPidValues(int systemId, const mavlink_pid_t& pidValues); void slugsPidValues(int systemId, const mavlink_pid_t& pidValues);
void slugsBootMsg(int uasId, mavlink_boot_t& boot); void slugsBootMsg(int uasId, mavlink_boot_t& boot);
void slugsAttitude(int uasId, mavlink_attitude_t& attitude); void slugsAttitude(int uasId, mavlink_attitude_t& attitude);
#endif #endif
protected: protected:
typedef struct _mavlink_pid_values_t { typedef struct _mavlink_pid_values_t {
float P[11]; float P[11];
float I[11]; float I[11];
float D[11]; float D[11];
}mavlink_pid_values_t; }mavlink_pid_values_t;
unsigned char updateRoundRobin; unsigned char updateRoundRobin;
QTimer* widgetTimer; QTimer* widgetTimer;
mavlink_raw_imu_t mlRawImuData; mavlink_raw_imu_t mlRawImuData;
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
mavlink_gps_raw_t mlGpsData; mavlink_gps_raw_t mlGpsData;
mavlink_attitude_t mlAttitude; mavlink_attitude_t mlAttitude;
mavlink_cpu_load_t mlCpuLoadData; mavlink_cpu_load_t mlCpuLoadData;
mavlink_air_data_t mlAirData; mavlink_air_data_t mlAirData;
mavlink_sensor_bias_t mlSensorBiasData; mavlink_sensor_bias_t mlSensorBiasData;
mavlink_diagnostic_t mlDiagnosticData; mavlink_diagnostic_t mlDiagnosticData;
mavlink_pilot_console_t mlPilotConsoleData; mavlink_pilot_console_t mlPilotConsoleData;
mavlink_filtered_data_t mlFilteredData; mavlink_filtered_data_t mlFilteredData;
mavlink_boot_t mlBoot; mavlink_boot_t mlBoot;
mavlink_gps_date_time_t mlGpsDateTime; mavlink_gps_date_time_t mlGpsDateTime;
mavlink_mid_lvl_cmds_t mlMidLevelCommands; mavlink_mid_lvl_cmds_t mlMidLevelCommands;
mavlink_set_mode_t mlApMode; mavlink_set_mode_t mlApMode;
mavlink_pwm_commands_t mlPwmCommands; mavlink_pwm_commands_t mlPwmCommands;
mavlink_pid_values_t mlPidValues; mavlink_pid_values_t mlPidValues;
mavlink_pid_t mlSinglePid; mavlink_pid_t mlSinglePid;
mavlink_slugs_navigation_t mlNavigation; mavlink_slugs_navigation_t mlNavigation;
mavlink_data_log_t mlDataLog; mavlink_data_log_t mlDataLog;
mavlink_ctrl_srfc_pt_t mlPassthrough; mavlink_ctrl_srfc_pt_t mlPassthrough;
mavlink_action_ack_t mlActionAck; mavlink_action_ack_t mlActionAck;
mavlink_slugs_action_t mlAction; mavlink_slugs_action_t mlAction;
// Standart messages MAVLINK used by SLUGS // Standart messages MAVLINK used by SLUGS
private: private:
void emitGpsSignals (void); void emitGpsSignals (void);
void emitPidSignal(void); void emitPidSignal(void);
int uasId; int uasId;
#endif // if SLUGS #endif // if SLUGS
}; };
#endif // SLUGSMAV_H #endif // SLUGSMAV_H
src/uas/UAS.cc
View file @ dffc01d6
...@@ -244,7 +244,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -244,7 +244,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
mavlink_msg_sys_status_decode(&message, &state); mavlink_msg_sys_status_decode(&message, &state);
// FIXME // FIXME
qDebug() << "1 SYSTEM STATUS:" << state.status; //qDebug() << "1 SYSTEM STATUS:" << state.status;
QString audiostring = "System " + QString::number(this->getUASID()); QString audiostring = "System " + QString::number(this->getUASID());
QString stateAudio = ""; QString stateAudio = "";
...@@ -260,12 +260,13 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -260,12 +260,13 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit statusChanged(this, uasState, stateDescription); emit statusChanged(this, uasState, stateDescription);
emit statusChanged(this->status); emit statusChanged(this->status);
emit loadChanged(this,state.load/10.0f); emit loadChanged(this,state.load/10.0f);
emit valueChanged(uasId, "Load", "%", ((float)state.load)/1000.0f, MG::TIME::getGroundTimeNow()); emit valueChanged(uasId, "Load", "%", ((float)state.load)/1000.0f, MG::TIME::getGroundTimeNow());
stateAudio = " changed status to " + uasState; stateAudio = " changed status to " + uasState;
} }
qDebug() << "1 SYSTEM MODE:" << state.mode; //qDebug() << "1 SYSTEM MODE:" << state.mode;
qDebug() << "1 THIS MODE:" << this->mode; //qDebug() << "1 THIS MODE:" << this->mode;
if (this->mode != static_cast<unsigned int>(state.mode)) if (this->mode != static_cast<unsigned int>(state.mode))
{ {
modechanged = true; modechanged = true;
...@@ -308,7 +309,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -308,7 +309,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit modeChanged(this->getUASID(), mode, ""); emit modeChanged(this->getUASID(), mode, "");
qDebug() << "2 SYSTEM MODE:" << mode; //qDebug() << "2 SYSTEM MODE:" << mode;
modeAudio = " is now in " + mode; modeAudio = " is now in " + mode;
} }
...@@ -333,6 +334,16 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -333,6 +334,16 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
// COMMUNICATIONS DROP RATE // COMMUNICATIONS DROP RATE
emit dropRateChanged(this->getUASID(), state.packet_drop/1000.0f); emit dropRateChanged(this->getUASID(), state.packet_drop/1000.0f);
//add for development
emit remoteControlRSSIChanged(state.packet_drop/1000.0f);
float en = state.packet_drop/1000.0f;
emit remoteControlChannelRawChanged(0, en);//MAVLINK_MSG_ID_RC_CHANNELS_RAW
emit remoteControlChannelScaledChanged(0, en/100.0f);//MAVLINK_MSG_ID_RC_CHANNELS_SCALED
//qDebug() << __FILE__ << __LINE__ << "RCV LOSS: " << state.packet_drop; //qDebug() << __FILE__ << __LINE__ << "RCV LOSS: " << state.packet_drop;
// AUDIO // AUDIO
......
src/ui/MainWindow.cc
View file @ dffc01d6
...@@ -537,30 +537,30 @@ void MainWindow::buildSlugsWidgets() ...@@ -537,30 +537,30 @@ void MainWindow::buildSlugsWidgets()
addToToolsMenu (rcViewDockWidget, tr("Radio Control"), SLOT(showToolWidget(bool)), MENU_RC_VIEW, Qt::BottomDockWidgetArea); addToToolsMenu (rcViewDockWidget, tr("Radio Control"), SLOT(showToolWidget(bool)), MENU_RC_VIEW, Qt::BottomDockWidgetArea);
} }
// if (!slugsDataWidget) if (!slugsDataWidget)
// { {
// // Dialog widgets // Dialog widgets
// slugsDataWidget = new QDockWidget(tr("Slugs Data"), this); slugsDataWidget = new QDockWidget(tr("Slugs Data"), this);
// slugsDataWidget->setWidget( new SlugsDataSensorView(this)); slugsDataWidget->setWidget( new SlugsDataSensorView(this));
// slugsDataWidget->setObjectName("SLUGS_DATA_DOCK_WIDGET"); slugsDataWidget->setObjectName("SLUGS_DATA_DOCK_WIDGET");
// addToToolsMenu (slugsDataWidget, tr("Telemetry Data"), SLOT(showToolWidget()), MENU_SLUGS_DATA, Qt::RightDockWidgetArea); addToToolsMenu (slugsDataWidget, tr("Telemetry Data"), SLOT(showToolWidget(bool)), MENU_SLUGS_DATA, Qt::RightDockWidgetArea);
// } }
// if (!slugsPIDControlWidget) if (!slugsPIDControlWidget)
// { {
// slugsPIDControlWidget = new QDockWidget(tr("Slugs PID Control"), this); slugsPIDControlWidget = new QDockWidget(tr("Slugs PID Control"), this);
// slugsPIDControlWidget->setWidget(new SlugsPIDControl(this)); slugsPIDControlWidget->setWidget(new SlugsPIDControl(this));
// slugsPIDControlWidget->setObjectName("SLUGS_PID_CONTROL_DOCK_WIDGET"); slugsPIDControlWidget->setObjectName("SLUGS_PID_CONTROL_DOCK_WIDGET");
// addToToolsMenu (slugsPIDControlWidget, tr("PID Configuration"), SLOT(showToolWidget()), MENU_SLUGS_PID, Qt::LeftDockWidgetArea); addToToolsMenu (slugsPIDControlWidget, tr("PID Configuration"), SLOT(showToolWidget(bool)), MENU_SLUGS_PID, Qt::LeftDockWidgetArea);
// } }
// if (!slugsHilSimWidget) if (!slugsHilSimWidget)
// { {
// slugsHilSimWidget = new QDockWidget(tr("Slugs Hil Sim"), this); slugsHilSimWidget = new QDockWidget(tr("Slugs Hil Sim"), this);
// slugsHilSimWidget->setWidget( new SlugsHilSim(this)); slugsHilSimWidget->setWidget( new SlugsHilSim(this));
// slugsHilSimWidget->setObjectName("SLUGS_HIL_SIM_DOCK_WIDGET"); slugsHilSimWidget->setObjectName("SLUGS_HIL_SIM_DOCK_WIDGET");
// addToToolsMenu (slugsHilSimWidget, tr("HIL Sim Configuration"), SLOT(showToolWidget()), MENU_SLUGS_HIL, Qt::LeftDockWidgetArea); addToToolsMenu (slugsHilSimWidget, tr("HIL Sim Configuration"), SLOT(showToolWidget(bool)), MENU_SLUGS_HIL, Qt::LeftDockWidgetArea);
// } }
// if (!slugsCamControlWidget) // if (!slugsCamControlWidget)
// { // {
...@@ -1024,7 +1024,10 @@ void MainWindow::connectSlugsWidgets() ...@@ -1024,7 +1024,10 @@ void MainWindow::connectSlugsWidgets()
slugsDataWidget->widget(), SLOT(setActiveUAS(UASInterface*))); slugsDataWidget->widget(), SLOT(setActiveUAS(UASInterface*)));
} }
if (slugsPIDControlWidget && slugsPIDControlWidget->widget()){
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)),
slugsPIDControlWidget->widget(), SLOT(activeUasSet(UASInterface*)));
}
} }
void MainWindow::arrangeCommonCenterStack() void MainWindow::arrangeCommonCenterStack()
...@@ -1547,6 +1550,15 @@ void MainWindow::UASCreated(UASInterface* uas) ...@@ -1547,6 +1550,15 @@ void MainWindow::UASCreated(UASInterface* uas)
// Connect Slugs Actions // Connect Slugs Actions
connectSlugsActions(); connectSlugsActions();
// if(slugsDataWidget)
// {
// SlugsDataSensorView *mm = dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget());
// if(mm)
// {
// mm->addUAS(uas);
// }
// }
// FIXME: This type checking might be redundant // FIXME: This type checking might be redundant
// // if (slugsDataWidget) { // // if (slugsDataWidget) {
// // SlugsDataSensorView* dataWidget = dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget()); // // SlugsDataSensorView* dataWidget = dynamic_cast<SlugsDataSensorView*>(slugsDataWidget->widget());
......
src/ui/QGCRemoteControlView.cc
View file @ dffc01d6
This diff is collapsed.
src/ui/QGCRemoteControlView.h
View file @ dffc01d6
/*===================================================================== /*=====================================================================
QGroundControl Open Source Ground Control Station QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org> (c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful, QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>. along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/ ======================================================================*/
/** /**
* @file * @file
* @brief Declaration of QGCRemoteControlView * @brief Declaration of QGCRemoteControlView
* @author Lorenz Meier <mail@qgroundcontrol.org> * @author Lorenz Meier <mail@qgroundcontrol.org>
*/ */
#ifndef QGCREMOTECONTROLVIEW_H #ifndef QGCREMOTECONTROLVIEW_H
#define QGCREMOTECONTROLVIEW_H #define QGCREMOTECONTROLVIEW_H
#include <QWidget> #include <QWidget>
#include <QVector> #include <QVector>
#include <QPushButton> #include <QPushButton>
#include "RadioCalibration/RadioCalibrationWindow.h" #include "RadioCalibration/RadioCalibrationWindow.h"
namespace Ui { namespace Ui {
class QGCRemoteControlView; class QGCRemoteControlView;
} }
class QVBoxLayout; class QVBoxLayout;
class QLabel; class QLabel;
class QProgressBar; class QProgressBar;
class QGCRemoteControlView : public QWidget { class QGCRemoteControlView : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
QGCRemoteControlView(QWidget *parent = 0); QGCRemoteControlView(QWidget *parent = 0);
~QGCRemoteControlView(); ~QGCRemoteControlView();
public slots: public slots:
void setUASId(int id); void setUASId(int id);
void setChannelRaw(int channelId, float raw); void setChannelRaw(int channelId, float raw);
void setChannelScaled(int channelId, float normalized); //void setChannelScaled(int channelId, float normalized);
void setRemoteRSSI(float rssiNormalized); void setRemoteRSSI(float rssiNormalized);
void redraw(); void redraw();
protected slots: protected slots:
void appendChannelWidget(int channelId); void appendChannelWidget(int channelId);
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
int uasId; int uasId;
float rssi; float rssi;
bool updated; bool updated;
QVBoxLayout* channelLayout; QVBoxLayout* channelLayout;
QVector<int> raw; QVector<int> raw;
QVector<float> normalized; QVector<float> normalized;
QVector<QLabel*> rawLabels; QVector<QLabel*> rawLabels;
QVector<QProgressBar*> progressBars; QVector<QProgressBar*> progressBars;
QProgressBar* rssiBar; QProgressBar* rssiBar;
QLabel* nameLabel; QLabel* nameLabel;
QPushButton *calibrate; QPushButton *calibrate;
RadioCalibrationWindow *calibrationWindow; RadioCalibrationWindow *calibrationWindow;
private: private:
Ui::QGCRemoteControlView *ui; Ui::QGCRemoteControlView *ui;
}; };
#endif // QGCREMOTECONTROLVIEW_H #endif // QGCREMOTECONTROLVIEW_H
src/ui/QGCRemoteControlView.ui
View file @ dffc01d6
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>QGCRemoteControlView</class> <class>QGCRemoteControlView</class>
<widget class="QWidget" name="QGCRemoteControlView"> <widget class="QWidget" name="QGCRemoteControlView">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>155</width>
<height>300</height> <height>106</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<widget class="QPushButton" name="pushButton"> </widget>
<property name="geometry"> <resources/>
<rect> <connections/>
<x>300</x> </ui>
<y>260</y>
<width>93</width>
<height>27</height>
</rect>
</property>
<property name="text">
<string>Calibrate</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>270</y>
<width>171</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Remote Control detected</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 1</string>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 2</string>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 3</string>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 4</string>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 5</string>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 6</string>
</property>
</widget>
<widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>10</x>
<y>130</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 7</string>
</property>
</widget>
<widget class="QLabel" name="label_9">
<property name="geometry">
<rect>
<x>10</x>
<y>150</y>
<width>71</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Channel 8</string>
</property>
</widget>
<widget class="QLabel" name="label_10">
<property name="geometry">
<rect>
<x>10</x>
<y>170</y>
<width>62</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>RSSI</string>
</property>
</widget>
<widget class="QProgressBar" name="chan1ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>10</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan2ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>30</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan3ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>50</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan4ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>70</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan5ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>90</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan6ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>110</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan7ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>130</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QProgressBar" name="chan8ProgressBar">
<property name="geometry">
<rect>
<x>200</x>
<y>150</y>
<width>118</width>
<height>16</height>
</rect>
</property>
<property name="minimum">
<number>-100</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="format">
<string>%v%</string>
</property>
</widget>
<widget class="QLabel" name="label_11">
<property name="geometry">
<rect>
<x>90</x>
<y>10</y>
<width>41</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>1120</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>
src/ui/SlugsDataSensorView.cc
View file @ dffc01d6
This diff is collapsed.
src/ui/SlugsDataSensorView.ui
View file @ dffc01d6
This diff is collapsed.
src/ui/SlugsHilSim.cc
View file @ dffc01d6
This diff is collapsed.
src/ui/SlugsPIDControl.cpp
View file @ dffc01d6
This diff is collapsed.
src/ui/uas/UASInfoWidget.cc
View file @ dffc01d6
This diff is collapsed.
src/ui/uas/UASView.cc
View file @ dffc01d6
...@@ -194,7 +194,7 @@ void UASView::updateMode(int sysId, QString status, QString description) ...@@ -194,7 +194,7 @@ void UASView::updateMode(int sysId, QString status, QString description)
{ {
Q_UNUSED(description); Q_UNUSED(description);
int aa=this->uas->getUASID(); //int aa=this->uas->getUASID();
if (sysId == this->uas->getUASID()) m_ui->modeLabel->setText(status); if (sysId == this->uas->getUASID()) m_ui->modeLabel->setText(status);
m_ui->modeLabel->setText(status); m_ui->modeLabel->setText(status);
......
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