Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 18:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

APM: rename airspeed_cruise to airspeed_cruise_cm to make the units clearer

Browse Source 
it is in cm/s, not m/s
This commit is contained in:
Andrew Tridgell 2012-07-19 10:52:08 +10:00
parent 2673179075
commit 2121491197
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/ArduPlane.pde
View File

@ -995,7 +995,7 @@ static void update_current_flight_mode(void)
if(nav_pitch < (long)takeoff_pitch) if(nav_pitch < (long)takeoff_pitch)
nav_pitch = (long)takeoff_pitch; nav_pitch = (long)takeoff_pitch;
} else { } else {
nav_pitch = (long)((float)g_gps->ground_speed / (float)g.airspeed_cruise * (float)takeoff_pitch * 0.5); nav_pitch = (long)((float)g_gps->ground_speed / (float)g.airspeed_cruise_cm * (float)takeoff_pitch * 0.5);
nav_pitch = constrain(nav_pitch, 500l, (long)takeoff_pitch); nav_pitch = constrain(nav_pitch, 500l, (long)takeoff_pitch);
} }

4
ArduPlane/Attitude.pde
View File

@ -210,7 +210,7 @@ static void calc_nav_roll()
if(airspeed.use()) { if(airspeed.use()) {
speed = airspeed.get_airspeed(); speed = airspeed.get_airspeed();
} else { } else {
speed = g.airspeed_cruise*0.01; speed = g.airspeed_cruise_cm*0.01;
// Floor the speed so that the user can't enter a bad value // Floor the speed so that the user can't enter a bad value
if(speed < 6) { if(speed < 6) {
@ -384,7 +384,7 @@ static void set_servos(void)
if (control_mode == FLY_BY_WIRE_B) { if (control_mode == FLY_BY_WIRE_B) {
flapSpeedSource = ((float)target_airspeed)/100; flapSpeedSource = ((float)target_airspeed)/100;
} else if (airspeed.use()) { } else if (airspeed.use()) {
flapSpeedSource = g.airspeed_cruise/100; flapSpeedSource = g.airspeed_cruise_cm/100;
} else { } else {
flapSpeedSource = g.throttle_cruise; flapSpeedSource = g.throttle_cruise;
} }

6
ArduPlane/Parameters.h
View File

@ -116,7 +116,7 @@ public:
k_param_roll_limit, k_param_roll_limit,
k_param_pitch_limit_max, k_param_pitch_limit_max,
k_param_pitch_limit_min, k_param_pitch_limit_min,
k_param_airspeed_cruise, k_param_airspeed_cruise_cm,
k_param_RTL_altitude, k_param_RTL_altitude,
k_param_inverted_flight_ch, k_param_inverted_flight_ch,
k_param_min_gndspeed, k_param_min_gndspeed,
@ -336,7 +336,7 @@ public:
AP_Int16 log_last_filenumber; // *** Deprecated - remove with next eeprom number change AP_Int16 log_last_filenumber; // *** Deprecated - remove with next eeprom number change
AP_Int8 reset_switch_chan; AP_Int8 reset_switch_chan;
AP_Int8 manual_level; AP_Int8 manual_level;
AP_Int16 airspeed_cruise; AP_Int16 airspeed_cruise_cm;
AP_Int16 min_gndspeed; AP_Int16 min_gndspeed;
AP_Int16 pitch_trim; AP_Int16 pitch_trim;
AP_Int16 RTL_altitude; AP_Int16 RTL_altitude;
@ -455,7 +455,7 @@ public:
log_last_filenumber (0), log_last_filenumber (0),
reset_switch_chan (0), reset_switch_chan (0),
manual_level (MANUAL_LEVEL), manual_level (MANUAL_LEVEL),
airspeed_cruise (AIRSPEED_CRUISE_CM), airspeed_cruise_cm (AIRSPEED_CRUISE_CM),
min_gndspeed (MIN_GNDSPEED_CM), min_gndspeed (MIN_GNDSPEED_CM),
pitch_trim (0), pitch_trim (0),
RTL_altitude (ALT_HOLD_HOME_CM), RTL_altitude (ALT_HOLD_HOME_CM),

2
ArduPlane/Parameters.pde
View File

@ -383,7 +383,7 @@ static const AP_Param::Info var_info[] PROGMEM = {
// @Description: Airspeed in cm/s to aim for when airspeed is enabled in auto mode // @Description: Airspeed in cm/s to aim for when airspeed is enabled in auto mode
// @Units: cm/s // @Units: cm/s
// @User: User // @User: User
GSCALAR(airspeed_cruise, "TRIM_ARSPD_CM"), GSCALAR(airspeed_cruise_cm, "TRIM_ARSPD_CM"),
// @Param: MIN_GNDSPD_CM // @Param: MIN_GNDSPD_CM
// @DisplayName: Minimum ground speed // @DisplayName: Minimum ground speed

2
ArduPlane/commands_logic.pde
View File

@ -523,7 +523,7 @@ static void do_change_speed()
{ {
case 0: // Airspeed case 0: // Airspeed
if(next_nonnav_command.alt > 0) if(next_nonnav_command.alt > 0)
g.airspeed_cruise.set(next_nonnav_command.alt * 100); g.airspeed_cruise_cm.set(next_nonnav_command.alt * 100);
break; break;
case 1: // Ground speed case 1: // Ground speed
g.min_gndspeed.set(next_nonnav_command.alt * 100); g.min_gndspeed.set(next_nonnav_command.alt * 100);

2
ArduPlane/navigation.pde
View File

@ -67,7 +67,7 @@ static void calc_airspeed_errors()
float aspeed_cm = airspeed.get_airspeed_cm(); float aspeed_cm = airspeed.get_airspeed_cm();
// Normal airspeed target // Normal airspeed target
target_airspeed = g.airspeed_cruise; target_airspeed = g.airspeed_cruise_cm;
// FBW_B airspeed target // FBW_B airspeed target
if (control_mode == FLY_BY_WIRE_B) { if (control_mode == FLY_BY_WIRE_B) {

2
ArduPlane/radio.pde
View File

@ -90,7 +90,7 @@ static void read_radio()
if (g.channel_throttle.servo_out > 50) { if (g.channel_throttle.servo_out > 50) {
if (airspeed.use()) { if (airspeed.use()) {
airspeed_nudge = (g.flybywire_airspeed_max * 100 - g.airspeed_cruise) * ((g.channel_throttle.norm_input()-0.5) / 0.5); airspeed_nudge = (g.flybywire_airspeed_max * 100 - g.airspeed_cruise_cm) * ((g.channel_throttle.norm_input()-0.5) / 0.5);
} else { } else {
throttle_nudge = (g.throttle_max - g.throttle_cruise) * ((g.channel_throttle.norm_input()-0.5) / 0.5); throttle_nudge = (g.throttle_max - g.throttle_cruise) * ((g.channel_throttle.norm_input()-0.5) / 0.5);
} }