fixed code style

src/modules/vtol_att_control/standard.cpp

@@ -254,7 +254,7 @@ void Standard::update_fw_state()
 	// copy virtual attitude setpoint to real attitude setpoint
 	memcpy(_v_att_sp, _fw_virtual_att_sp, sizeof(vehicle_attitude_setpoint_s));
 
-	// in fw mode we need the multirotor motors to stop spinning, in backtransition mode we let them spin up again	
+	// in fw mode we need the multirotor motors to stop spinning, in backtransition mode we let them spin up again
 	if (!_flag_enable_mc_motors) {
 		set_max_mc(950);
 		set_idle_fw();  // force them to stop, not just idle

src/modules/vtol_att_control/tailsitter.h

@@ -31,13 +31,13 @@
  *
  ****************************************************************************/
 
- /**
- * @file tiltrotor.h
- *
- * @author Roman Bapst 		<bapstroman@gmail.com>
- * @author David Vorsin     <davidvorsin@gmail.com>
- *
- */
+/**
+* @file tiltrotor.h
+*
+* @author Roman Bapst 		<bapstroman@gmail.com>
+* @author David Vorsin     <davidvorsin@gmail.com>
+*
+*/
 
 #ifndef TAILSITTER_H
 #define TAILSITTER_H
@@ -114,7 +114,7 @@ private:
 	struct {
 		vtol_mode flight_mode;			/**< vtol flight mode, defined by enum vtol_mode */
 		hrt_abstime transition_start;	/**< absoulte time at which front transition started */
-	}_vtol_schedule;
+	} _vtol_schedule;
 
 	float _airspeed_tot; 		/** speed estimation for propwash controlled surfaces */
 	float _roll_weight_mc;		/**< multicopter desired roll moment weight */
@@ -125,7 +125,7 @@ private:
 	float _min_front_trans_dur;	/**< min possible time in which rotors are rotated into the first position */
 
 
-    /** should this anouncement stay? **/
+	/** should this anouncement stay? **/
 	perf_counter_t	_loop_perf;			/**< loop performance counter */
 	perf_counter_t	_nonfinite_input_perf;		/**< performance counter for non finite input */
 

src/modules/vtol_att_control/tailsitter_params.c

@@ -50,7 +50,7 @@
  * @min 0.1
  * @max 2
  * @group VTOL Attitude Control
- 
+
 PARAM_DEFINE_FLOAT(VT_TRANS_P2_DUR, 0.5f);*/
 
 

src/modules/vtol_att_control/tiltrotor.cpp

@@ -306,6 +306,7 @@ void Tiltrotor::update_transition_state()
 		_throttle_transition = _actuators_mc_in->control[actuator_controls_s::INDEX_THROTTLE];
 		_flag_was_in_trans_mode = true;
 	}
+
 	if (_vtol_schedule.flight_mode == TRANSITION_FRONT_P1) {
 		// for the first part of the transition the rear rotors are enabled
 		if (_rear_motors != ENABLED) {

src/modules/vtol_att_control/vtol_att_control_main.cpp

@@ -512,6 +512,7 @@ void VtolAttitudeControl::publish_att_sp()
 	if (_v_att_sp_pub != nullptr) {
 		/* publish the attitude setpoint */
 		orb_publish(ORB_ID(vehicle_attitude_setpoint), _v_att_sp_pub, &_v_att_sp);
+
 	} else {
 		/* advertise and publish */
 		_v_att_sp_pub = orb_advertise(ORB_ID(vehicle_attitude_setpoint), &_v_att_sp);
@@ -740,7 +741,11 @@ VtolAttitudeControl::start()
 					   SCHED_DEFAULT,
 					   SCHED_PRIORITY_MAX - 10,
 					   2048,
+<<<<<<< HEAD
 					   (px4_main_t)&VtolAttitudeControl::task_main_trampoline,
+=======
+					   (main_t)&VtolAttitudeControl::task_main_trampoline,
+>>>>>>> fixed code style
 					   nullptr);
 
 	if (_control_task < 0) {

src/modules/vtol_att_control/vtol_att_control_main.h

@@ -107,27 +107,28 @@ public:
 	int start();	/* start the task and return OK on success */
 	bool is_fixed_wing_requested();
 
-	struct vehicle_attitude_s 			*get_att() {return &_v_att;}
-	struct vehicle_attitude_setpoint_s *get_att_sp() {return &_v_att_sp;}
-	struct mc_virtual_attitude_setpoint_s 	*get_mc_virtual_att_sp () {return &_mc_virtual_att_sp;}
-	struct fw_virtual_attitude_setpoint_s 	*get_fw_virtual_att_sp () {return &_fw_virtual_att_sp;}
-	struct vehicle_rates_setpoint_s 	*get_rates_sp() {return &_v_rates_sp;}
-	struct vehicle_rates_setpoint_s 	*get_mc_virtual_rates_sp() {return &_mc_virtual_v_rates_sp;}
-	struct vehicle_rates_setpoint_s 	*get_fw_virtual_rates_sp() {return &_fw_virtual_v_rates_sp;}
-	struct manual_control_setpoint_s 	*get_manual_control_sp() {return &_manual_control_sp;}
-	struct vehicle_control_mode_s 		*get_control_mode() {return &_v_control_mode;}
-	struct vtol_vehicle_status_s		*get_vehicle_status() {return &_vtol_vehicle_status;}
-	struct actuator_controls_s 		*get_actuators_out0() {return &_actuators_out_0;}
-	struct actuator_controls_s 		*get_actuators_out1() {return &_actuators_out_1;}
-	struct actuator_controls_s 		*get_actuators_mc_in() {return &_actuators_mc_in;}
-	struct actuator_controls_s 		*get_actuators_fw_in() {return &_actuators_fw_in;}
-	struct actuator_armed_s 			*get_armed() {return &_armed;}
-	struct vehicle_local_position_s 	*get_local_pos() {return &_local_pos;}
-	struct airspeed_s 					*get_airspeed() {return &_airspeed;}
-	struct battery_status_s 			*get_batt_status() {return &_batt_status;}
+	struct vehicle_attitude_s 				*get_att() {return &_v_att;}
+	struct vehicle_attitude_setpoint_s		*get_att_sp() {return &_v_att_sp;}
+	struct mc_virtual_attitude_setpoint_s 	*get_mc_virtual_att_sp() {return &_mc_virtual_att_sp;}
+	struct fw_virtual_attitude_setpoint_s 	*get_fw_virtual_att_sp() {return &_fw_virtual_att_sp;}
+	struct vehicle_rates_setpoint_s 		*get_rates_sp() {return &_v_rates_sp;}
+	struct vehicle_rates_setpoint_s 		*get_mc_virtual_rates_sp() {return &_mc_virtual_v_rates_sp;}
+	struct vehicle_rates_setpoint_s 		*get_fw_virtual_rates_sp() {return &_fw_virtual_v_rates_sp;}
+	struct manual_control_setpoint_s 		*get_manual_control_sp() {return &_manual_control_sp;}
+	struct vehicle_control_mode_s 			*get_control_mode() {return &_v_control_mode;}
+	struct vtol_vehicle_status_s			*get_vehicle_status() {return &_vtol_vehicle_status;}
+	struct actuator_controls_s 			*get_actuators_out0() {return &_actuators_out_0;}
+	struct actuator_controls_s 			*get_actuators_out1() {return &_actuators_out_1;}
+	struct actuator_controls_s 			*get_actuators_mc_in() {return &_actuators_mc_in;}
+	struct actuator_controls_s 			*get_actuators_fw_in() {return &_actuators_fw_in;}
+	struct actuator_armed_s 				*get_armed() {return &_armed;}
+	struct vehicle_local_position_s 		*get_local_pos() {return &_local_pos;}
+	struct airspeed_s 						*get_airspeed() {return &_airspeed;}
+	struct battery_status_s 				*get_batt_status() {return &_batt_status;}
 
 	struct Params 						*get_params() {return &_params;}
 
+
 private:
 //******************flags & handlers******************************************************
 	bool _task_should_exit;