Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-15 04:15:38 +03:00
Code Issues Wiki Activity

Added PID Profiles to Programming framework

Browse source 
## Added PID Profiles to Programming framework
This allows setting the profile and getting the active profile in the programming framework.
This commit is contained in:
Darren Lines 2021-09-09 10:24:57 +01:00
parent 05629c8669
commit 51d5df1690
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#include "common/utils.h" #include "common/utils.h"
#include "rx/rx.h" #include "rx/rx.h"
#include "common/maths.h" #include "common/maths.h"
#include "fc/config.h"
#include "fc/fc_core.h" #include "fc/fc_core.h"
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
@ -333,6 +334,15 @@ static int logicConditionCompute(
} }
break; break;
case LOGIC_CONDITION_SET_PID_PROFILE:
operandA--;
if ( getConfigProfile() != operandA && (operandA >= 0 && operandA < MAX_PROFILE_COUNT)) {
return setConfigProfile(operandA);
} else {
return false;
}
break;
default: default:
return false; return false;
break; break;
@ -533,6 +543,10 @@ static int logicConditionGetFlightOperandValue(int operand) {
#endif #endif
break; break;
case LOGIC_CONDITION_OPERAND_FLIGHT_PID_PROFILE: // int
return getConfigProfile() + 1;
break;
default: default:
return 0; return 0;
break; break;

4
src/main/programming/logic_condition.h
View file

@ -70,7 +70,8 @@ typedef enum {
LOGIC_CONDITION_RC_CHANNEL_OVERRIDE = 38, LOGIC_CONDITION_RC_CHANNEL_OVERRIDE = 38,
LOGIC_CONDITION_SET_HEADING_TARGET = 39, LOGIC_CONDITION_SET_HEADING_TARGET = 39,
LOGIC_CONDITION_MODULUS = 40, LOGIC_CONDITION_MODULUS = 40,
LOGIC_CONDITION_LAST = 41, LOGIC_CONDITION_SET_PID_PROFILE = 41,
LOGIC_CONDITION_LAST = 42,
} logicOperation_e; } logicOperation_e;
typedef enum logicOperandType_s { typedef enum logicOperandType_s {
@ -120,6 +121,7 @@ typedef enum {
LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_LQ, // 32 LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_LQ, // 32
LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_SNR, // 33 LOGIC_CONDITION_OPERAND_FLIGHT_CRSF_SNR, // 33
LOGIC_CONDITION_OPERAND_FLIGHT_GPS_VALID, // 0/1 // 34 LOGIC_CONDITION_OPERAND_FLIGHT_GPS_VALID, // 0/1 // 34
LOGIC_CONDITION_OPERAND_FLIGHT_PID_PROFILE, //int // 35
} logicFlightOperands_e; } logicFlightOperands_e;