Merge pull request #895 from PX4/hil_arming_fix

mavlink: Only sending HIL control commands if the system is actually armed

src/modules/mavlink/mavlink_messages.cpp

@@ -819,11 +819,11 @@ protected:
 
 	void send(const hrt_abstime t)
 	{
-		bool updated = status_sub->update(t);
-		updated |= pos_sp_triplet_sub->update(t);
-		updated |= act_sub->update(t);
+		bool updated = act_sub->update(t);
+		(void)pos_sp_triplet_sub->update(t);
+		(void)status_sub->update(t);
 
-		if (updated) {
+		if (updated && (status->arming_state == ARMING_STATE_ARMED)) {
 			/* translate the current syste state to mavlink state and mode */
 			uint8_t mavlink_state;
 			uint8_t mavlink_base_mode;
@@ -1353,7 +1353,7 @@ protected:
 		uint8_t orientation = 0;
 		uint8_t covariance = 20;
 
-		mavlink_msg_distance_sensor_send(_channel, range->timestamp / 1000, type, id, orientation, 
+		mavlink_msg_distance_sensor_send(_channel, range->timestamp / 1000, type, id, orientation,
 			range->minimum_distance*100, range->maximum_distance*100, range->distance*100, covariance);
 	}
 };