zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of git://github.com/pixhawk/qgroundcontrol

QGC4.4
Bryan Godbolt 15 years ago
parent
30108561d2 4fe9707c92
commit
5e4c8f67ee
6 changed files with 30 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/comm/MAVLinkSimulationLink.cc
  2. 12
      src/comm/QGCMAVLink.h
  3. 4
      src/uas/PxQuadMAV.cc
  4. 2
      src/uas/SlugsMAV.cc
  5. 28
      src/uas/UAS.cc
  6. 2
      src/ui/QGCRemoteControlView.cc

14
src/comm/MAVLinkSimulationLink.cc
Unescape View File

@ -182,7 +182,7 @@ void MAVLinkSimulationLink::mainloop() @@ -182,7 +182,7 @@ void MAVLinkSimulationLink::mainloop()
mavlink_attitude_t attitude;
memset(&attitude, 0, sizeof(mavlink_attitude_t));
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_raw_aux_t rawAuxValues;
memset(&rawAuxValues, 0, sizeof(mavlink_raw_aux_t));
#endif
@ -305,7 +305,7 @@ void MAVLinkSimulationLink::mainloop() @@ -305,7 +305,7 @@ void MAVLinkSimulationLink::mainloop()
{
rawImuValues.zgyro = d;
}
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
if (keys.value(i, "") == "Pressure")
{
rawAuxValues.baro = d;
@ -468,7 +468,7 @@ void MAVLinkSimulationLink::mainloop() @@ -468,7 +468,7 @@ void MAVLinkSimulationLink::mainloop()
static int detectionCounter = 6;
if (detectionCounter % 10 == 0)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_pattern_detected_t detected;
detected.confidence = 5.0f;
@ -582,7 +582,7 @@ void MAVLinkSimulationLink::mainloop() @@ -582,7 +582,7 @@ void MAVLinkSimulationLink::mainloop()
uint8_t visLock = 3;
uint8_t posLock = qMax(gpsLock, visLock);
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl);
#endif
@ -619,7 +619,7 @@ void MAVLinkSimulationLink::mainloop() @@ -619,7 +619,7 @@ void MAVLinkSimulationLink::mainloop()
//qDebug() << "BOOT" << "BUF LEN" << bufferlength << "POINTER" << streampointer;
// AUX STATUS
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
rawAuxValues.vbat = voltage;
#endif
@ -760,14 +760,12 @@ void MAVLinkSimulationLink::writeBytes(const char* data, qint64 size) @@ -760,14 +760,12 @@ void MAVLinkSimulationLink::writeBytes(const char* data, qint64 size)
}
}
break;
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAVLINK_MSG_ID_MANUAL_CONTROL:
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
mavlink_manual_control_t control;
mavlink_msg_manual_control_decode(&msg, &control);
qDebug() << "\n" << "ROLL:" << control.roll << "PITCH:" << control.pitch;
#endif
}
break;
#endif

12
src/comm/QGCMAVLink.h
Unescape View File

@ -33,17 +33,17 @@ This file is part of the QGROUNDCONTROL project @@ -33,17 +33,17 @@ This file is part of the QGROUNDCONTROL project
#include <mavlink_types.h>
#include <mavlink.h>
#ifdef QGC_USE_PIXHAWK_MESSAGES
//#ifdef QGC_USE_PIXHAWK_MESSAGES
#include <pixhawk.h>
#endif
//#endif
#ifdef QGC_USE_SLUGS_MESSAGES
//#ifdef QGC_USE_SLUGS_MESSAGES
#include <slugs.h>
#endif
//#endif
#ifdef QGC_USE_UALBERTA_MESSAGES
//#ifdef QGC_USE_UALBERTA_MESSAGES
#include <ualberta.h>
#endif
//#endif
#ifdef QGC_USE_ARDUPILOT_MESSAGES
#include <ardupilot.h>

4
src/uas/PxQuadMAV.cc
Unescape View File

@ -46,7 +46,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -46,7 +46,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
//qDebug() << "PX RECEIVED" << msg->sysid << msg->compid << msg->msgid;
// Only compile this portion if matching MAVLink packets have been compiled
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
if (message.sysid == uasId)
{
@ -169,7 +169,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -169,7 +169,7 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int command)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_watchdog_command_t payload;
payload.target_system_id = uasId;
payload.watchdog_id = watchdogId;

2
src/uas/SlugsMAV.cc
Unescape View File

@ -53,7 +53,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -53,7 +53,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
break;
}
#ifdef MAVLINK_ENABLED_SLUGS_MESSAGES_QGC
#ifdef MAVLINK_ENABLED_SLUGS
case MAVLINK_MSG_ID_CPU_LOAD:
{

28
src/uas/UAS.cc
Unescape View File

@ -556,7 +556,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -556,7 +556,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit textMessageReceived(uasId, message.compid, severity, text);
}
break;
#ifdef MAVLINK_ENABLED_UALBERTA_MESSAGES
#ifdef MAVLINK_ENABLED_UALBERTA
case MAVLINK_MSG_ID_NAV_FILTER_BIAS:
{
mavlink_nav_filter_bias_t bias;
@ -623,7 +623,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message) @@ -623,7 +623,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
void UAS::setLocalPositionSetpoint(float x, float y, float z, float yaw)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_message_t msg;
mavlink_msg_position_control_setpoint_set_pack(mavlink->getSystemId(), mavlink->getComponentId(), &msg, uasId, 0, 0, x, y, z, yaw);
sendMessage(msg);
@ -632,7 +632,7 @@ void UAS::setLocalPositionSetpoint(float x, float y, float z, float yaw) @@ -632,7 +632,7 @@ void UAS::setLocalPositionSetpoint(float x, float y, float z, float yaw)
void UAS::setLocalPositionOffset(float x, float y, float z, float yaw)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_message_t msg;
mavlink_msg_position_control_offset_set_pack(mavlink->getSystemId(), mavlink->getComponentId(), &msg, uasId, 0, x, y, z, yaw);
sendMessage(msg);
@ -862,7 +862,7 @@ void UAS::readParametersFromStorage() @@ -862,7 +862,7 @@ void UAS::readParametersFromStorage()
void UAS::enableAllDataTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -888,7 +888,7 @@ void UAS::enableAllDataTransmission(bool enabled) @@ -888,7 +888,7 @@ void UAS::enableAllDataTransmission(bool enabled)
void UAS::enableRawSensorDataTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -912,7 +912,7 @@ void UAS::enableRawSensorDataTransmission(bool enabled) @@ -912,7 +912,7 @@ void UAS::enableRawSensorDataTransmission(bool enabled)
void UAS::enableExtendedSystemStatusTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -936,7 +936,7 @@ void UAS::enableExtendedSystemStatusTransmission(bool enabled) @@ -936,7 +936,7 @@ void UAS::enableExtendedSystemStatusTransmission(bool enabled)
void UAS::enableRCChannelDataTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -964,7 +964,7 @@ void UAS::enableRCChannelDataTransmission(bool enabled) @@ -964,7 +964,7 @@ void UAS::enableRCChannelDataTransmission(bool enabled)
void UAS::enableRawControllerDataTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -988,7 +988,7 @@ void UAS::enableRawControllerDataTransmission(bool enabled) @@ -988,7 +988,7 @@ void UAS::enableRawControllerDataTransmission(bool enabled)
void UAS::enableRawSensorFusionTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -1012,7 +1012,7 @@ void UAS::enableRawSensorFusionTransmission(bool enabled) @@ -1012,7 +1012,7 @@ void UAS::enableRawSensorFusionTransmission(bool enabled)
void UAS::enablePositionTransmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -1036,7 +1036,7 @@ void UAS::enablePositionTransmission(bool enabled) @@ -1036,7 +1036,7 @@ void UAS::enablePositionTransmission(bool enabled)
void UAS::enableExtra1Transmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -1060,7 +1060,7 @@ void UAS::enableExtra1Transmission(bool enabled) @@ -1060,7 +1060,7 @@ void UAS::enableExtra1Transmission(bool enabled)
void UAS::enableExtra2Transmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -1084,7 +1084,7 @@ void UAS::enableExtra2Transmission(bool enabled) @@ -1084,7 +1084,7 @@ void UAS::enableExtra2Transmission(bool enabled)
void UAS::enableExtra3Transmission(bool enabled)
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
// Buffers to write data to
mavlink_message_t msg;
mavlink_request_data_stream_t stream;
@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double @@ -1200,7 +1200,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
// if(mode == (int)MAV_MODE_MANUAL)
// {
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_message_t message;
mavlink_msg_manual_control_pack(MG::SYSTEM::ID, MG::SYSTEM::COMPID, &message, this->uasId, (float)manualRollAngle, (float)manualPitchAngle, (float)manualYawAngle, (float)manualThrust, controlRollManual, controlPitchManual, controlYawManual, controlThrustManual);
sendMessage(message);

2
src/ui/QGCRemoteControlView.cc
Unescape View File

@ -187,7 +187,7 @@ void QGCRemoteControlView::changeEvent(QEvent *e) @@ -187,7 +187,7 @@ void QGCRemoteControlView::changeEvent(QEvent *e)
QWidget::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
//ui->retranslateUi(this);
break;
default:
break;

Write Preview
Loading…
Cancel
Save