From b374f604d67b8b451f490f3697520f7fa88cab07 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 9 Sep 2012 19:38:48 +1000 Subject: [PATCH] APM: simplify radio_trim code this removes the duplicate code. Throttle trim is not changed. --- ArduPlane/radio.pde | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/ArduPlane/radio.pde b/ArduPlane/radio.pde index c5347b5537..85deef8e91 100644 --- a/ArduPlane/radio.pde +++ b/ArduPlane/radio.pde @@ -183,35 +183,14 @@ static void trim_control_surfaces() // save to eeprom g.channel_roll.save_eeprom(); g.channel_pitch.save_eeprom(); - g.channel_throttle.save_eeprom(); g.channel_rudder.save_eeprom(); } static void trim_radio() { - for (int y = 0; y < 30; y++) { + for (uint8_t y = 0; y < 30; y++) { read_radio(); } - // Store the trim values - // --------------------- - if(g.mix_mode == 0) { - g.channel_roll.radio_trim = g.channel_roll.radio_in; - g.channel_pitch.radio_trim = g.channel_pitch.radio_in; - //g.channel_throttle.radio_trim = g.channel_throttle.radio_in; - RC_Channel_aux::set_radio_trim(RC_Channel_aux::k_aileron); - } else { - elevon1_trim = ch1_temp; - elevon2_trim = ch2_temp; - uint16_t center = 1500; - g.channel_roll.radio_trim = center; - g.channel_pitch.radio_trim = center; - } - g.channel_rudder.radio_trim = g.channel_rudder.radio_in; - - // save to eeprom - g.channel_roll.save_eeprom(); - g.channel_pitch.save_eeprom(); - //g.channel_throttle.save_eeprom(); - g.channel_rudder.save_eeprom(); + trim_control_surfaces(); }