diff --git a/index.html b/index.html index 2088d983..a32de6b3 100644 --- a/index.html +++ b/index.html @@ -917,7 +917,7 @@ - + @@ -930,7 +930,7 @@ - + diff --git a/js/flightlog_parser.js b/js/flightlog_parser.js index 5c97731e..42129e0d 100644 --- a/js/flightlog_parser.js +++ b/js/flightlog_parser.js @@ -332,9 +332,9 @@ var FlightLogParser = function(logData) { simplified_pi_gain: null, simplified_i_gain: null, simplified_d_gain: null, - simplified_dmin_ratio: null, + simplified_dmax_gain: null, simplified_feedforward_gain: null, - simplified_roll_pitch_ratio: null, + simplified_pitch_d_gain: null, simplified_pitch_pi_gain: null, simplified_master_multiplier: null, simplified_dterm_filter: null, @@ -412,38 +412,8 @@ var FlightLogParser = function(logData) { rpm_filter_q : "gyro_rpm_notch_q", rpm_filter_min_hz : "gyro_rpm_notch_min", rpm_filter_lpf_hz : "rpm_notch_lpf", - rc_sm_md : "rc_smoothing_mode", - rc_sm_ff_hz : "rc_smoothing_feedforward_hz", - rc_sm_sp_hz : "rc_smoothing_setpoint_hz", - rc_sm_af_sp : "rc_smoothing_auto_factor_setpoint", - rc_sm_thr_hz : "rc_smoothing_throttle_hz", - rc_sm_af_thr : "rc_smoothing_auto_factor_throttle", - rc_sm_dbg_ax : "rc_smoothing_debug_axis", - rc_sm_act_cuts : "rc_smoothing_active_cutoffs_ff_sp_thr", - rc_sm_rx_av : "rc_smoothing_rx_average", - vbat_s_comp : "vbat_sag_compensation", - d_idl_m_r : "dynamic_idle_min_rpm", - d_idl_p : "dyn_idle_p_gain", - d_idl_i : "dyn_idle_i_gain", - d_idl_d : "dyn_idle_d_gain", - d_idl_max : "dyn_idle_max_increase", - simpl_mode : "simplified_pids_mode", - simpl_mast : "simplified_master_multiplier", - simpl_pi : "simplified_pi_gain", - simpl_i : "simplified_i_gain", - simpl_d : "simplified_d_gain", - simpl_dmr : "simplified_dmin_ratio", - simpl_ff : "simplified_feedforward_gain", - simpl_rpr : "simplified_roll_pitch_ratio", - simpl_d_f : "simplified_dterm_filter", - simpl_d_f_m : "simplified_dterm_filter_multiplier", - simpl_g_f : "simplified_gyro_filter", - simpl_g_f_m : "simplified_gyro_filter_multiplier", - m_out_lim : "motor_output_limit", - thr_lim_t : "throttle_limit_type", - thr_lim_p : "throttle_limit_percent", - thr_bst : "throttle_boost", - thr_bst_cut : "throttle_boost_cutoff" + rc_smoothing : "rc_smoothing_mode", + dyn_idle_min_rpm : "dynamic_idle_min_rpm", }, frameTypes, @@ -738,9 +708,9 @@ var FlightLogParser = function(logData) { case "simplified_pi_gain": case "simplified_i_gain": case "simplified_d_gain": - case "simplified_dmin_ratio": + case "simplified_dmax_gain": case "simplified_feedforward_gain": - case "simplified_roll_pitch_ratio": + case "simplified_pitch_d_gain": case "simplified_pitch_pi_gain": case "simplified_master_multiplier": diff --git a/js/header_dialog.js b/js/header_dialog.js index a9c061d9..a72aaec8 100644 --- a/js/header_dialog.js +++ b/js/header_dialog.js @@ -112,17 +112,17 @@ function HeaderDialog(dialog, onSave) { {name:'rc_smoothing_active_cutoffs_thr', type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'dyn_notch_count' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'rpm_filter_fade_range_hz' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'dyn_idle_p_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'dyn_idle_i_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'dyn_idle_d_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'dyn_idle_max_increase' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'dyn_idle_p_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'dyn_idle_i_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'dyn_idle_d_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'dyn_idle_max_increase' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_pids_mode' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_pi_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_i_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_d_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'simplified_dmin_ratio' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'simplified_dmax_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_feedforward_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, - {name:'simplified_roll_pitch_ratio' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, + {name:'simplified_pitch_d_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_pitch_pi_gain' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_master_multiplier' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, {name:'simplified_dterm_filter' , type:FIRMWARE_TYPE_BETAFLIGHT, min:'4.3.0', max:'999.9.9'}, @@ -799,9 +799,9 @@ function HeaderDialog(dialog, onSave) { setParameter('simplified_pi_gain' , sysConfig.simplified_pi_gain, 0); setParameter('simplified_i_gain' , sysConfig.simplified_i_gain, 0); setParameter('simplified_d_gain' , sysConfig.simplified_d_gain, 0); - setParameter('simplified_dmin_ratio' , sysConfig.simplified_dmin_ratio, 0); + setParameter('simplified_dmax_gain' , sysConfig.simplified_dmax_gain, 0); setParameter('simplified_feedforward_gain' , sysConfig.simplified_feedforward_gain, 0); - setParameter('simplified_roll_pitch_ratio' , sysConfig.simplified_roll_pitch_ratio, 0); + setParameter('simplified_pitch_d_gain' , sysConfig.simplified_pitch_d_gain, 0); setParameter('simplified_pitch_pi_gain' , sysConfig.simplified_pitch_pi_gain, 0); setParameter('simplified_master_multiplier' , sysConfig.simplified_master_multiplier, 0);