Browse Source

Fixed some build errors.

QGC4.4
James Goppert 15 years ago
parent
commit
15ce5ef81c
  1. 2
      src/comm/MAVLinkSimulationMAV.cc
  2. 3
      src/uas/UAS.cc

2
src/comm/MAVLinkSimulationMAV.cc

@ -158,6 +158,7 @@ void MAVLinkSimulationMAV::mainloop()
// The message container to be used for sending // The message container to be used for sending
mavlink_message_t ret; mavlink_message_t ret;
#ifdef MAVLINK_ENABLED_PIXHAWK
// Send which controllers are active // Send which controllers are active
mavlink_control_status_t control_status; mavlink_control_status_t control_status;
control_status.control_att = 1; control_status.control_att = 1;
@ -169,6 +170,7 @@ void MAVLinkSimulationMAV::mainloop()
control_status.vision_fix = 0; // no fix from vision system control_status.vision_fix = 0; // no fix from vision system
mavlink_msg_control_status_encode(systemid, MAV_COMP_ID_IMU, &ret, &control_status); mavlink_msg_control_status_encode(systemid, MAV_COMP_ID_IMU, &ret, &control_status);
link->sendMAVLinkMessage(&ret); link->sendMAVLinkMessage(&ret);
#endif //MAVLINK_ENABLED_PIXHAWK
// Send actual controller outputs // Send actual controller outputs
// This message just shows the direction // This message just shows the direction

3
src/uas/UAS.cc

@ -349,6 +349,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
} }
} }
break; break;
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAVLINK_MSG_ID_CONTROL_STATUS: case MAVLINK_MSG_ID_CONTROL_STATUS:
{ {
mavlink_control_status_t status; mavlink_control_status_t status;
@ -365,6 +367,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit gpsLocalizationChanged(this, status.gps_fix); emit gpsLocalizationChanged(this, status.gps_fix);
} }
break; break;
#endif // PIXHAWK
case MAVLINK_MSG_ID_RAW_IMU: case MAVLINK_MSG_ID_RAW_IMU:
{ {
mavlink_raw_imu_t raw; mavlink_raw_imu_t raw;

Loading…
Cancel
Save