Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-19 14:25:16 +03:00
Code Issues Wiki Activity

Merge branch 'master' of https://github.com/RomanLut/inav into osd-joystick

Browse source
This commit is contained in:
Roman Lut 2023-10-01 00:41:39 +02:00
commit 58899c9e4b
303 changed files with 6999 additions and 2264 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/programming/logic_condition.c
View file

@ -46,6 +46,7 @@
#include "sensors/rangefinder.h"
#include "flight/imu.h"
#include "flight/pid.h"
#include "flight/mixer_profile.h"
#include "drivers/io_port_expander.h"
#include "io/osd_common.h"
#include "sensors/diagnostics.h"
@ -425,6 +426,7 @@ static int logicConditionCompute(
pidInit();
pidInitFilters();
schedulePidGainsUpdate();
navigationUsePIDs(); //set navigation pid gains
profileChanged = true;
}
return profileChanged;
@ -781,6 +783,14 @@ static int logicConditionGetFlightOperandValue(int operand) {
case LOGIC_CONDITION_OPERAND_FLIGHT_ACTIVE_PROFILE: // int
return getConfigProfile() + 1;
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_ACTIVE_MIXER_PROFILE: // int
return currentMixerProfileIndex + 1;
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_MIXER_TRANSITION_ACTIVE: //0,1
return isMixerTransitionMixing ? 1 : 0;
break;
case LOGIC_CONDITION_OPERAND_FLIGHT_LOITER_RADIUS:
return getLoiterRadius(navConfig()->fw.loiter_radius);