|
|
|
@ -61,15 +61,16 @@ Sub::Sub(void) :
@@ -61,15 +61,16 @@ Sub::Sub(void) :
|
|
|
|
|
condition_start(0), |
|
|
|
|
G_Dt(MAIN_LOOP_SECONDS), |
|
|
|
|
inertial_nav(ahrs), |
|
|
|
|
attitude_control(ahrs, aparm, motors, MAIN_LOOP_SECONDS), |
|
|
|
|
pos_control(ahrs, inertial_nav, motors, attitude_control, |
|
|
|
|
ahrs_view(ahrs, ROTATION_NONE), |
|
|
|
|
attitude_control(ahrs_view, aparm, motors, MAIN_LOOP_SECONDS), |
|
|
|
|
pos_control(ahrs_view, inertial_nav, motors, attitude_control, |
|
|
|
|
g.p_alt_hold, g.p_vel_z, g.pid_accel_z, |
|
|
|
|
g.p_pos_xy, g.pi_vel_xy), |
|
|
|
|
#if AVOIDANCE_ENABLED == ENABLED |
|
|
|
|
avoid(ahrs, inertial_nav, fence, g2.proximity), |
|
|
|
|
#endif |
|
|
|
|
wp_nav(inertial_nav, ahrs, pos_control, attitude_control), |
|
|
|
|
circle_nav(inertial_nav, ahrs, pos_control), |
|
|
|
|
wp_nav(inertial_nav, ahrs_view, pos_control, attitude_control), |
|
|
|
|
circle_nav(inertial_nav, ahrs_view, pos_control), |
|
|
|
|
pmTest1(0), |
|
|
|
|
fast_loopTimer(0), |
|
|
|
|
mainLoop_count(0), |
|
|
|
|