diff options
| author | Lorenz Meier <lorenz@px4.io> | 2014-12-25 17:44:44 +0100 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2014-12-25 17:44:44 +0100 |
| commit | 6fae021a0091a6706b3cb0d4892b0f6891489dc2 (patch) | |
| tree | ed59a4a917af445d42e9216f6b9a89d00bde5a8f /src/lib | |
| parent | 4574c752c1e22eee779ee9d1a647ff9e9d5370b5 (diff) | |
| parent | 5b600a815c13af56e879029196a24e544c110b97 (diff) | |
| download | px4-firmware-6fae021a0091a6706b3cb0d4892b0f6891489dc2.tar.gz px4-firmware-6fae021a0091a6706b3cb0d4892b0f6891489dc2.tar.bz2 px4-firmware-6fae021a0091a6706b3cb0d4892b0f6891489dc2.zip | |
Merge pull request #1527 from dagar/Werror
turn on -Werror and fix resulting errors
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/conversion/rotation.cpp | 5 | ||||
| -rw-r--r-- | src/lib/rc/st24.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/conversion/rotation.cpp b/src/lib/conversion/rotation.cpp index e17715733..1fe36d395 100644 --- a/src/lib/conversion/rotation.cpp +++ b/src/lib/conversion/rotation.cpp @@ -181,6 +181,11 @@ rotate_3f(enum Rotation rot, float &x, float &y, float &z) x = tmp; return; } + case ROTATION_ROLL_270_YAW_270: { + tmp = z; z = -y; y = tmp; + tmp = x; x = y; y = -tmp; + return; + } case ROTATION_PITCH_90: { tmp = z; z = -x; x = tmp; return; diff --git a/src/lib/rc/st24.c b/src/lib/rc/st24.c index e8a791b8f..5c53a1602 100644 --- a/src/lib/rc/st24.c +++ b/src/lib/rc/st24.c @@ -72,7 +72,7 @@ const char *decode_states[] = {"UNSYNCED", #define ST24_SCALE_OFFSET (int)(ST24_TARGET_MIN - (ST24_SCALE_FACTOR * ST24_RANGE_MIN + 0.5f)) static enum ST24_DECODE_STATE _decode_state = ST24_DECODE_STATE_UNSYNCED; -static unsigned _rxlen; +static uint8_t _rxlen; static ReceiverFcPacket _rxpacket; |