From 4a4c0d585d91086183d86193230ff943d737b1a5 Mon Sep 17 00:00:00 2001 From: "timecop@gmail.com" Date: Sun, 23 Sep 2012 11:41:02 +0000 Subject: [PATCH] sign error in HEX6P mix. git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@224 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61 --- obj/baseflight.hex | 6 +++--- src/config.c | 2 +- src/mixer.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/obj/baseflight.hex b/obj/baseflight.hex index 5a92c4211..46b622383 100644 --- a/obj/baseflight.hex +++ b/obj/baseflight.hex @@ -247,7 +247,7 @@ :100F50004572726F72733A2025640D0A000000001A :100F60004166726F333220434C4920766572736953 :100F70006F6E20322E302053657020323120323097 -:100F80003132202F2031333A30383A3336000000E6 +:100F80003132202F2032313A33303A3435000000EC :100F9000490200200D0A456E746572696E67204330 :100FA0004C49204D6F64652C20747970652027654D :100FB0007869742720746F2072657475726E2C20A6 @@ -2791,8 +2791,8 @@ :10AE50000000803F000080BFD0B35DBF000080BF16 :10AE60000000803F0000803FD0B35D3F0000803F86 :10AE70000000803F0000803FD0B35DBF000080BF76 -:10AE80000000803F00000000D0B35D3F0000803F25 -:10AE90000000803F00000000D0B35DBF000080BF15 +:10AE80000000803F00000000D0B35DBF0000803FA5 +:10AE90000000803F00000000D0B35D3F000080BF95 :10AEA0000000803F000000000000803F000080BFE5 :10AEB0000000803F000080BF000080BF0000000055 :10AEC0000000803F000000000000803F0000803F45 diff --git a/src/config.c b/src/config.c index 66e164683..9190f172f 100755 --- a/src/config.c +++ b/src/config.c @@ -58,7 +58,7 @@ void readEEPROM(void) uint8_t i; // Read flash - memcpy(&cfg, (char *) FLASH_WRITE_ADDR, sizeof(config_t)); + memcpy(&cfg, (char *)FLASH_WRITE_ADDR, sizeof(config_t)); for (i = 0; i < 6; i++) lookupPitchRollRC[i] = (2500 + cfg.rcExpo8 * (i * i - 25)) * i * (int32_t) cfg.rcRate8 / 2500; diff --git a/src/mixer.c b/src/mixer.c index 2792bf2f1..74ac4f2dc 100755 --- a/src/mixer.c +++ b/src/mixer.c @@ -47,8 +47,8 @@ static const motorMixer_t mixerHex6P[] = { { 1.0f, -1.0f, -0.866025f, -1.0f }, // FRONT_R { 1.0f, 1.0f, 0.866025f, 1.0f }, // REAR_L { 1.0f, 1.0f, -0.866025f, -1.0f }, // FRONT_L - { 1.0f, 0.0f, 0.866025f, 1.0f }, // FRONT - { 1.0f, 0.0f, -0.866025f, -1.0f }, // REAR + { 1.0f, 0.0f, -0.866025f, 1.0f }, // FRONT + { 1.0f, 0.0f, 0.866025f, -1.0f }, // REAR }; static const motorMixer_t mixerY4[] = {