Commit da15b657 authored by Mariano Lizarraga's avatar Mariano Lizarraga

Added Line Chart and Google Earth to Slugs build process. Added HIL naming of mode Test3

parent bf89851b
...@@ -123,7 +123,7 @@ void UDPLink::writeBytes(const char* data, qint64 size) ...@@ -123,7 +123,7 @@ void UDPLink::writeBytes(const char* data, qint64 size)
unsigned char v =data[i]; unsigned char v =data[i];
qDebug("%02x ", v); qDebug("%02x ", v);
} }
qDebug("\n"); qDebug() <<"Sent to " << currentHost.toString() << ":" << currentPort;
socket->writeDatagram(data, size, currentHost, currentPort); socket->writeDatagram(data, size, currentHost, currentPort);
} }
......
...@@ -99,13 +99,13 @@ protected: ...@@ -99,13 +99,13 @@ protected:
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;
......
...@@ -300,9 +300,15 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -300,9 +300,15 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
case (uint8_t)MAV_MODE_TEST2: case (uint8_t)MAV_MODE_TEST2:
mode = "TEST2 MODE"; mode = "TEST2 MODE";
break; break;
#ifdef MAVLINK_ENABLED_SLUGS
case (uint8_t)MAV_MODE_TEST3:
mode = "HIL MODE";
break;
#else
case (uint8_t)MAV_MODE_TEST3: case (uint8_t)MAV_MODE_TEST3:
mode = "TEST3 MODE"; mode = "TEST3 MODE";
break; break;
#endif
case (uint8_t)MAV_MODE_RC_TRAINING: case (uint8_t)MAV_MODE_RC_TRAINING:
mode = "RC TRAINING MODE"; mode = "RC TRAINING MODE";
break; break;
......
...@@ -592,6 +592,15 @@ void MainWindow::buildSlugsWidgets() ...@@ -592,6 +592,15 @@ 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 (defined _MSC_VER) | (defined Q_OS_MAC)
if (!gEarthWidget)
{
gEarthWidget = new QGCGoogleEarthView(this);
addToCentralWidgetsMenu(gEarthWidget, tr("Google Earth"), SLOT(showCentralWidget()), CENTRAL_GOOGLE_EARTH);
}
#endif
if (!slugsDataWidget) if (!slugsDataWidget)
{ {
// Dialog widgets // Dialog widgets
...@@ -1115,6 +1124,10 @@ void MainWindow::arrangeSlugsCenterStack() ...@@ -1115,6 +1124,10 @@ void MainWindow::arrangeSlugsCenterStack()
if (linechartWidget && (centerStack->indexOf(linechartWidget) == -1)) centerStack->addWidget(linechartWidget); if (linechartWidget && (centerStack->indexOf(linechartWidget) == -1)) centerStack->addWidget(linechartWidget);
if (hudWidget && (centerStack->indexOf(hudWidget) == -1)) centerStack->addWidget(hudWidget); if (hudWidget && (centerStack->indexOf(hudWidget) == -1)) centerStack->addWidget(hudWidget);
#if (defined _MSC_VER) | (defined Q_OS_MAC)
if (gEarthWidget && (centerStack->indexOf(gEarthWidget) == -1)) centerStack->addWidget(gEarthWidget);
#endif
} }
void MainWindow::loadSettings() void MainWindow::loadSettings()
......
This diff is collapsed.
...@@ -23,7 +23,7 @@ SlugsPIDControl::SlugsPIDControl(QWidget *parent) : ...@@ -23,7 +23,7 @@ SlugsPIDControl::SlugsPIDControl(QWidget *parent) :
setGreenColorStyle(); setGreenColorStyle();
refreshTimerGet = new QTimer(this); refreshTimerGet = new QTimer(this);
refreshTimerGet->setInterval(200);//100); // 10 Hz refreshTimerGet->setInterval(200);//100); // 5 Hz
connect(refreshTimerGet, SIGNAL(timeout()), this, SLOT(slugsGetGeneral())); connect(refreshTimerGet, SIGNAL(timeout()), this, SLOT(slugsGetGeneral()));
...@@ -51,7 +51,7 @@ void SlugsPIDControl::activeUasSet(UASInterface* uas) ...@@ -51,7 +51,7 @@ void SlugsPIDControl::activeUasSet(UASInterface* uas)
if (slugsMav) if (slugsMav)
{ {
connect(slugsMav,SIGNAL(slugsActionAck(int,const mavlink_action_ack_t&)),this,SLOT(recibeMensaje(int,mavlink_action_ack_t))); connect(slugsMav,SIGNAL(slugsActionAck(int,const mavlink_action_ack_t&)),this,SLOT(receiveMessage(int,mavlink_action_ack_t)));
connect(slugsMav,SIGNAL(slugsPidValues(int,mavlink_pid_t)),this, SLOT(receivePidValues(int,mavlink_pid_t)) ); connect(slugsMav,SIGNAL(slugsPidValues(int,mavlink_pid_t)),this, SLOT(receivePidValues(int,mavlink_pid_t)) );
connect(ui->setGeneral_pushButton,SIGNAL(clicked()),this,SLOT(slugsTimerStartSet())); connect(ui->setGeneral_pushButton,SIGNAL(clicked()),this,SLOT(slugsTimerStartSet()));
...@@ -504,7 +504,7 @@ void SlugsPIDControl::get_Pitch2dT_PID() ...@@ -504,7 +504,7 @@ void SlugsPIDControl::get_Pitch2dT_PID()
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
void SlugsPIDControl::recibeMensaje(int systemId, const mavlink_action_ack_t& action) void SlugsPIDControl::receiveMessage(int systemId, const mavlink_action_ack_t& action)
{ {
Q_UNUSED(systemId); Q_UNUSED(systemId);
ui->recepcion_label->setText(QString::number(action.action) + ":" + QString::number(action.result)); ui->recepcion_label->setText(QString::number(action.action) + ":" + QString::number(action.result));
......
...@@ -257,7 +257,7 @@ public slots: ...@@ -257,7 +257,7 @@ public slots:
// void createMessagePID(); // void createMessagePID();
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
void recibeMensaje(int systemId, const mavlink_action_ack_t& action); void receiveMessage(int systemId, const mavlink_action_ack_t& action);
void receivePidValues(int systemId, const mavlink_pid_t& pidValues); void receivePidValues(int systemId, const mavlink_pid_t& pidValues);
#endif // MAVLINK_ENABLED_SLUG #endif // MAVLINK_ENABLED_SLUG
......
...@@ -95,14 +95,13 @@ void Linecharts::addSystem(UASInterface* uas) ...@@ -95,14 +95,13 @@ void Linecharts::addSystem(UASInterface* uas)
LinechartWidget* widget = new LinechartWidget(uas->getUASID(), this); LinechartWidget* widget = new LinechartWidget(uas->getUASID(), this);
addWidget(widget); addWidget(widget);
plots.insert(uas->getUASID(), widget); plots.insert(uas->getUASID(), widget);
#ifndef MAVLINK_ENABLED_SLUGS
// Values without unit // Values without unit
//connect(uas, SIGNAL(valueChanged(int,QString,double,quint64)), widget, SLOT(appendData(int,QString,double,quint64))); //connect(uas, SIGNAL(valueChanged(int,QString,double,quint64)), widget, SLOT(appendData(int,QString,double,quint64)));
// Values with unit as double // Values with unit as double
connect(uas, SIGNAL(valueChanged(int,QString,QString,double,quint64)), widget, SLOT(appendData(int,QString,QString,double,quint64))); connect(uas, SIGNAL(valueChanged(int,QString,QString,double,quint64)), widget, SLOT(appendData(int,QString,QString,double,quint64)));
// Values with unit as integer // Values with unit as integer
connect(uas, SIGNAL(valueChanged(int,QString,QString,int,quint64)), widget, SLOT(appendData(int,QString,QString,int,quint64))); connect(uas, SIGNAL(valueChanged(int,QString,QString,int,quint64)), widget, SLOT(appendData(int,QString,QString,int,quint64)));
#endif
connect(widget, SIGNAL(logfileWritten(QString)), this, SIGNAL(logfileWritten(QString))); connect(widget, SIGNAL(logfileWritten(QString)), this, SIGNAL(logfileWritten(QString)));
// Set system active if this is the only system // Set system active if this is the only system
if (active) if (active)
......
...@@ -49,7 +49,11 @@ This file is part of the PIXHAWK project ...@@ -49,7 +49,11 @@ This file is part of the PIXHAWK project
#define CONTROL_MODE_AUTO "MODE AUTO" #define CONTROL_MODE_AUTO "MODE AUTO"
#define CONTROL_MODE_TEST1 "MODE TEST1" #define CONTROL_MODE_TEST1 "MODE TEST1"
#define CONTROL_MODE_TEST2 "MODE TEST2" #define CONTROL_MODE_TEST2 "MODE TEST2"
#define CONTROL_MODE_TEST3 "MODE TEST3" #ifdef MAVLINK_ENABLED_SLUGS
#define CONTROL_MODE_TEST3 "MODE HIL"
#else
#define CONTROL_MODE_TEST3 "MODE TEST3"
#endif
#define CONTROL_MODE_READY "MODE TEST3" #define CONTROL_MODE_READY "MODE TEST3"
#define CONTROL_MODE_RC_TRAINING "RC SIMULATION" #define CONTROL_MODE_RC_TRAINING "RC SIMULATION"
......
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