Browse Source

Minor compile fixes.

QGC4.4
James Goppert 13 years ago
parent
commit
d953c00731
  1. 1
      qgroundcontrol.pri
  2. 7
      src/comm/QGCFlightGearLink.cc

1
qgroundcontrol.pri

@ -172,6 +172,7 @@ macx|macx-g++42|macx-g++|macx-llvm: {
linux-g++|linux-g++-64{ linux-g++|linux-g++-64{
CONFIG -= console CONFIG -= console
DEFINES += __STDC_LIMIT_MACROS
release { release {
DEFINES += QT_NO_DEBUG DEFINES += QT_NO_DEBUG

7
src/comm/QGCFlightGearLink.cc

@ -338,7 +338,12 @@ bool QGCFlightGearLink::connectSimulation()
connect(mav, SIGNAL(hilControlsChanged(uint64_t, float, float, float, float, uint8_t, uint8_t)), this, SLOT(updateControls(uint64_t,float,float,float,float,uint8_t,uint8_t))); connect(mav, SIGNAL(hilControlsChanged(uint64_t, float, float, float, float, uint8_t, uint8_t)), this, SLOT(updateControls(uint64_t,float,float,float,float,uint8_t,uint8_t)));
connect(this, SIGNAL(hilStateChanged(uint64_t,float,float,float,float,float,float,int32_t,int32_t,int32_t,int16_t,int16_t,int16_t,int16_t,int16_t,int16_t)), mav, SLOT(sendHilState(uint64_t,float,float,float,float,float,float,int32_t,int32_t,int32_t,int16_t,int16_t,int16_t,int16_t,int16_t,int16_t))); connect(this, SIGNAL(hilStateChanged(uint64_t,float,float,float,float,float,float,int32_t,int32_t,int32_t,int16_t,int16_t,int16_t,int16_t,int16_t,int16_t)), mav, SLOT(sendHilState(uint64_t,float,float,float,float,float,float,int32_t,int32_t,int32_t,int16_t,int16_t,int16_t,int16_t,int16_t,int16_t)));
mav->startHil();
UAS* uas = dynamic_cast<UAS*>(mav);
if (uas)
{
uas->startHil();
}
//connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(sendUAVUpdate())); //connect(&refreshTimer, SIGNAL(timeout()), this, SLOT(sendUAVUpdate()));
// Catch process error // Catch process error

Loading…
Cancel
Save