From 321e92cf4c380568b4248ebd306be7b360b5e873 Mon Sep 17 00:00:00 2001 From: Rustom Jehangir Date: Wed, 3 Feb 2016 21:19:26 -0800 Subject: [PATCH] Sub: Minor bug fix in radio. --- ArduSub/radio.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ArduSub/radio.cpp b/ArduSub/radio.cpp index c3f5f09820..ed0852760e 100644 --- a/ArduSub/radio.cpp +++ b/ArduSub/radio.cpp @@ -148,9 +148,8 @@ void Sub::transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t float throttleScale = 0.8; int16_t rpyCenter = 1500; int16_t throttleBase = 1500-500*throttleScale; - int16_t rollTrim = 0; + static int16_t rollTrim = 0; static int16_t mode; - static int16_t camTilt = 1500; if ( buttons & (1 << 4) ) { @@ -165,9 +164,9 @@ void Sub::transform_manual_control_to_rc_override(int16_t x, int16_t y, int16_t camTilt = constrain_float(camTilt-20,800,2200); } - if ( (buttons & ( 1 << 14 )) && rollTrim > -200 ) { + if ( (buttons & ( 1 << 2 )) && rollTrim > -200 ) { rollTrim -= 10; - } else if ( (buttons & ( 1 << 15 )) && rollTrim < 200 ) { + } else if ( (buttons & ( 1 << 3 )) && rollTrim < 200 ) { rollTrim += 10; }