Merge branch 'master' of pixhawk.ethz.ch:qgroundcontrol

src/uas/PxQuadMAV.cc

@@ -116,7 +116,8 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit errCountChanged(uasId, "IMU", "SPI0", status.spi0_err_count);
                 emit errCountChanged(uasId, "IMU", "SPI1", status.spi1_err_count);
                 emit errCountChanged(uasId, "IMU", "UART", status.uart_total_err_count);
-                emit valueChanged(this, "Load", ((float)status.load)/1000.0f, MG::TIME::getGroundTimeNow());
+                qDebug() << "System Load:" << status.load;
+                emit UAS::valueChanged(this, "Load", ((float)status.load)/1000.0f, MG::TIME::getGroundTimeNow());
             }
             break;
         case MAVLINK_MSG_ID_CONTROL_STATUS: