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

Removed whitespace from end of lines

Browse source
This commit is contained in:
Martin Budden 2016-07-31 23:56:31 +01:00
parent 4b3904ad0d
commit eb490d65ee
24 changed files with 121 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/main/flight/navigation_rewrite.c
View file

@ -1211,43 +1211,43 @@ static void navProcessFSMEvents(navigationFSMEvent_t injectedEvent)
/* If timeout event defined and timeout reached - switch state */ /* If timeout event defined and timeout reached - switch state */
if ((navFSM[posControl.navState].timeoutMs > 0) && (navFSM[posControl.navState].onEvent[NAV_FSM_EVENT_TIMEOUT] != NAV_STATE_UNDEFINED) && if ((navFSM[posControl.navState].timeoutMs > 0) && (navFSM[posControl.navState].onEvent[NAV_FSM_EVENT_TIMEOUT] != NAV_STATE_UNDEFINED) &&
((currentMillis - lastStateProcessTime) >= navFSM[posControl.navState].timeoutMs)) { ((currentMillis - lastStateProcessTime) >= navFSM[posControl.navState].timeoutMs)) {
/* Update state */ /* Update state */
previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[NAV_FSM_EVENT_TIMEOUT]); previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[NAV_FSM_EVENT_TIMEOUT]);
/* Call new state's entry function */ /* Call new state's entry function */
while (navFSM[posControl.navState].onEntry) { while (navFSM[posControl.navState].onEntry) {
navigationFSMEvent_t newEvent = navFSM[posControl.navState].onEntry(previousState); navigationFSMEvent_t newEvent = navFSM[posControl.navState].onEntry(previousState);
if ((newEvent != NAV_FSM_EVENT_NONE) && (navFSM[posControl.navState].onEvent[newEvent] != NAV_STATE_UNDEFINED)) { if ((newEvent != NAV_FSM_EVENT_NONE) && (navFSM[posControl.navState].onEvent[newEvent] != NAV_STATE_UNDEFINED)) {
previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[newEvent]); previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[newEvent]);
} }
else { else {
break; break;
} }
} }
lastStateProcessTime = currentMillis; lastStateProcessTime = currentMillis;
} }
/* Inject new event */ /* Inject new event */
if (injectedEvent != NAV_FSM_EVENT_NONE && navFSM[posControl.navState].onEvent[injectedEvent] != NAV_STATE_UNDEFINED) { if (injectedEvent != NAV_FSM_EVENT_NONE && navFSM[posControl.navState].onEvent[injectedEvent] != NAV_STATE_UNDEFINED) {
/* Update state */ /* Update state */
previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[injectedEvent]); previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[injectedEvent]);
/* Call new state's entry function */ /* Call new state's entry function */
while (navFSM[posControl.navState].onEntry) { while (navFSM[posControl.navState].onEntry) {
navigationFSMEvent_t newEvent = navFSM[posControl.navState].onEntry(previousState); navigationFSMEvent_t newEvent = navFSM[posControl.navState].onEntry(previousState);
if ((newEvent != NAV_FSM_EVENT_NONE) && (navFSM[posControl.navState].onEvent[newEvent] != NAV_STATE_UNDEFINED)) { if ((newEvent != NAV_FSM_EVENT_NONE) && (navFSM[posControl.navState].onEvent[newEvent] != NAV_STATE_UNDEFINED)) {
previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[newEvent]); previousState = navSetNewFSMState(navFSM[posControl.navState].onEvent[newEvent]);
} }
else { else {
break; break;
} }
} }
lastStateProcessTime = currentMillis; lastStateProcessTime = currentMillis;
} }
/* Update public system state information */ /* Update public system state information */
NAV_Status.mode = MW_GPS_MODE_NONE; NAV_Status.mode = MW_GPS_MODE_NONE;