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

inhibit change if WP active

Browse source
This commit is contained in:
breadoven 2022-09-04 12:38:43 +01:00
parent b37548c418
commit 11bc996ecf
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -609,7 +609,7 @@ static void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t
} }
#ifdef USE_MULTI_MISSION #ifdef USE_MULTI_MISSION
case ADJUSTMENT_NAV_WP_MULTI_MISSION_INDEX: case ADJUSTMENT_NAV_WP_MULTI_MISSION_INDEX:
if (posControl.multiMissionCount) { if (posControl.multiMissionCount && !FLIGHT_MODE(NAV_WP_MODE)) {
applyAdjustmentU8(ADJUSTMENT_NAV_WP_MULTI_MISSION_INDEX, &navConfigMutable()->general.waypoint_multi_mission_index, delta, SETTING_NAV_WP_MULTI_MISSION_INDEX_MIN, posControl.multiMissionCount); applyAdjustmentU8(ADJUSTMENT_NAV_WP_MULTI_MISSION_INDEX, &navConfigMutable()->general.waypoint_multi_mission_index, delta, SETTING_NAV_WP_MULTI_MISSION_INDEX_MIN, posControl.multiMissionCount);
} }
break; break;

2
src/main/navigation/navigation.c
View file

@ -3218,7 +3218,7 @@ bool updateWpMissionChange(void)
* Note: On disarm wpMissionStartIndex set to 0, posControl.waypointCount set to totalMultiMissionWpCount. * Note: On disarm wpMissionStartIndex set to 0, posControl.waypointCount set to totalMultiMissionWpCount.
* wpMissionStartIndex and posControl.waypointCount reset for flight on arming */ * wpMissionStartIndex and posControl.waypointCount reset for flight on arming */
if (posControl.multiMissionCount <= 1 || posControl.wpPlannerActiveWPIndex) { if (posControl.multiMissionCount <= 1 || posControl.wpPlannerActiveWPIndex || FLIGHT_MODE(NAV_WP_MODE)) {
posControl.multiMissionCount = posControl.wpPlannerActiveWPIndex ? 0 : posControl.multiMissionCount; posControl.multiMissionCount = posControl.wpPlannerActiveWPIndex ? 0 : posControl.multiMissionCount;
return true; return true;
} }