Merge branch 'dev' of github.com:pixhawk/qgroundcontrol into experimental

src/comm/MAVLinkSimulationMAV.cc

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

src/uas/UAS.cc

@@ -349,6 +349,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 }
             }
             break;
+
+        #ifdef MAVLINK_ENABLED_PIXHAWK
         case MAVLINK_MSG_ID_CONTROL_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);
             }
             break;
+		#endif // PIXHAWK 
         case MAVLINK_MSG_ID_RAW_IMU:
             {
                 mavlink_raw_imu_t raw;