diff --git a/src/flightpathplanner2.jl b/src/flightpathplanner2.jl index 105a79c0..3e7bd1fc 100644 --- a/src/flightpathplanner2.jl +++ b/src/flightpathplanner2.jl @@ -110,7 +110,7 @@ function on_new_data(fpp::FlightPathPlanner, depower, length, heading, height, t elseif state == FLY_LEFT && phi > fpp.fpca._phi_sw fpp.fpca.fig8 += 1 _switch(fpp, TURN_LEFT) - elseif state == TURN_LEFT && (psi > deg2rad(180.0 + fpp.fpca._heading_offset) || fpp.timeout > 145) + elseif state == TURN_LEFT && (psi > deg2rad(180.0 + fpp.fpca._heading_offset) || fpp.timeout > fpp.fpps.timeout) _switch(fpp, FLY_RIGHT) elseif state == FLY_RIGHT && phi >= phi_3 if ! fpp.finish @@ -120,7 +120,7 @@ function on_new_data(fpp::FlightPathPlanner, depower, length, heading, height, t _switch(fpp, UP_TURN_LEFT) elseif state == FLY_RIGHT && phi < -fpp.fpca._phi_sw # && _switch(fpp, TURN_RIGHT) - elseif state == TURN_RIGHT && (psi < deg2rad(180.0 + fpp.fpca._heading_offset) || fpp.timeout > 145) + elseif state == TURN_RIGHT && (psi < deg2rad(180.0 + fpp.fpca._heading_offset) || fpp.timeout > fpp.fpps.timeout) if fpp.fpps.log_level > 0 println("timeout TURN_RIGHT: $(fpp.timeout)") end diff --git a/src/fpp_settings.jl b/src/fpp_settings.jl index 57f39e52..836aee60 100644 --- a/src/fpp_settings.jl +++ b/src/fpp_settings.jl @@ -24,6 +24,7 @@ heading_offset_up::Float64 = 60.0 heading_upper_turn::Float64 = 360.0-25.0 k_factor::Float64 = 1.0 + timeout::Float64 = 145 end StructTypes.StructType(::Type{FPPSettings}) = StructTypes.Mutable()