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

[VTX] Fix compilation with VTX control enabled without SAUDIO/TRAMP

Browse source
This commit is contained in:
Alberto García Hierro 2020-10-04 11:38:48 +01:00
parent 44ba834948
commit 2a727dff68
4 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/vtx_common.h
View file

@ -46,6 +46,10 @@
#define VTX_SETTINGS_FREQCMD #define VTX_SETTINGS_FREQCMD
#define VTX_SETTINGS_MAX_POWER (VTX_SETTINGS_POWER_COUNT - VTX_SETTINGS_MIN_POWER + 1) #define VTX_SETTINGS_MAX_POWER (VTX_SETTINGS_POWER_COUNT - VTX_SETTINGS_MIN_POWER + 1)
#else
#define VTX_SETTINGS_DEFAULT_POWER 0
#endif #endif
// check value for MSP_SET_VTX_CONFIG to determine if value is encoded // check value for MSP_SET_VTX_CONFIG to determine if value is encoded

2
src/main/fc/rc_adjustments.c
View file

@ -548,6 +548,7 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
case ADJUSTMENT_FW_MIN_THROTTLE_DOWN_PITCH_ANGLE: case ADJUSTMENT_FW_MIN_THROTTLE_DOWN_PITCH_ANGLE:
applyAdjustmentU16(ADJUSTMENT_FW_MIN_THROTTLE_DOWN_PITCH_ANGLE, &mixerConfigMutable()->fwMinThrottleDownPitchAngle, delta, 0, FW_MIN_THROTTLE_DOWN_PITCH_ANGLE_MAX); applyAdjustmentU16(ADJUSTMENT_FW_MIN_THROTTLE_DOWN_PITCH_ANGLE, &mixerConfigMutable()->fwMinThrottleDownPitchAngle, delta, 0, FW_MIN_THROTTLE_DOWN_PITCH_ANGLE_MAX);
break; break;
#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
case ADJUSTMENT_VTX_POWER_LEVEL: case ADJUSTMENT_VTX_POWER_LEVEL:
{ {
vtxDeviceCapability_t vtxDeviceCapability; vtxDeviceCapability_t vtxDeviceCapability;
@ -556,6 +557,7 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
} }
} }
break; break;
#endif
default: default:
break; break;
}; };

1
src/main/fc/settings.yaml
View file

@ -3012,6 +3012,7 @@ groups:
- name: PG_VTX_SETTINGS_CONFIG - name: PG_VTX_SETTINGS_CONFIG
type: vtxSettingsConfig_t type: vtxSettingsConfig_t
headers: ["drivers/vtx_common.h", "io/vtx.h"] headers: ["drivers/vtx_common.h", "io/vtx.h"]
condition: USE_VTX_SMARTAUDIO || USE_VTX_TRAMP
members: members:
- name: vtx_band - name: vtx_band
description: "Configure the VTX band. Set to zero to use `vtx_freq`. Bands: 1: A, 2: B, 3: E, 4: F, 5: Race." description: "Configure the VTX band. Set to zero to use `vtx_freq`. Bands: 1: A, 2: B, 3: E, 4: F, 5: Race."

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

@ -207,6 +207,7 @@ static int logicConditionCompute(
break; break;
case LOGIC_CONDITION_SET_VTX_POWER_LEVEL: case LOGIC_CONDITION_SET_VTX_POWER_LEVEL:
#if defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP)
if ( if (
logicConditionValuesByType[LOGIC_CONDITION_SET_VTX_POWER_LEVEL] != operandA && logicConditionValuesByType[LOGIC_CONDITION_SET_VTX_POWER_LEVEL] != operandA &&
vtxCommonGetDeviceCapability(vtxCommonDevice(), &vtxDeviceCapability) vtxCommonGetDeviceCapability(vtxCommonDevice(), &vtxDeviceCapability)
@ -218,6 +219,9 @@ static int logicConditionCompute(
return false; return false;
} }
break; break;
#else
return false;
#endif
case LOGIC_CONDITION_SET_VTX_BAND: case LOGIC_CONDITION_SET_VTX_BAND:
if ( if (
@ -629,4 +633,4 @@ int16_t getRcCommandOverride(int16_t command[], uint8_t axis) {
} }
return outputValue; return outputValue;
} }