Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 02:36:37 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

VTOL: rename class variable flag_idle_mc to _flag_idle_mc

Browse Source 
Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
Silvan Fuhrer
2020-12-22 13:36:38 +01:00
committed by Lorenz Meier
parent 5c93403db7
commit 7e01938341
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/tailsitter.cpp
+2 -2
View File
@@ -232,8 +232,8 @@ void Tailsitter::update_transition_state()
const float trans_pitch_rate = M_PI_2_F / _params->back_trans_duration;
if (!flag_idle_mc) {
flag_idle_mc = set_idle_mc();
if (!_flag_idle_mc) {
_flag_idle_mc = set_idle_mc();
}
if (tilt > 0.01f) {
src/modules/vtol_att_control/tiltrotor.cpp
+2 -2
View File
@@ -351,8 +351,8 @@ void Tiltrotor::update_transition_state()
// set idle speed for rotary wing mode
if (!flag_idle_mc) {
flag_idle_mc = set_idle_mc();
if (!_flag_idle_mc) {
_flag_idle_mc = set_idle_mc();
}
// tilt rotors back
src/modules/vtol_att_control/vtol_type.cpp
+4 -4
View File
@@ -123,8 +123,8 @@ bool VtolType::init()
void VtolType::update_mc_state()
{
if (!flag_idle_mc) {
flag_idle_mc = set_idle_mc();
if (!_flag_idle_mc) {
_flag_idle_mc = set_idle_mc();
}
if (_motor_state != motor_state::ENABLED) {
@@ -142,8 +142,8 @@ void VtolType::update_mc_state()
void VtolType::update_fw_state()
{
if (flag_idle_mc) {
flag_idle_mc = !set_idle_fw();
if (_flag_idle_mc) {
_flag_idle_mc = !set_idle_fw();
}
if (_motor_state != motor_state::DISABLED) {
src/modules/vtol_att_control/vtol_type.h
+1 -1
View File
@@ -214,7 +214,7 @@ protected:
struct Params *_params;
bool flag_idle_mc = false; //false = "idle is set for fixed wing mode"; true = "idle is set for multicopter mode"
bool _flag_idle_mc = false; //false = "idle is set for fixed wing mode"; true = "idle is set for multicopter mode"
bool _pusher_active = false;
float _mc_roll_weight = 1.0f; // weight for multicopter attitude controller roll output