From c14e7cf59fa8f65b8d3ea66f06ccb5ed89a56341 Mon Sep 17 00:00:00 2001 From: dongie Date: Sun, 3 Nov 2013 12:21:22 +0900 Subject: [PATCH] whitespace and formatting cleanups from latest commit --- src/config.c | 4 ++-- src/serial.c | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/config.c b/src/config.c index 7b42523c6..73d85c919 100755 --- a/src/config.c +++ b/src/config.c @@ -246,7 +246,7 @@ static void resetConf(void) cfg.P8[PIDVEL] = 0; cfg.I8[PIDVEL] = 0; cfg.D8[PIDVEL] = 0; - + cfg.P_f[ROLL] = 2.5f; // new PID with preliminary defaults test carefully cfg.I_f[ROLL] = 0.3f; cfg.D_f[ROLL] = 0.06f; @@ -258,7 +258,7 @@ static void resetConf(void) cfg.D_f[YAW] = 0.05f; cfg.A_level = 5.0f; cfg.H_level = 3.0f; - + cfg.rcRate8 = 90; cfg.rcExpo8 = 65; cfg.rollPitchRate = 0; diff --git a/src/serial.c b/src/serial.c index 13182400c..87a7580a7 100755 --- a/src/serial.c +++ b/src/serial.c @@ -259,7 +259,7 @@ void serialInit(uint32_t baudrate) availableBoxes[idx++] = BOXGPSHOME; availableBoxes[idx++] = BOXGPSHOLD; } - if (mcfg.mixerConfiguration == MULTITYPE_FLYING_WING || mcfg.mixerConfiguration == MULTITYPE_AIRPLANE) + if (mcfg.mixerConfiguration == MULTITYPE_FLYING_WING || mcfg.mixerConfiguration == MULTITYPE_AIRPLANE) availableBoxes[idx++] = BOXPASSTHRU; availableBoxes[idx++] = BOXBEEPERON; if (feature(FEATURE_INFLIGHT_ACC_CAL)) @@ -303,19 +303,17 @@ static void evaluateCommand(void) cfg.D_f[i] = (float)read8() / 1000.0f; } for (i = 3; i < PIDITEMS; i++) { - if(i == PIDLEVEL) { + if (i == PIDLEVEL) { cfg.A_level = (float)read8() / 10.0f; cfg.H_level = (float)read8() / 10.0f; read8(); - } - else { + } else { cfg.P8[i] = read8(); cfg.I8[i] = read8(); cfg.D8[i] = read8(); } } - } - else { + } else { for (i = 0; i < PIDITEMS; i++) { cfg.P8[i] = read8(); cfg.I8[i] = read8(); @@ -500,24 +498,22 @@ static void evaluateCommand(void) headSerialReply(3 * PIDITEMS); if (cfg.pidController == 2) { // convert float stuff into uint8_t to keep backwards compatability with all 8-bit shit with new pid for (i = 0; i < 3; i++) { - serialize8(constrain(lrintf(cfg.P_f[i] * 10.0f) ,0 ,250)); - serialize8(constrain(lrintf(cfg.I_f[i] * 100.0f) ,0 ,250)); - serialize8(constrain(lrintf(cfg.D_f[i] * 1000.0f) ,0 ,100)); + serialize8(constrain(lrintf(cfg.P_f[i] * 10.0f), 0, 250)); + serialize8(constrain(lrintf(cfg.I_f[i] * 100.0f), 0, 250)); + serialize8(constrain(lrintf(cfg.D_f[i] * 1000.0f), 0, 100)); } for (i = 3; i < PIDITEMS; i++) { if (i == PIDLEVEL) { - serialize8(constrain(lrintf(cfg.A_level * 10.0f) ,0 ,250)); - serialize8(constrain(lrintf(cfg.H_level * 10.0f) ,0 ,250)); - serialize8(0); - } - else { + serialize8(constrain(lrintf(cfg.A_level * 10.0f), 0, 250)); + serialize8(constrain(lrintf(cfg.H_level * 10.0f), 0, 250)); + serialize8(0); + } else { serialize8(cfg.P8[i]); serialize8(cfg.I8[i]); serialize8(cfg.D8[i]); } } - } - else { + } else { for (i = 0; i < PIDITEMS; i++) { serialize8(cfg.P8[i]); serialize8(cfg.I8[i]);