diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h index 5f7df10b1f..2f9d78ada8 100644 --- a/ArduCopter/Parameters.h +++ b/ArduCopter/Parameters.h @@ -73,11 +73,7 @@ public: k_param_log_last_filenumber, // *** Deprecated - remove // with next eeprom number // change - k_param_toy_yaw_rate, // THOR The memory - // location for the - // Yaw Rate 1 = fast, - // 2 = med, 3 = slow - + k_param_toy_yaw_rate, // deprecated - remove k_param_crosstrack_min_distance, // deprecated - remove with next eeprom number change k_param_rssi_pin, k_param_throttle_accel_enabled, // deprecated - remove @@ -288,7 +284,7 @@ public: AP_Int8 failsafe_battery_enabled; // battery failsafe enabled AP_Float fs_batt_voltage; // battery voltage below which failsafe will be triggered AP_Float fs_batt_mah; // battery capacity (in mah) below which failsafe will be triggered - + AP_Int8 failsafe_gps_enabled; // gps failsafe enabled AP_Int8 failsafe_gcs; // ground station failsafe behavior AP_Int16 gps_hdop_good; // GPS Hdop value at or below this value represent a good position @@ -338,12 +334,6 @@ public: // Misc // AP_Int16 log_bitmask; - - AP_Int8 toy_yaw_rate; // THOR The - // Yaw Rate 1 - // = fast, 2 = - // med, 3 = - // slow AP_Int8 esc_calibrate; AP_Int8 radio_tuning; AP_Int16 radio_tuning_high; @@ -358,7 +348,7 @@ public: RC_Channel heli_servo_1, heli_servo_2, heli_servo_3, heli_servo_4; // servos for swash plate and tail AP_Float heli_pitch_ff; // pitch rate feed-forward AP_Float heli_roll_ff; // roll rate feed-forward - AP_Float heli_yaw_ff; // yaw rate feed-forward + AP_Float heli_yaw_ff; // yaw rate feed-forward #endif // RC channels diff --git a/ArduCopter/Parameters.pde b/ArduCopter/Parameters.pde index 9629935b8e..e63de4db16 100644 --- a/ArduCopter/Parameters.pde +++ b/ArduCopter/Parameters.pde @@ -346,13 +346,6 @@ const AP_Param::Info var_info[] PROGMEM = { // @User: Advanced GSCALAR(log_bitmask, "LOG_BITMASK", DEFAULT_LOG_BITMASK), - // @Param: TOY_RATE - // @DisplayName: Toy Yaw Rate - // @Description: Controls yaw rate in Toy mode. Higher values will cause a slower yaw rate. Do not set to zero! - // @User: Advanced - // @Range: 1 10 - GSCALAR(toy_yaw_rate, "TOY_RATE", 1), - // @Param: ESC // @DisplayName: ESC Calibration // @Description: Controls whether ArduCopter will enter ESC calibration on the next restart. Do not adjust this parameter manually.