From d0d2dea5755442b60ab6cf23e1ce1d4d4b788390 Mon Sep 17 00:00:00 2001 From: Gary Keeble Date: Fri, 23 Dec 2016 08:58:34 +0000 Subject: [PATCH] Add gyro scale back to 1.0 --- src/main/blackbox/blackbox.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 8a2ad9dbd2..a6f0b360b4 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -1177,12 +1177,8 @@ static bool blackboxWriteSysinfo() BLACKBOX_PRINT_HEADER_LINE("P interval:%d/%d", blackboxConfig()->rate_num, blackboxConfig()->rate_denom); BLACKBOX_PRINT_HEADER_LINE("minthrottle:%d", motorConfig()->minthrottle); BLACKBOX_PRINT_HEADER_LINE("maxthrottle:%d", motorConfig()->maxthrottle); -<<<<<<< HEAD BLACKBOX_PRINT_HEADER_LINE("gyro_scale:0x%x", castFloatBytesToInt(1.0f)); -======= BLACKBOX_PRINT_HEADER_LINE("motorOutput:%d,%d", motorOutputLow,motorOutputHigh); - BLACKBOX_PRINT_HEADER_LINE("gyro_scale:0x%x", castFloatBytesToInt(gyro.dev.scale)); ->>>>>>> Seperate rcCommand[Throttle] from D-Shot Motor Output BLACKBOX_PRINT_HEADER_LINE("acc_1G:%u", acc.dev.acc_1G); BLACKBOX_PRINT_HEADER_LINE_CUSTOM(