Merge pull request #69 from x-sven/nav-fix

Sven's fix for "servo ticking" in auto1
This commit is contained in:
Felix Ruess
2011-09-27 05:05:01 -07:00
+2 -1
View File
@@ -175,7 +175,8 @@ bool_t nav_approaching_xy(float x, float y, float from_x, float from_y, float ap
#define NavAttitude(_roll) { \
lateral_mode = LATERAL_MODE_ROLL; \
h_ctl_roll_setpoint = _roll; \
if(pprz_mode != PPRZ_MODE_AUTO1) \
{h_ctl_roll_setpoint = _roll;} \
}
#define nav_IncreaseShift(x) { if (x==0) nav_shift = 0; else nav_shift += x; }