From ceb1f78526ff137c9044b985a612819b7f7e8259 Mon Sep 17 00:00:00 2001 From: kh4 Date: Fri, 7 Feb 2014 13:40:27 +0200 Subject: [PATCH] Fix line endings to CRLF --- src/cli.c | 24 ++++----- src/mixer.c | 24 ++++----- src/sumd.c | 152 ++++++++++++++++++++++++++-------------------------- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/cli.c b/src/cli.c index a135326a4..68596cb4d 100644 --- a/src/cli.c +++ b/src/cli.c @@ -216,12 +216,12 @@ const clivalue_t valueTable[] = { #define VALUE_COUNT (sizeof(valueTable) / sizeof(clivalue_t)) - -typedef union { - int32_t int_value; - float float_value; -} int_float_value_t; - + +typedef union { + int32_t int_value; + float float_value; +} int_float_value_t; + static void cliSetVar(const clivalue_t *var, const int_float_value_t value); static void cliPrintVar(const clivalue_t *var, uint32_t full); static void cliPrint(const char *str); @@ -932,12 +932,12 @@ static void cliSet(char *cmdline) val = &valueTable[i]; if (strncasecmp(cmdline, valueTable[i].name, strlen(valueTable[i].name)) == 0) { if (valuef >= valueTable[i].min && valuef <= valueTable[i].max) { // here we compare the float value since... it should work, RIGHT? - int_float_value_t tmp; - if (valueTable[i].type == VAR_FLOAT) - tmp.float_value = valuef; - else - tmp.int_value = value; - cliSetVar(val, tmp); + int_float_value_t tmp; + if (valueTable[i].type == VAR_FLOAT) + tmp.float_value = valuef; + else + tmp.int_value = value; + cliSetVar(val, tmp); printf("%s set to ", valueTable[i].name); cliPrintVar(val, 0); } else { diff --git a/src/mixer.c b/src/mixer.c index 254d71f16..6239f1656 100755 --- a/src/mixer.c +++ b/src/mixer.c @@ -43,12 +43,12 @@ static const motorMixer_t mixerY6[] = { }; static const motorMixer_t mixerHex6P[] = { - { 1.0f, -0.866025f, 0.5f, 1.0f }, // REAR_R - { 1.0f, -0.866025f, -0.5f, -1.0f }, // FRONT_R - { 1.0f, 0.866025f, 0.5f, 1.0f }, // REAR_L - { 1.0f, 0.866025f, -0.5f, -1.0f }, // FRONT_L - { 1.0f, 0.0f, -1.0f, 1.0f }, // FRONT - { 1.0f, 0.0f, 1.0f, -1.0f }, // REAR + { 1.0f, -0.866025f, 0.5f, 1.0f }, // REAR_R + { 1.0f, -0.866025f, -0.5f, -1.0f }, // FRONT_R + { 1.0f, 0.866025f, 0.5f, 1.0f }, // REAR_L + { 1.0f, 0.866025f, -0.5f, -1.0f }, // FRONT_L + { 1.0f, 0.0f, -1.0f, 1.0f }, // FRONT + { 1.0f, 0.0f, 1.0f, -1.0f }, // REAR }; static const motorMixer_t mixerY4[] = { @@ -59,12 +59,12 @@ static const motorMixer_t mixerY4[] = { }; static const motorMixer_t mixerHex6X[] = { - { 1.0f, -0.5f, 0.866025f, 1.0f }, // REAR_R - { 1.0f, -0.5f, -0.866025f, 1.0f }, // FRONT_R - { 1.0f, 0.5f, 0.866025f, -1.0f }, // REAR_L - { 1.0f, 0.5f, -0.866025f, -1.0f }, // FRONT_L - { 1.0f, -1.0f, 0.0f, -1.0f }, // RIGHT - { 1.0f, 1.0f, 0.0f, 1.0f }, // LEFT + { 1.0f, -0.5f, 0.866025f, 1.0f }, // REAR_R + { 1.0f, -0.5f, -0.866025f, 1.0f }, // FRONT_R + { 1.0f, 0.5f, 0.866025f, -1.0f }, // REAR_L + { 1.0f, 0.5f, -0.866025f, -1.0f }, // FRONT_L + { 1.0f, -1.0f, 0.0f, -1.0f }, // RIGHT + { 1.0f, 1.0f, 0.0f, 1.0f }, // LEFT }; static const motorMixer_t mixerOctoX8[] = { diff --git a/src/sumd.c b/src/sumd.c index 26e08d2da..97d27a4ad 100644 --- a/src/sumd.c +++ b/src/sumd.c @@ -1,76 +1,76 @@ -#include "board.h" -#include "mw.h" - -// driver for SUMD receiver using UART2 - -#define SUMD_SYNCBYTE 0xA8 -#define SUMD_MAX_CHANNEL 8 -#define SUMD_BUFFSIZE (SUMD_MAX_CHANNEL * 2 + 5) // 6 channels + 5 -> 17 bytes for 6 channels - -static bool sumdFrameDone = false; -static void sumdDataReceive(uint16_t c); -static uint16_t sumdReadRawRC(uint8_t chan); - -static uint32_t sumdChannelData[SUMD_MAX_CHANNEL]; - -void sumdInit(rcReadRawDataPtr *callback) -{ - core.rcvrport = uartOpen(USART2, sumdDataReceive, 115200, MODE_RX); - if (callback) - *callback = sumdReadRawRC; -} - -static uint8_t sumd[SUMD_BUFFSIZE] = { 0, }; -static uint8_t sumdSize; - -// Receive ISR callback -static void sumdDataReceive(uint16_t c) -{ - uint32_t sumdTime; - static uint32_t sumdTimeLast; - static uint8_t sumdIndex; - - sumdTime = micros(); - if ((sumdTime - sumdTimeLast) > 4000) - sumdIndex = 0; - sumdTimeLast = sumdTime; - - if (sumdIndex == 0) { - if (c != SUMD_SYNCBYTE) - return; - else - sumdFrameDone = false; // lazy main loop didnt fetch the stuff - } - if (sumdIndex == 2) - sumdSize = (uint8_t)c; - if (sumdIndex < SUMD_BUFFSIZE) - sumd[sumdIndex] = (uint8_t)c; - sumdIndex++; - if (sumdIndex == sumdSize * 2 + 5) { - sumdIndex = 0; - sumdFrameDone = true; - } -} - -bool sumdFrameComplete(void) -{ - uint8_t b; - - if (sumdFrameDone) { - sumdFrameDone = false; - if (sumd[1] == 0x01) { - failsafeCnt = 0; - if (sumdSize > SUMD_MAX_CHANNEL) - sumdSize = SUMD_MAX_CHANNEL; - for (b = 0; b < sumdSize; b++) - sumdChannelData[b] = ((sumd[2 * b + 3] << 8) | sumd[2 * b + 4]); - return true; - } - } - return false; -} - -static uint16_t sumdReadRawRC(uint8_t chan) -{ - return sumdChannelData[mcfg.rcmap[chan]] / 8; -} +#include "board.h" +#include "mw.h" + +// driver for SUMD receiver using UART2 + +#define SUMD_SYNCBYTE 0xA8 +#define SUMD_MAX_CHANNEL 8 +#define SUMD_BUFFSIZE (SUMD_MAX_CHANNEL * 2 + 5) // 6 channels + 5 -> 17 bytes for 6 channels + +static bool sumdFrameDone = false; +static void sumdDataReceive(uint16_t c); +static uint16_t sumdReadRawRC(uint8_t chan); + +static uint32_t sumdChannelData[SUMD_MAX_CHANNEL]; + +void sumdInit(rcReadRawDataPtr *callback) +{ + core.rcvrport = uartOpen(USART2, sumdDataReceive, 115200, MODE_RX); + if (callback) + *callback = sumdReadRawRC; +} + +static uint8_t sumd[SUMD_BUFFSIZE] = { 0, }; +static uint8_t sumdSize; + +// Receive ISR callback +static void sumdDataReceive(uint16_t c) +{ + uint32_t sumdTime; + static uint32_t sumdTimeLast; + static uint8_t sumdIndex; + + sumdTime = micros(); + if ((sumdTime - sumdTimeLast) > 4000) + sumdIndex = 0; + sumdTimeLast = sumdTime; + + if (sumdIndex == 0) { + if (c != SUMD_SYNCBYTE) + return; + else + sumdFrameDone = false; // lazy main loop didnt fetch the stuff + } + if (sumdIndex == 2) + sumdSize = (uint8_t)c; + if (sumdIndex < SUMD_BUFFSIZE) + sumd[sumdIndex] = (uint8_t)c; + sumdIndex++; + if (sumdIndex == sumdSize * 2 + 5) { + sumdIndex = 0; + sumdFrameDone = true; + } +} + +bool sumdFrameComplete(void) +{ + uint8_t b; + + if (sumdFrameDone) { + sumdFrameDone = false; + if (sumd[1] == 0x01) { + failsafeCnt = 0; + if (sumdSize > SUMD_MAX_CHANNEL) + sumdSize = SUMD_MAX_CHANNEL; + for (b = 0; b < sumdSize; b++) + sumdChannelData[b] = ((sumd[2 * b + 3] << 8) | sumd[2 * b + 4]); + return true; + } + } + return false; +} + +static uint16_t sumdReadRawRC(uint8_t chan) +{ + return sumdChannelData[mcfg.rcmap[chan]] / 8; +}