Merge branch 'master' of git://github.com/tecnosapiens/qgroundcontrol into mergeRemote

src/ui/MainWindow.cc

@@ -903,33 +903,43 @@ void MainWindow::loadGlobalOperatorView()
         }
     }
 
-    // UAS CONTROL
-    if (controlDockWidget)
+    // WAYPOINT LIST
+    if (waypointsDockWidget)
     {
-        addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
-        controlDockWidget->show();
+        addDockWidget(Qt::BottomDockWidgetArea, waypointsDockWidget);
+        waypointsDockWidget->show();
     }
 
-    // UAS LIST
-    if (listDockWidget)
+    // Slugs Data View
+    if (slugsDataWidget)
     {
-        addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
-        listDockWidget->show();
+        addDockWidget(Qt::RightDockWidgetArea, slugsDataWidget);
+        slugsDataWidget->show();
     }
 
-    // UAS STATUS
-    if (infoDockWidget)
-    {
-        addDockWidget(Qt::LeftDockWidgetArea, infoDockWidget);
-        infoDockWidget->show();
-    }
 
-    // WAYPOINT LIST
-    if (waypointsDockWidget)
-    {
-        addDockWidget(Qt::BottomDockWidgetArea, waypointsDockWidget);
-        waypointsDockWidget->show();
-    }
+
+//    // UAS CONTROL
+//    if (controlDockWidget)
+//    {
+//        addDockWidget(Qt::LeftDockWidgetArea, controlDockWidget);
+//        controlDockWidget->show();
+//    }
+
+//    // UAS LIST
+//    if (listDockWidget)
+//    {
+//        addDockWidget(Qt::BottomDockWidgetArea, listDockWidget);
+//        listDockWidget->show();
+//    }
+
+//    // UAS STATUS
+//    if (infoDockWidget)
+//    {
+//        addDockWidget(Qt::LeftDockWidgetArea, infoDockWidget);
+//        infoDockWidget->show();
+//    }
+
 
 //    // HORIZONTAL SITUATION INDICATOR
 //    if (hsiDockWidget)
@@ -944,25 +954,25 @@ void MainWindow::loadGlobalOperatorView()
 //    }
 
     // PROCESS CONTROL
-    if (watchdogControlDockWidget)
-    {
-        addDockWidget(Qt::RightDockWidgetArea, watchdogControlDockWidget);
-        watchdogControlDockWidget->show();
-    }
+//    if (watchdogControlDockWidget)
+//    {
+//        addDockWidget(Qt::RightDockWidgetArea, watchdogControlDockWidget);
+//        watchdogControlDockWidget->show();
+//    }
 
     // HEAD UP DISPLAY
-    if (headUpDockWidget)
-    {
-        addDockWidget(Qt::RightDockWidgetArea, headUpDockWidget);
-        // FIXME Replace with default ->show() call
-        HUD* hud = dynamic_cast<HUD*>(headUpDockWidget->widget());
+//    if (headUpDockWidget)
+//    {
+//        addDockWidget(Qt::RightDockWidgetArea, headUpDockWidget);
+//        // FIXME Replace with default ->show() call
+//        HUD* hud = dynamic_cast<HUD*>(headUpDockWidget->widget());
 
-        if (hud)
-        {
-            headUpDockWidget->show();
-            hud->start();
-        }
-    }
+//        if (hud)
+//        {
+//            headUpDockWidget->show();
+//            hud->start();
+//        }
+//    }
 
 }
 

src/ui/SlugsDataSensorView.cc

@@ -255,6 +255,16 @@ void SlugsDataSensorView::refresh()
             ui->m_logFl6_textEdit->setText(QString::number(Logfl_6, 'f', 4));
 
             //refresh UI PWM Commands
+            ui->m_pwmThro->setText("No data");
+            ui->m_pwmThroTrim->setText("No data");
+            ui->m_pwmAile->setText("No data");
+            ui->m_pwmAileTrim->setText("No data");
+            ui->m_pwmElev->setText("No data");
+            ui->m_pwmElevTrim->setText("No data");
+            ui->m_pwmRudd->setText("No data");
+            ui->m_pwmRuddTrim->setText("No data");
+            ui->m_pwmFailSafe->setText("No data");
+            ui->m_pwmAvailable->setText("No data");
 
 
 

src/ui/SlugsDataSensorView.ui

@@ -35,7 +35,7 @@
    <item>
     <widget class="QTabWidget" name="SlugsSensorView_tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -2947,12 +2947,12 @@
      </widget>
      <widget class="QWidget" name="tab_3">
       <attribute name="title">
-       <string>Navigation</string>
+       <string>Tab 3</string>
       </attribute>
      </widget>
      <widget class="QWidget" name="tab_2">
       <attribute name="title">
-       <string>PWM Command</string>
+       <string>Tab 4</string>
       </attribute>
      </widget>
     </widget>