Commit 0ed3c12d authored by Mariano Lizarraga's avatar Mariano Lizarraga

Added the Raw IMU message to the SLUGS data view display

parent eff0195a
...@@ -69,6 +69,10 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -69,6 +69,10 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
#ifdef MAVLINK_ENABLED_SLUGS #ifdef MAVLINK_ENABLED_SLUGS
case MAVLINK_MSG_ID_RAW_IMU:
mavlink_msg_raw_imu_decode(&message, &mlRawImuData);
break;
case MAVLINK_MSG_ID_BOOT: case MAVLINK_MSG_ID_BOOT:
mavlink_msg_boot_decode(&message,&mlBoot); mavlink_msg_boot_decode(&message,&mlBoot);
emit slugsBootMsg(uasId, mlBoot); emit slugsBootMsg(uasId, mlBoot);
...@@ -132,7 +136,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -132,7 +136,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
case MAVLINK_MSG_ID_CTRL_SRFC_PT: //181 case MAVLINK_MSG_ID_CTRL_SRFC_PT: //181
break; break;
case MAVLINK_MSG_ID_PID: //182 case MAVLINK_MSG_ID_PID: //182
memset(&mlSinglePid,0,sizeof(mavlink_pid_t)); memset(&mlSinglePid,0,sizeof(mavlink_pid_t));
...@@ -140,8 +144,6 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) ...@@ -140,8 +144,6 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
// qDebug() << "\nSLUGS RECEIVED PID Message = "<<mlSinglePid.idx; // qDebug() << "\nSLUGS RECEIVED PID Message = "<<mlSinglePid.idx;
emit slugsPidValues(uasId, mlSinglePid); emit slugsPidValues(uasId, mlSinglePid);
break; break;
case MAVLINK_MSG_ID_SLUGS_ACTION: //183 case MAVLINK_MSG_ID_SLUGS_ACTION: //183
...@@ -174,10 +176,9 @@ void SlugsMAV::emitSignals (void){ ...@@ -174,10 +176,9 @@ void SlugsMAV::emitSignals (void){
case 3: case 3:
emit remoteControlChannelScaledChanged(0,(mlPilotConsoleData.de- 1000.0f)/1000.0f); emit remoteControlChannelScaledChanged(0,(mlPilotConsoleData.de- 1000.0f)/1000.0f);
emit remoteControlChannelScaledChanged(1,(mlPilotConsoleData.dla- 1000.0f)/1000.0f); emit remoteControlChannelScaledChanged(1,(mlPilotConsoleData.dla- 1000.0f)/1000.0f);
emit remoteControlChannelScaledChanged(2,(mlPilotConsoleData.dr- 1000.0f)/1000.0f); emit remoteControlChannelScaledChanged(2,(mlPilotConsoleData.dr- 1000.0f)/1000.0f);
emit remoteControlChannelScaledChanged(3,(mlPilotConsoleData.dra- 1000.0f)/1000.0f); emit remoteControlChannelScaledChanged(3,(mlPilotConsoleData.dra- 1000.0f)/1000.0f);
emit remoteControlChannelScaledChanged(0,(mlPilotConsoleData.dt- 1000.0f)/1000.0f);
emit slugsPWM(uasId, mlPwmCommands); emit slugsPWM(uasId, mlPwmCommands);
break; break;
......
...@@ -215,7 +215,8 @@ void MainWindow::buildPxWidgets() ...@@ -215,7 +215,8 @@ void MainWindow::buildPxWidgets()
void MainWindow::buildSlugsWidgets() void MainWindow::buildSlugsWidgets()
{ {
// Center widgets // Center widgets
linechartWidget = new Linecharts(this); // linechartWidget = new Linecharts(this);
// addToCentralWidgetsMenu(linechartWidget, "Line Plots", SLOT(showCentralWidget()), CENTRAL_LINECHART);
// Dock widgets // Dock widgets
headUpDockWidget = new QDockWidget(tr("Control Indicator"), this); headUpDockWidget = new QDockWidget(tr("Control Indicator"), this);
...@@ -1145,7 +1146,7 @@ void MainWindow::presentView() { ...@@ -1145,7 +1146,7 @@ void MainWindow::presentView() {
if (settings.value(buildMenuKey (SUB_SECTION_CHECKED,MENU_HUD,currentView)).toBool()){ if (settings.value(buildMenuKey (SUB_SECTION_CHECKED,MENU_HUD,currentView)).toBool()){
tmpHud->start(); tmpHud->start();
addDockWidget(static_cast <Qt::DockWidgetArea>(settings.value(buildMenuKey (SUB_SECTION_LOCATION,MENU_HUD, currentView)).toInt()), addDockWidget(static_cast <Qt::DockWidgetArea>(settings.value(buildMenuKey (SUB_SECTION_LOCATION,MENU_HUD, currentView)).toInt()),
hsiDockWidget); headUpDockWidget);
headUpDockWidget->show(); headUpDockWidget->show();
} else { } else {
tmpHud->stop(); tmpHud->stop();
...@@ -1547,7 +1548,7 @@ void MainWindow::load3DView() ...@@ -1547,7 +1548,7 @@ void MainWindow::load3DView()
========== ATTIC ================= ========== ATTIC =================
================================== ==================================
void MainWindow::buildCommonWidgets() void MainWindow::buildWidgets()
{ {
//FIXME: memory of acceptList will never be freed again //FIXME: memory of acceptList will never be freed again
QStringList* acceptList = new QStringList(); QStringList* acceptList = new QStringList();
...@@ -1690,7 +1691,7 @@ void MainWindow::connectWidgets() ...@@ -1690,7 +1691,7 @@ void MainWindow::connectWidgets()
} }
void MainWindow::arrangeCommonCenterStack() void MainWindow::arrangeCenterStack()
{ {
QStackedWidget *centerStack = new QStackedWidget(this); QStackedWidget *centerStack = new QStackedWidget(this);
......
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