Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-25 01:05:12 +03:00
Code Wiki Activity

Add ui unit conversions

Browse source
This commit is contained in:
Elgan Sayer 2021-10-16 20:21:35 +01:00
parent ff80e0621b
commit 76a7f686e7
5 changed files with 80 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
_locales/en/messages.json
View file

@ -12,7 +12,13 @@
"options_improve_configurator": {
"message": "Send anonymous usage data to the developer team"
},
"options_unit_type": {
"message": "Set how the units render on the configurator only"
},
"options_render": {
"message": "Configurator rendering options"
},
"connect": {
"message": "Connect"
},

40
main.css
View file

@ -516,6 +516,11 @@ input[type="number"]::-webkit-inner-spin-button {
z-index: 10000;
}
/* options modified GUI BOX */
#options-window .gui_box {
float: none;
}
.options_container__checkbox input {
float: left;
margin-top: 3px;
@ -2198,4 +2203,37 @@ ol li {
.red-background td,
.red-background th {
background-color: tomato !important;
}
}
/* Wrapper for inputs with unit displays */
.unit_wrapper {
display: inline-block;
position: relative;
}
/* Position the unit to the right of the wrapper */
.unit_wrapper::after {
position: absolute;
top: 2px;
right: .7em;
transition: all .05s ease-in-out;
}
/* Move unit more to the left on hover or focus within
for arrow buttons will appear to the right of number inputs */
.unit_wrapper:hover::after,
.unit_wrapper:focus-within::after {
right: 1.3em;
}
/* Handle Firefox (arrows always shown) */
@supports (-moz-appearance:none) {
.unit_wrapper::after {
right: 1.3em;
}
}
/* Set the unit abbreviation for each unit class */
.unit::after {
content: attr(data-unit) ;
}

54
tabs/advanced_tuning.html
View file

@ -21,7 +21,7 @@
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAngleHelp"></div>
</div>
<div class="number">
<input type="number" id="launchVelocity" data-setting="nav_fw_launch_velocity" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<input type="number" id="launchVelocity" data-unit="cms" data-setting="nav_fw_launch_velocity" data-setting-multiplier="1" step="1" min="1000" max="2000" />
<label for="launchVelocity"><span data-i18n="configurationLaunchVelocity"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchVelocityHelp"></div>
</div>
@ -31,22 +31,22 @@
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchAccelHelp"></div>
</div>
<div class="number">
<input type="number" id="launchDetectTime" data-setting="nav_fw_launch_detect_time" data-setting-multiplier="1" step="1" min="10" max="1000" />
<input type="number" id="launchDetectTime" data-unit="ms" data-setting="nav_fw_launch_detect_time" data-setting-multiplier="1" step="1" min="10" max="1000" />
<label for="launchDetectTime"><span data-i18n="configurationLaunchDetectTime"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchDetectTimeHelp"></div>
</div>
<div class="number">
<input type="number" id="launchMotorDelay" data-setting="nav_fw_launch_motor_delay" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input type="number" id="launchMotorDelay" data-unit="ms" data-setting="nav_fw_launch_motor_delay" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="launchMotorDelay"><span data-i18n="configurationLaunchMotorDelay"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMotorDelayHelp"></div>
</div>
<div class="number">
<input type="number" id="launchMinTime" data-setting="nav_fw_launch_min_time" data-setting-multiplier="1" step="1" min="0" max="60000" />
<input type="number" id="launchMinTime" data-unit="ms" data-setting="nav_fw_launch_min_time" data-setting-multiplier="1" step="1" min="0" max="60000" />
<label for="launchMinTime"><span data-i18n="configurationLaunchMinTime"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMinTimeHelp"></div>
</div>
<div class="number">
<input type="number" id="launchSpinupTime" data-setting="nav_fw_launch_spinup_time" data-setting-multiplier="1" step="1" min="0" max="1000" />
<input type="number" id="launchSpinupTime" data-unit="ms" data-setting="nav_fw_launch_spinup_time" data-setting-multiplier="1" step="1" min="0" max="1000" />
<label for="launchSpinupTime"><span data-i18n="configurationLaunchSpinupTime"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchSpinupTimeHelp"></div>
</div>
@ -61,17 +61,17 @@
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchClimbAngleHelp"></div>
</div>
<div class="number">
<input type="number" id="launchTimeout" data-setting="nav_fw_launch_timeout" data-setting-multiplier="1" step="1" min="0" max="60000" />
<input type="number" id="launchTimeout" data-unit="ms" data-setting="nav_fw_launch_timeout" data-setting-multiplier="1" step="1" min="0" max="60000" />
<label for="launchTimeout"><span data-i18n="configurationLaunchTimeout"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchTimeoutHelp"></div>
</div>
<div class="number">
<input type="number" id="launchMaxAltitude" data-setting="nav_fw_launch_max_altitude" data-setting-multiplier="1" step="1" min="0" max="60000" />
<input type="number" id="launchMaxAltitude" data-unit="cm" data-setting="nav_fw_launch_max_altitude" data-setting-multiplier="1" step="1" min="0" max="60000" />
<label for="launchMaxAltitude"><span data-i18n="configurationLaunchMaxAltitude"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchMaxAltitudeHelp"></div>
</div>
<div class="number">
<input type="number" id="launchEndTime" data-setting="nav_fw_launch_end_time" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input type="number" id="launchEndTime" data-unit="ms" data-setting="nav_fw_launch_end_time" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="launchEndTime"><span data-i18n="configurationLaunchEndTime"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationLaunchEndTimeHelp"></div>
</div>
@ -89,12 +89,12 @@
<div class="helpicon cf_tip" data-i18n_title="idlePowerHelp"></div>
</div>
<div class="number">
<input type="number" id="cruisePower" data-setting="cruise_power" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input type="number" id="cruisePower" data-unit="cms" data-setting="cruise_power" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="cruisePower"><span data-i18n="cruisePower"></span></label>
<div class="helpicon cf_tip" data-i18n_title="cruisePowerHelp"></div>
</div>
<div class="number">
<input type="number" id="cruiseSpeed" data-setting="nav_fw_cruise_speed" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input type="number" id="cruiseSpeed" data-unit="cms" data-setting="nav_fw_cruise_speed" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="cruiseSpeed"><span data-i18n="cruiseSpeed"></span></label>
<div class="helpicon cf_tip" data-i18n_title="cruiseSpeedHelp"></div>
</div>
@ -216,11 +216,11 @@
<label for="user-control-mode"><span data-i18n="userControlMode"></span></label>
</div>
<div class="number">
<input id="max-speed" type="number" data-setting="nav_auto_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
<input id="max-speed" data-unit="cms" type="number" data-setting="nav_auto_speed" data-setting-multiplier="1" 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-setting="nav_manual_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
<input id="max-manual-speed" data-unit="cms" type="number" data-setting="nav_manual_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
<label for="max-manual-speed"><span data-i18n="posholdMaxManualSpeed"></span></label>
</div>
<div class="number">
@ -253,19 +253,19 @@
<div class="spacer_box">
<div class="number">
<input id="brakingSpeedThreshold" type="number" data-setting="nav_mc_braking_speed_threshold" data-setting-multiplier="1" step="1" min="0" max="1000" />
<input id="brakingSpeedThreshold" type="number" data-unit="cms" data-setting="nav_mc_braking_speed_threshold" data-setting-multiplier="1" step="1" min="0" max="1000" />
<label for="brakingSpeedThreshold"><span data-i18n="brakingSpeedThreshold"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingSpeedThresholdTip"></div>
</div>
<div class="number">
<input id="brakingDisengageSpeed" type="number" data-setting="nav_mc_braking_disengage_speed" data-setting-multiplier="1" step="1" min="0" max="1000" />
<input id="brakingDisengageSpeed" type="number" data-unit="cms" data-setting="nav_mc_braking_disengage_speed" data-setting-multiplier="1" step="1" min="0" max="1000" />
<label for="brakingDisengageSpeed"><span data-i18n="brakingDisengageSpeed"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingDisengageSpeedTip"></div>
</div>
<div class="number">
<input id="brakingTimeout" type="number" data-setting="nav_mc_braking_timeout" data-setting-multiplier="1" step="1" min="100" max="5000" />
<input id="brakingTimeout" type="number" data-unit="ms" data-setting="nav_mc_braking_timeout" data-setting-multiplier="1" step="1" min="100" max="5000" />
<label for="brakingTimeout"><span data-i18n="brakingTimeout"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingTimeoutTip"></div>
</div>
@ -277,19 +277,19 @@
</div>
<div class="number">
<input id="brakingBoostTimeout" type="number" data-setting="nav_mc_braking_boost_timeout" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input id="brakingBoostTimeout" type="number" data-unit="ms" data-setting="nav_mc_braking_boost_timeout" data-setting-multiplier="1" step="1" min="0" max="5000" />
<label for="brakingBoostTimeout"><span data-i18n="brakingBoostTimeout"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingBoostTimeoutTip"></div>
</div>
<div class="number">
<input id="brakingBoostSpeedThreshold" type="number" data-setting="nav_mc_braking_boost_speed_threshold" data-setting-multiplier="1" step="1" min="100" max="1000" />
<input id="brakingBoostSpeedThreshold" type="number" data-unit="cms"data-setting="nav_mc_braking_boost_speed_threshold" data-setting-multiplier="1" step="1" min="100" max="1000" />
<label for="brakingBoostSpeedThreshold"><span data-i18n="brakingBoostSpeedThreshold"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingBoostSpeedThresholdTip"></div>
</div>
<div class="number">
<input id="brakingBoostDisengageSpeed" type="number" data-setting="nav_mc_braking_boost_disengage_speed" data-setting-multiplier="1" step="1" min="100" max="1000" />
<input id="brakingBoostDisengageSpeed" type="number" data-unit="cms" data-setting="nav_mc_braking_boost_disengage_speed" data-setting-multiplier="1" step="1" min="100" max="1000" />
<label for="brakingBoostDisengageSpeed"><span data-i18n="brakingBoostDisengageSpeed"></span></label>
<div class="helpicon cf_tip" data-i18n_title="brakingBoostDisengageSpeedTip"></div>
</div>
@ -324,13 +324,13 @@
</div>
<div class="number">
<input type="number" id="rthAltitude" data-setting="nav_rth_altitude" data-setting-multiplier="1" step="1" min="0" max="65000" />
<input type="number" id="rthAltitude" data-unit="cm" data-setting="nav_rth_altitude" data-setting-multiplier="1" 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" />
<input type="number" id="rthHomeAltitude" data-unit="cm" 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>
@ -363,13 +363,13 @@
</div>
<div class="number">
<input id="rth-min-distance" type="number" data-setting="nav_min_rth_distance" data-setting-multiplier="1" step="1" min="0" max="5000" />
<input id="rth-min-distance" type="number" data-unit="cm" data-setting="nav_min_rth_distance" data-setting-multiplier="1" 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-setting="nav_rth_abort_threshold" data-setting-multiplier="1" step="1" min="0" max="65000" />
<input id="rthAbortThreshold" type="number" data-unit="cm" data-setting="nav_rth_abort_threshold" data-setting-multiplier="1" 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>
@ -387,13 +387,13 @@
</div>
<div class="spacer_box">
<div class="number">
<input type="number" id="navManualClimbRate" data-setting="nav_manual_climb_rate" data-setting-multiplier="1" step="1" min="10" max="2000" />
<input type="number" id="navManualClimbRate" data-unit="cms" data-setting="nav_manual_climb_rate" data-setting-multiplier="1" step="1" min="10" max="2000" />
<label for="navManualClimbRate"><span data-i18n="navManualClimbRate"></span></label>
<div class="helpicon cf_tip" data-i18n_title="navManualClimbRateHelp"></div>
</div>
<div class="number">
<input type="number" id="navAutoClimbRate" data-setting="nav_auto_climb_rate" data-setting-multiplier="1" step="1" min="10" max="2000" />
<input type="number" id="navAutoClimbRate" data-unit="cms" data-setting="nav_auto_climb_rate" data-setting-multiplier="1" step="1" min="10" max="2000" />
<label for="navAutoClimbRate"><span data-i18n="navAutoClimbRate"></span></label>
<div class="helpicon cf_tip" data-i18n_title="navAutoClimbRateHelp"></div>
</div>
@ -407,13 +407,13 @@
<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" />
<input type="number" id="waypointRadius" data-unit="cm" 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" />
<input type="number" id="waypointSafeDistance" data-unit="cm" 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>
@ -451,7 +451,7 @@
</div>
<div class="number">
<input id="emergencyDescentRate" type="number" data-setting="nav_emerg_landing_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
<input id="emergencyDescentRate" type="number" data-unit="cms" data-setting="nav_emerg_landing_speed" data-setting-multiplier="1" step="1" min="10" max="2000" />
<label for="emergencyDescentRate"><span data-i18n="emergencyDescentRate"></span></label>
</div>
</div>

2
tabs/failsafe.html
View file

@ -7,7 +7,7 @@
</div>
<div class="spacer_box">
<div class="number">
<label> <input type="number" name="failsafe_delay" min="0" max="2000" /> <span
<label> <input type="number" data-unit="ms" min="0" max="2000" /> <span
data-i18n="failsafeDelayItem"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="failsafeDelayHelp"></div>

6
tabs/setup.js
View file

@ -8,6 +8,12 @@ TABS.setup = {
TABS.setup.initialize = function (callback) {
var self = this;
// Update the osd units in global settings
// but only if we need it
if (globalSettings.unitType === UnitType.OSD) {
get_osd_settings();
}
if (GUI.active_tab != 'setup') {
GUI.active_tab = 'setup';
googleAnalytics.sendAppView('Setup');