From 17a92b51c7b238fe7e3e1bf494bd72dc5fd1bcc9 Mon Sep 17 00:00:00 2001
From: tumbili <bapstr@ethz.ch>
Date: Fri, 7 Aug 2015 13:22:50 +0200
Subject: [PATCH] adapted code for standard vtol to new structure in
 vtol_att_control_main

---
 src/modules/vtol_att_control/standard.cpp | 12 +-----------
 src/modules/vtol_att_control/standard.h   |  4 +---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/modules/vtol_att_control/standard.cpp b/src/modules/vtol_att_control/standard.cpp
index c38a935ff7..1ccf54c11f 100644
--- a/src/modules/vtol_att_control/standard.cpp
+++ b/src/modules/vtol_att_control/standard.cpp
@@ -214,16 +214,6 @@ void Standard::update_mc_state()
 	// do nothing
 }
 
-void Standard::process_mc_data()
-{
-	fill_att_control_output();
-}
-
-void Standard::process_fw_data()
-{
-	fill_att_control_output();
-}
-
  void Standard::update_fw_state()
 {
 	// in fw mode we need the multirotor motors to stop spinning, in backtransition mode we let them spin up again	
@@ -242,7 +232,7 @@ void Standard::update_external_state()
  * Prepare message to acutators with data from mc and fw attitude controllers. An mc attitude weighting will determine
  * what proportion of control should be applied to each of the control groups (mc and fw).
  */
-void Standard::fill_att_control_output()
+void Standard::fill_actuator_outputs()
 {
 	/* multirotor controls */
 	_actuators_out_0->control[0] = _actuators_mc_in->control[0] * _mc_att_ctl_weight;	// roll
diff --git a/src/modules/vtol_att_control/standard.h b/src/modules/vtol_att_control/standard.h
index e4e1d92d85..bdc150e7a8 100644
--- a/src/modules/vtol_att_control/standard.h
+++ b/src/modules/vtol_att_control/standard.h
@@ -57,9 +57,7 @@ public:
 
 	void update_vtol_state();
 	void update_mc_state();
-	void process_mc_data();
 	void update_fw_state();
-	void process_fw_data();
 	void update_transition_state();
 	void update_external_state();
 
@@ -98,7 +96,7 @@ private:
 	float _mc_att_ctl_weight;	// the amount of multicopter attitude control that should be applied in fixed wing mode while transitioning 
 	float _airspeed_trans_blend_margin;
 
-	void fill_att_control_output();
+	void fill_actuator_outputs();
 	void set_max_mc(unsigned pwm_value);
 
 	int parameters_update();