Commit ebd80993 authored by Darren Lines's avatar Darren Lines
Browse files

Rearranged Advanced Tuning page

parent 3a3e0ac8
......@@ -5,159 +5,121 @@
<div class="leftWrapper">
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="multiRotorNavigationConfiguration"></div>
<div class="spacer_box_title" data-i18n="fixedWingNavigationConfiguration"></div>
</div>
<div class="spacer_box">
<div class="select">
<select id="user-control-mode"></select>
<label for="user-control-mode"> <span data-i18n="userControlMode"></span></label>
</div>
<div class="number">
<input id="max-speed" type="number" data-simple-bind="NAV_POSHOLD.maxSpeed" step="1" min="10" max="2000">
<label for="max-speed">
<span data-i18n="posholdMaxSpeed"></span>
</label>
</div>
<div class="number">
<input id="max-manual-speed" type="number" data-simple-bind="NAV_POSHOLD.maxManualSpeed" step="1" min="10" max="2000">
<label for="max-manual-speed">
<span data-i18n="posholdMaxManualSpeed"></span>
</label>
</div>
<div class="number">
<input id="max-climb-rate" type="number" data-simple-bind="NAV_POSHOLD.maxClimbRate" step="1" min="10" max="2000">
<label for="max-climb-rate">
<span data-i18n="posholdMaxClimbRate"></span>
</label>
</div>
<div class="number">
<input id="max-manual-climb-rate" type="number" data-simple-bind="NAV_POSHOLD.maxManualClimbRate" step="1" min="10" max="2000">
<label for="max-manual-climb-rate">
<span data-i18n="posholdMaxManualClimbRate"></span>
<input id="cruiseThrottle" type="number" data-simple-bind="FW_CONFIG.cruiseThrottle" step="1" min="1000" max="2000">
<label for="cruiseThrottle">
<span data-i18n="cruiseThrottle"></span>
</label>
</div>
<div class="number">
<input id="max-bank-angle" type="number" data-simple-bind="NAV_POSHOLD.maxBankAngle" step="1" min="15" max="45">
<label for="max-bank-angle">
<span data-i18n="posholdMaxBankAngle"></span>
<input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" />
<label for="cruiseYawRate">
<span data-i18n="cruiseYawRateLabel"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="posholdMaxBankAngleHelp"></div>
<div class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div>
</div>
<div class="checkbox">
<input type="checkbox" id="use-mid-throttle" class="toggle" />
<label for="use-mid-throttle">
<span data-i18n="posholdHoverMidThrottle"></span>
</label>
</div>
<div class="number">
<input id="hover-throttle" type="number" data-simple-bind="NAV_POSHOLD.hoverThrottle" step="1" min="1000" max="2000">
<label for="hover-throttle">
<span data-i18n="posholdHoverThrottle"></span>
<input type="checkbox" class="toggle update_preview" id="cruiseManualThrottle" data-setting="nav_fw_allow_manual_thr_increase" data-live="true" />
<label for="cruiseManualThrottle">
<span data-i18n="cruiseManualThrottleLabel"></span>
</label>
</div>
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="rthConfiguration"></div>
</div>
<div class="spacer_box">
<div class="select">
<select id="rthAltControlMode"></select>
<label for="rthAltControlMode"> <span data-i18n="rthAltControlMode"></span></label>
<div class="helpicon cf_tip" data-i18n_title="cruiseManualThrottleHelp"></div>
</div>
<div class="number">
<input id="rthAltitude" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.rthAltitude" step="1" min="0" max="65000">
<label for="rthAltitude">
<span data-i18n="rthAltitude"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthAltitudeHelp"></div>
</div>
<div class="number">
<input type="number" id="rthHomeAltitude" data-setting="nav_rth_home_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
<label for="rthHomeAltitude">
<span data-i18n="rthHomeAltitudeLabel"></span>
<input id="minThrottle" type="number" data-simple-bind="FW_CONFIG.minThrottle" step="1" min="1000" max="2000">
<label for="minThrottle">
<span data-i18n="minThrottle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthHomeAltitudeHelp"></div>
</div>
<div class="checkbox">
<input type="checkbox" id="rth-climb-first" class="toggle" />
<label for="rth-climb-first">
<span data-i18n="rthClimbFirst"></span>
<div class="number">
<input id="maxThrottle" type="number" data-simple-bind="FW_CONFIG.maxThrottle" step="1" min="1000" max="2000">
<label for="maxThrottle">
<span data-i18n="maxThrottle"></span>
</label>
</div>
<div class="checkbox">
<input type="checkbox" id="rthClimbIgnoreEmergency" class="toggle" />
<label for="rthClimbIgnoreEmergency">
<span data-i18n="rthClimbIgnoreEmergency"></span>
<div class="number">
<input id="maxBankAngle" type="number" data-simple-bind="FW_CONFIG.maxBankAngle" step="1" min="5" max="80">
<label for="maxBankAngle">
<span data-i18n="maxBankAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxBankAngleHelp"></div>
</div>
<div class="checkbox">
<input type="checkbox" id="rthTailFirst" class="toggle" />
<label for="rthTailFirst">
<span data-i18n="rthTailFirst"></span>
<div class="number">
<input id="maxClimbAngle" type="number" data-simple-bind="FW_CONFIG.maxClimbAngle" step="1" min="5" max="80">
<label for="maxClimbAngle">
<span data-i18n="maxClimbAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxClimbAngleHelp"></div>
</div>
<div class="select">
<select id="rthAllowLanding"></select>
<label for="rthAllowLanding">
<span data-i18n="rthAllowLanding"></span>
<div class="number">
<input id="maxDiveAngle" type="number" data-simple-bind="FW_CONFIG.maxDiveAngle" step="1" min="5" max="80">
<label for="maxDiveAngle">
<span data-i18n="maxDiveAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxDiveAngleHelp"></div>
</div>
<div class="number">
<input id="landDescentRate" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landDescentRate" step="1" min="100" max="2000">
<label for="landDescentRate">
<span data-i18n="landDescentRate"></span>
<input id="pitchToThrottle" type="number" data-simple-bind="FW_CONFIG.pitchToThrottle" step="1" min="0" max="100">
<label for="pitchToThrottle">
<span data-i18n="pitchToThrottle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
</div>
<div class="number">
<input id="landSlowdownMinAlt" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landSlowdownMinAlt" step="1" min="50" max="1000">
<label for="landSlowdownMinAlt">
<span data-i18n="landSlowdownMinAlt"></span>
<input id="pitchToThrottleSmoothing" type="number" data-setting="nav_fw_pitch2thr_smoothing" data-setting-multiplier="1" step="0" min="0" max="9">
<label for="pitchToThrottleSmoothing">
<span data-i18n="pitchToThrottleSmoothing"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleSmoothingHelp"></div>
</div>
<div class="number">
<input id="landSlowdownMaxAlt" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landSlowdownMaxAlt" step="1" min="500" max="4000">
<label for="landSlowdownMaxAlt">
<span data-i18n="landSlowdownMaxAlt"></span>
<input id="pitchToThrottleThreshold" type="number" data-setting="nav_fw_pitch2thr_threshold" data-setting-multiplier="1" step="1" min="0" max="900">
<label for="pitchToThrottleThreshold">
<span data-i18n="pitchToThrottleThreshold"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleThresholdHelp"></div>
</div>
<div class="number">
<input id="rth-min-distance" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.minRthDistance" step="1" min="0" max="5000">
<label for="rth-min-distance">
<span data-i18n="minRthDistance"></span>
<input id="loiterRadius" type="number" data-simple-bind="FW_CONFIG.loiterRadius" step="1" min="0" max="10000">
<label for="loiterRadius">
<span data-i18n="loiterRadius"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="minRthDistanceHelp"></div>
</div>
<div class="number">
<input id="rthAbortThreshold" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.rthAbortThreshold" step="1" min="0" max="65000">
<label for="rthAbortThreshold">
<span data-i18n="rthAbortThreshold"></span>
<div class="select">
<select id="loiterDirection" data-setting="fw_loiter_direction"></select>
<label for="loiterDirection">
<span data-i18n="loiterDirectionLabel"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthAbortThresholdHelp"></div>
<div class="helpicon cf_tip" data-i18n_title="loiterDirectionHelp"></div>
</div>
<div class="number">
<input id="emergencyDescentRate" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.emergencyDescentRate" step="1" min="10" max="2000">
<label for="emergencyDescentRate">
<span data-i18n="emergencyDescentRate"></span>
<input type="number" id="controlSmoothness" data-setting="nav_fw_control_smoothness" data-setting-multiplier="1" step="1" min="0" max="9" />
<label for="controlSmoothness">
<span data-i18n="controlSmoothness"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="controlSmoothnessHelp"></div>
</div>
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="configurationLaunch"></div>
......@@ -256,9 +218,31 @@
</div>
</div>
</div>
</div>
<div class="rightWrapper">
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="waypointConfiguration"></div>
</div>
<div class="spacer_box">
<div class="number">
<input type="number" id="waypointRadius" data-setting="nav_wp_radius" data-setting-multiplier="1" step="1" min="10" max="10000" />
<label for="waypointRadius">
<span data-i18n="waypointRadius"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="waypointRadiusHelp"></div>
</div>
<div class="number">
<input type="number" id="waypointSafeDistance" data-setting="nav_wp_safe_distance" data-setting-multiplier="1" step="1" min="0" max="65000" />
<label for="waypointSafeDistance">
<span data-i18n="waypointSafeDistance"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="waypointSafeDistanceHelp"></div>
</div>
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
......@@ -312,145 +296,61 @@
</div>
</div>
</div>
<div class="rightWrapper">
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="fixedWingNavigationConfiguration"></div>
<div class="spacer_box_title" data-i18n="multiRotorNavigationConfiguration"></div>
</div>
<div class="spacer_box">
<div class="number">
<input id="cruiseThrottle" type="number" data-simple-bind="FW_CONFIG.cruiseThrottle" step="1" min="1000" max="2000">
<label for="cruiseThrottle">
<span data-i18n="cruiseThrottle"></span>
</label>
</div>
<div class="number">
<input type="number" id="cruiseYawRate" data-setting="nav_fw_cruise_yaw_rate" data-setting-multiplier="1" step="1" min="0" max="60" />
<label for="cruiseYawRate">
<span data-i18n="cruiseYawRateLabel"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="cruiseYawRateHelp"></div>
</div>
<div class="checkbox">
<input type="checkbox" class="toggle update_preview" id="cruiseManualThrottle" data-setting="nav_fw_allow_manual_thr_increase" data-live="true" />
<label for="cruiseManualThrottle">
<span data-i18n="cruiseManualThrottleLabel"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="cruiseManualThrottleHelp"></div>
</div>
<div class="number">
<input id="minThrottle" type="number" data-simple-bind="FW_CONFIG.minThrottle" step="1" min="1000" max="2000">
<label for="minThrottle">
<span data-i18n="minThrottle"></span>
</label>
</div>
<div class="number">
<input id="maxThrottle" type="number" data-simple-bind="FW_CONFIG.maxThrottle" step="1" min="1000" max="2000">
<label for="maxThrottle">
<span data-i18n="maxThrottle"></span>
</label>
</div>
<div class="number">
<input id="maxBankAngle" type="number" data-simple-bind="FW_CONFIG.maxBankAngle" step="1" min="5" max="80">
<label for="maxBankAngle">
<span data-i18n="maxBankAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxBankAngleHelp"></div>
</div>
<div class="number">
<input id="maxClimbAngle" type="number" data-simple-bind="FW_CONFIG.maxClimbAngle" step="1" min="5" max="80">
<label for="maxClimbAngle">
<span data-i18n="maxClimbAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxClimbAngleHelp"></div>
<div class="select">
<select id="user-control-mode"></select>
<label for="user-control-mode"> <span data-i18n="userControlMode"></span></label>
</div>
<div class="number">
<input id="maxDiveAngle" type="number" data-simple-bind="FW_CONFIG.maxDiveAngle" step="1" min="5" max="80">
<label for="maxDiveAngle">
<span data-i18n="maxDiveAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="maxDiveAngleHelp"></div>
</div>
<div class="number">
<input id="pitchToThrottle" type="number" data-simple-bind="FW_CONFIG.pitchToThrottle" step="1" min="0" max="100">
<label for="pitchToThrottle">
<span data-i18n="pitchToThrottle"></span>
<input id="max-speed" type="number" data-simple-bind="NAV_POSHOLD.maxSpeed" step="1" min="10" max="2000">
<label for="max-speed">
<span data-i18n="posholdMaxSpeed"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleHelp"></div>
</div>
<div class="number">
<input id="pitchToThrottleSmoothing" type="number" data-setting="nav_fw_pitch2thr_smoothing" data-setting-multiplier="1" step="0" min="0" max="9">
<label for="pitchToThrottleSmoothing">
<span data-i18n="pitchToThrottleSmoothing"></span>
<input id="max-manual-speed" type="number" data-simple-bind="NAV_POSHOLD.maxManualSpeed" step="1" min="10" max="2000">
<label for="max-manual-speed">
<span data-i18n="posholdMaxManualSpeed"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleSmoothingHelp"></div>
</div>
<div class="number">
<input id="pitchToThrottleThreshold" type="number" data-setting="nav_fw_pitch2thr_threshold" data-setting-multiplier="1" step="1" min="0" max="900">
<label for="pitchToThrottleThreshold">
<span data-i18n="pitchToThrottleThreshold"></span>
<input id="max-climb-rate" type="number" data-simple-bind="NAV_POSHOLD.maxClimbRate" step="1" min="10" max="2000">
<label for="max-climb-rate">
<span data-i18n="posholdMaxClimbRate"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="pitchToThrottleThresholdHelp"></div>
</div>
<div class="number">
<input id="loiterRadius" type="number" data-simple-bind="FW_CONFIG.loiterRadius" step="1" min="0" max="10000">
<label for="loiterRadius">
<span data-i18n="loiterRadius"></span>
</label>
</div>
<div class="select">
<select id="loiterDirection" data-setting="fw_loiter_direction"></select>
<label for="loiterDirection">
<span data-i18n="loiterDirectionLabel"></span>
<input id="max-manual-climb-rate" type="number" data-simple-bind="NAV_POSHOLD.maxManualClimbRate" step="1" min="10" max="2000">
<label for="max-manual-climb-rate">
<span data-i18n="posholdMaxManualClimbRate"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="loiterDirectionHelp"></div>
</div>
<div class="number">
<input type="number" id="controlSmoothness" data-setting="nav_fw_control_smoothness" data-setting-multiplier="1" step="1" min="0" max="9" />
<label for="controlSmoothness">
<span data-i18n="controlSmoothness"></span>
<input id="max-bank-angle" type="number" data-simple-bind="NAV_POSHOLD.maxBankAngle" step="1" min="15" max="45">
<label for="max-bank-angle">
<span data-i18n="posholdMaxBankAngle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="controlSmoothnessHelp"></div>
<div class="helpicon cf_tip" data-i18n_title="posholdMaxBankAngleHelp"></div>
</div>
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="waypointConfiguration"></div>
</div>
<div class="spacer_box">
<div class="number">
<input type="number" id="waypointRadius" data-setting="nav_wp_radius" data-setting-multiplier="1" step="1" min="10" max="10000" />
<label for="waypointRadius">
<span data-i18n="waypointRadius"></span>
<div class="checkbox">
<input type="checkbox" id="use-mid-throttle" class="toggle" />
<label for="use-mid-throttle">
<span data-i18n="posholdHoverMidThrottle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="waypointRadiusHelp"></div>
</div>
<div class="number">
<input type="number" id="waypointSafeDistance" data-setting="nav_wp_safe_distance" data-setting-multiplier="1" step="1" min="0" max="65000" />
<label for="waypointSafeDistance">
<span data-i18n="waypointSafeDistance"></span>
<input id="hover-throttle" type="number" data-simple-bind="NAV_POSHOLD.hoverThrottle" step="1" min="1000" max="2000">
<label for="hover-throttle">
<span data-i18n="posholdHoverThrottle"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="waypointSafeDistanceHelp"></div>
</div>
</div>
</div>
......@@ -527,6 +427,107 @@
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="rthConfiguration"></div>
</div>
<div class="spacer_box">
<div class="select">
<select id="rthAltControlMode"></select>
<label for="rthAltControlMode"> <span data-i18n="rthAltControlMode"></span></label>
</div>
<div class="number">
<input id="rthAltitude" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.rthAltitude" step="1" min="0" max="65000">
<label for="rthAltitude">
<span data-i18n="rthAltitude"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthAltitudeHelp"></div>
</div>
<div class="number">
<input type="number" id="rthHomeAltitude" data-setting="nav_rth_home_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
<label for="rthHomeAltitude">
<span data-i18n="rthHomeAltitudeLabel"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthHomeAltitudeHelp"></div>
</div>
<div class="checkbox">
<input type="checkbox" id="rth-climb-first" class="toggle" />
<label for="rth-climb-first">
<span data-i18n="rthClimbFirst"></span>
</label>
</div>
<div class="checkbox">
<input type="checkbox" id="rthClimbIgnoreEmergency" class="toggle" />
<label for="rthClimbIgnoreEmergency">
<span data-i18n="rthClimbIgnoreEmergency"></span>
</label>
</div>
<div class="checkbox">
<input type="checkbox" id="rthTailFirst" class="toggle" />
<label for="rthTailFirst">
<span data-i18n="rthTailFirst"></span>
</label>
</div>
<div class="select">
<select id="rthAllowLanding"></select>
<label for="rthAllowLanding">
<span data-i18n="rthAllowLanding"></span>
</label>
</div>
<div class="number">
<input id="landDescentRate" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landDescentRate" step="1" min="100" max="2000">
<label for="landDescentRate">
<span data-i18n="landDescentRate"></span>
</label>
</div>
<div class="number">
<input id="landSlowdownMinAlt" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landSlowdownMinAlt" step="1" min="50" max="1000">
<label for="landSlowdownMinAlt">
<span data-i18n="landSlowdownMinAlt"></span>
</label>
</div>
<div class="number">
<input id="landSlowdownMaxAlt" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.landSlowdownMaxAlt" step="1" min="500" max="4000">
<label for="landSlowdownMaxAlt">
<span data-i18n="landSlowdownMaxAlt"></span>
</label>
</div>
<div class="number">
<input id="rth-min-distance" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.minRthDistance" step="1" min="0" max="5000">
<label for="rth-min-distance">
<span data-i18n="minRthDistance"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="minRthDistanceHelp"></div>
</div>
<div class="number">
<input id="rthAbortThreshold" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.rthAbortThreshold" step="1" min="0" max="65000">
<label for="rthAbortThreshold">
<span data-i18n="rthAbortThreshold"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="rthAbortThresholdHelp"></div>
</div>
<div class="number">
<input id="emergencyDescentRate" type="number" data-simple-bind="RTH_AND_LAND_CONFIG.emergencyDescentRate" step="1" min="10" max="2000">
<label for="emergencyDescentRate">
<span data-i18n="emergencyDescentRate"></span>
</label>
</div>
</div>
</div>
</div>
<div class="clear-both"></div>
......
Markdown is supported
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