diff options
| author | Daniel Agar <daniel@agar.ca> | 2014-12-23 10:56:32 -0500 |
|---|---|---|
| committer | Daniel Agar <daniel@agar.ca> | 2014-12-23 11:18:30 -0500 |
| commit | d14fdf896b0081403908599a3164d09941d363c9 (patch) | |
| tree | 0ef279765f2988790f1d5329db3ce86352f8dd2f | |
| parent | d511e39ea7a3f1e0cb672b14598e18a7df18156a (diff) | |
| download | px4-firmware-d14fdf896b0081403908599a3164d09941d363c9.tar.gz px4-firmware-d14fdf896b0081403908599a3164d09941d363c9.tar.bz2 px4-firmware-d14fdf896b0081403908599a3164d09941d363c9.zip | |
rotate_3f() implement missing ROTATION_ROLL_270_YAW_270
| -rw-r--r-- | src/examples/fixedwing_control/module.mk | 2 | ||||
| -rw-r--r-- | src/lib/conversion/rotation.cpp | 4 | ||||
| -rw-r--r-- | src/modules/attitude_estimator_ekf/module.mk | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/examples/fixedwing_control/module.mk b/src/examples/fixedwing_control/module.mk index 3fab9c8d4..8707776ae 100644 --- a/src/examples/fixedwing_control/module.mk +++ b/src/examples/fixedwing_control/module.mk @@ -42,4 +42,4 @@ SRCS = main.c \ MODULE_STACKSIZE = 1200 -EXTRACFLAGS = -Wno-error +EXTRACFLAGS = -Wno-frame-larger-than diff --git a/src/lib/conversion/rotation.cpp b/src/lib/conversion/rotation.cpp index 3d3e13355..1fe36d395 100644 --- a/src/lib/conversion/rotation.cpp +++ b/src/lib/conversion/rotation.cpp @@ -182,8 +182,8 @@ rotate_3f(enum Rotation rot, float &x, float &y, float &z) return; } case ROTATION_ROLL_270_YAW_270: { - // unimplemented - ASSERT(0 == 1); + tmp = z; z = -y; y = tmp; + tmp = x; x = y; y = -tmp; return; } case ROTATION_PITCH_90: { diff --git a/src/modules/attitude_estimator_ekf/module.mk b/src/modules/attitude_estimator_ekf/module.mk index c4bf34229..96ba45242 100644 --- a/src/modules/attitude_estimator_ekf/module.mk +++ b/src/modules/attitude_estimator_ekf/module.mk @@ -43,7 +43,6 @@ SRCS = attitude_estimator_ekf_main.cpp \ MODULE_STACKSIZE = 1200 -EXTRACFLAGS = -Wno-float-equal -Wno-error - -EXTRACXXFLAGS = -Wno-error +EXTRACFLAGS = -Wno-float-equal +EXTRACXXFLAGS = -Wno-frame-larger-than |