Skip to content
Snippets Groups Projects
Commit 5c8b9bf3 authored by Andrew Tridgell's avatar Andrew Tridgell
Browse files

Rover: updated for new RC_Channel_aux API

parent 95e4316c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 6 deletions
APMrover2/radio.pde
+ 2
− 6
View file @ 5c8b9bf3
...@@ -176,13 +176,12 @@ static void trim_control_surfaces() ...@@ -176,13 +176,12 @@ static void trim_control_surfaces()
g.channel_roll.radio_trim = g.channel_roll.radio_max + g.channel_roll.radio_min - g.channel_roll.radio_in; g.channel_roll.radio_trim = g.channel_roll.radio_max + g.channel_roll.radio_min - g.channel_roll.radio_in;
g.channel_pitch.radio_trim = g.channel_pitch.radio_max + g.channel_pitch.radio_min - g.channel_pitch.radio_in; g.channel_pitch.radio_trim = g.channel_pitch.radio_max + g.channel_pitch.radio_min - g.channel_pitch.radio_in;
g.channel_rudder.radio_trim = g.channel_rudder.radio_max + g.channel_rudder.radio_min - g.channel_rudder.radio_in; g.channel_rudder.radio_trim = g.channel_rudder.radio_max + g.channel_rudder.radio_min - g.channel_rudder.radio_in;
G_RC_AUX(k_aileron)->radio_trim = g_rc_function[RC_Channel_aux::k_aileron]->radio_in; // Second aileron channel RC_Channel_aux::set_radio_trim(RC_Channel_aux::k_aileron);
} else { } else {
g.channel_roll.radio_trim = 1500; // case of HIL test without receiver active g.channel_roll.radio_trim = 1500; // case of HIL test without receiver active
g.channel_pitch.radio_trim = 1500; g.channel_pitch.radio_trim = 1500;
g.channel_rudder.radio_trim = 1500; g.channel_rudder.radio_trim = 1500;
g.channel_throttle.radio_trim = 1000; g.channel_throttle.radio_trim = 1000;
G_RC_AUX(k_aileron)->radio_trim = 1500;
} }
}else{ }else{
...@@ -200,7 +199,6 @@ static void trim_control_surfaces() ...@@ -200,7 +199,6 @@ static void trim_control_surfaces()
g.channel_pitch.save_eeprom(); g.channel_pitch.save_eeprom();
//g.channel_throttle.save_eeprom(); //g.channel_throttle.save_eeprom();
g.channel_rudder.save_eeprom(); g.channel_rudder.save_eeprom();
G_RC_AUX(k_aileron)->save_eeprom();
} }
static void trim_radio() static void trim_radio()
...@@ -217,13 +215,12 @@ static void trim_radio() ...@@ -217,13 +215,12 @@ static void trim_radio()
g.channel_pitch.radio_trim = g.channel_pitch.radio_in; g.channel_pitch.radio_trim = g.channel_pitch.radio_in;
//g.channel_throttle.radio_trim = g.channel_throttle.radio_in; //g.channel_throttle.radio_trim = g.channel_throttle.radio_in;
g.channel_rudder.radio_trim = g.channel_rudder.radio_in; g.channel_rudder.radio_trim = g.channel_rudder.radio_in;
G_RC_AUX(k_aileron)->radio_trim = g_rc_function[RC_Channel_aux::k_aileron]->radio_in; // Second aileron channel RC_Channel_aux::set_radio_trim(RC_Channel_aux::k_aileron);
} else { } else {
g.channel_roll.radio_trim = 1500; // case of HIL test without receiver active g.channel_roll.radio_trim = 1500; // case of HIL test without receiver active
g.channel_pitch.radio_trim = 1500; g.channel_pitch.radio_trim = 1500;
g.channel_rudder.radio_trim = 1500; g.channel_rudder.radio_trim = 1500;
g.channel_throttle.radio_trim = 1000; g.channel_throttle.radio_trim = 1000;
G_RC_AUX(k_aileron)->radio_trim = 1500;
} }
} else { } else {
...@@ -240,5 +237,4 @@ static void trim_radio() ...@@ -240,5 +237,4 @@ static void trim_radio()
g.channel_pitch.save_eeprom(); g.channel_pitch.save_eeprom();
//g.channel_throttle.save_eeprom(); //g.channel_throttle.save_eeprom();
g.channel_rudder.save_eeprom(); g.channel_rudder.save_eeprom();
G_RC_AUX(k_aileron)->save_eeprom();
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment