speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from iNavFlight/master

Browse Source 
Merge from master
pull/1195/head
Darren Lines 4 years ago committed by GitHub
parent 71a13c96a3 ce2c6a8174
commit 73c7a9b906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 97 additions and 94 deletions
Show Stats Download Patch File Download Diff File

32
_locales/en/messages.json
Unescape Escape View File

@ -698,8 +698,8 @@
"configurationThrottleMinimumCommand": {
"message": "Minimum Command"
},
"configurationBatteryVoltage": {
"message": "Battery Voltage"
"configurationVoltageCurrentSensor": {
"message": "Voltage and Current Sensors"
},
"configurationBatteryCurrent": {
"message": "Battery Current"
@ -734,10 +734,13 @@
"configurationBatteryScale": {
"message": "Voltage Scale"
},
"configurationCurrent": {
"message": "Current Sensor"
"configurationBatteryVoltage": {
"message": "Battery Voltage"
},
"configurationCurrentScale": {
"message": "Current Meter Scale"
},
"configurationCurrentScaleHelp": {
"message": "Scale the output voltage to milliamps [1/10th mV/A]"
},
"configurationCurrentOffset": {
@ -746,8 +749,11 @@
"configurationBatteryMultiwiiCurrent": {
"message": "Enable support for legacy Multiwii MSP current output"
},
"configurationBatteryCapacity": {
"message": "Battery Capacity"
"configurationBatterySettings": {
"message": "Battery Settings"
},
"configurationBatterySettingsHelp": {
"message": "These settings apply to the currently selected battery profile "
},
"configurationBatteryCapacityValue": {
"message": "Capacity"
@ -1053,7 +1059,7 @@
"message": "FeedForward"
},
"pidTuningControlDerivative": {
"message": "Constrol Derivative"
"message": "Control Derivative"
},
"pidTuningRollPitchRate": {
"message": "ROLL & PITCH rate"
@ -2561,11 +2567,11 @@
"message": "How smoothly the autopilot adjusts the throttle level in response to pitch angle changes [0-9]."
},
"pitchToThrottleThreshold": {
"message": "Instantaneous pitch adjustment threshold [centidegrees]"
"message": "Instantaneous throttle adjustment threshold [centidegrees]"
},
"pitchToThrottleThresholdHelp": {
"message": "The autopilot will instantly adjust the throttle level according to pitch to throttle if the pitch angle is more this many centidegrees from the filtered value."
}
"message": "The autopilot will instantly adjust the throttle level without smoothing according to pitch to throttle if the pitch angle is more this many centidegrees from the filtered value."
},
"loiterRadius": {
"message": "Loiter radius [cm]"
},
@ -3064,6 +3070,12 @@
"osdSettingMainVoltageDecimals": {
"message": "Main voltage decimals"
},
"osdSettingPLUS_CODE_DIGITS_HELP": {
"message": "Precision at the equator: 10=13.9x13.9m; 11=2.8x3.5m; 12=56x87cm; 13=11x22cm."
},
"osdSettingPLUS_CODE_SHORT_HELP": {
"message": "Removing 2, 4 and 6 leading digits requires a reference location within, respectively, ~800km, ~40km and ~2km to recover the original coordinates."
},
"osdSettingCRSF_LQ_FORMAT_HELP": {
"message": "TYPE1 shows LQ% as used by TBS hardware. TYPE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 (1=250Hz) and LQ % [0..100%]."
},

7
js/fc.js
Unescape Escape View File

@ -1228,6 +1228,11 @@ var FC = {
name: "MAP OUTPUT",
hasOperand: [true, true],
output: "raw"
},
38: {
name: "RC CHANNEL OVERRIDE",
hasOperand: [true, true],
output: "boolean"
}
}
},
@ -1309,7 +1314,7 @@ var FC = {
4: {
name: "Logic Condition",
type: "range",
range: [0, 15],
range: [0, 31],
default: 0
},
5: {

50
package-lock.json generated
Unescape Escape View File

@ -1,6 +1,6 @@
{
"name": "inav-configurator",
"version": "2.6.0",
"version": "2.7.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -44,7 +44,6 @@
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"optional": true,
"requires": {
"kind-of": "^3.0.2",
"longest": "^1.0.1",
@ -55,7 +54,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@ -2199,8 +2197,7 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"aproba": {
"version": "1.2.0",
@ -2218,13 +2215,11 @@
},
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"optional": true
"bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@ -2237,18 +2232,15 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
@ -2351,8 +2343,7 @@
},
"inherits": {
"version": "2.0.3",
"bundled": true,
"optional": true
"bundled": true
},
"ini": {
"version": "1.3.5",
@ -2362,7 +2353,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -2375,20 +2365,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"optional": true
"bundled": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@ -2405,7 +2392,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -2478,8 +2464,7 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"object-assign": {
"version": "4.1.1",
@ -2489,7 +2474,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -2565,8 +2549,7 @@
},
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"optional": true
"bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@ -2596,7 +2579,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@ -2614,7 +2596,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -2653,13 +2634,11 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"optional": true
"bundled": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"optional": true
"bundled": true
}
}
},
@ -3937,8 +3916,7 @@
"longest": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
"optional": true
"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
},
"lowercase-keys": {
"version": "1.0.1",
@ -4403,7 +4381,7 @@
"semver": "^5.5.0",
"simple-glob": "~0.2.0",
"tar-fs": "^1.13.0",
"temp": "github:adam-lynch/node-temp#remove_tmpdir_dep",
"temp": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
"thenify": "^3.3.0",
"update-notifier": "^2.4.0",
"winresourcer": "^0.9.0"

4
tabs/advanced_tuning.html
Unescape Escape View File

@ -388,7 +388,7 @@
</div>
<div class="number">
<input id="pitchToThrottleSmoothing" type="number" data-simple-bind="nav_fw_pitch2thr_smoothing" data-setting-multiplier="1" step="0" min="0" max="9">
<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>
@ -396,7 +396,7 @@
</div>
<div class="number">
<input id="pitchToThrottleThreshold" type="number" data-simple-bind="nav_fw_pitch2thr_threshold" data-setting-multiplier="1" step="1" min="0" max="900">
<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>

12
tabs/calibration.html
Unescape Escape View File

@ -54,15 +54,15 @@
<table class="cf_table acc">
<tr>
<td data-i18n="accZero"></td>
<td><label for="accZeroX"><span>X</span></label><input type="number" name="accZeroX" min="0" max="2000"></td>
<td><label for="accZeroY"><span>Y</span></label><input type="number" name="accZeroY" min="0" max="2000"></td>
<td><label for="accZeroZ"><span>Z</span></label><input type="number" name="accZeroZ" min="0" max="2000"></td>
<td><label for="accZeroX"><span>X</span></label><input type="number" name="accZeroX" min="-32768" max="32767"></td>
<td><label for="accZeroY"><span>Y</span></label><input type="number" name="accZeroY" min="-32768" max="32767"></td>
<td><label for="accZeroZ"><span>Z</span></label><input type="number" name="accZeroZ" min="-32768" max="32767"></td>
</tr>
<tr>
<td data-i18n="accGain"></td>
<td><label for="accGainX"><span>X</span></label><input type="number" name="accGainX" min="0" max="2000"></td>
<td><label for="accGainY"><span>Y</span></label><input type="number" name="accGainY" min="0" max="2000"></td>
<td><label for="accGainZ"><span>Z</span></label><input type="number" name="accGainZ" min="0" max="2000"></td>
<td><label for="accGainX"><span>X</span></label><input type="number" name="accGainX" min="1" max="8192"></td>
<td><label for="accGainY"><span>Y</span></label><input type="number" name="accGainY" min="1" max="8192"></td>
<td><label for="accGainZ"><span>Z</span></label><input type="number" name="accGainZ" min="1" max="8192"></td>
</tr>
</table>
</div>

69
tabs/configuration.html
Unescape Escape View File

@ -253,7 +253,7 @@
<div class="rightWrapper">
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="configurationBatteryVoltage"></div>
<div class="spacer_box_title" data-i18n="configurationVoltageCurrentSensor"></div>
</div>
<div class="spacer_box">
<div class="features batteryVoltage"></div>
@ -273,32 +273,7 @@
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationVoltageSourceHelp"></div>
</div>
<div class="number">
<input type="number" id="cells" name="cells" step="1" min="0" max="8" />
<label for="cells"><span data-i18n="configurationBatteryCells"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationBatteryCellsHelp"></div>
</div>
<div class="number">
<input type="number" id="celldetectvoltage" name="celldetectvoltage" step="0.01" min="1" max="5" />
<label for="celldetectvoltage"><span data-i18n="configurationBatteryCellDetectVoltage"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationBatteryCellDetectVoltageHelp"></div>
</div>
<div class="number">
<input type="number" id="mincellvoltage" name="mincellvoltage" step="0.01" min="1" max="5" />
<label for="mincellvoltage"><span data-i18n="configurationBatteryMinimum"></span></label>
</div>
<div class="number">
<input type="number" id="maxcellvoltage" name="maxcellvoltage" step="0.01" min="1" max="5" />
<label for="maxcellvoltage">
<span data-i18n="configurationBatteryMaximum"></span>
</label>
</div>
<div class="number">
<input type="number" id="warningcellvoltage" name="warningcellvoltage" step="0.01" min="1" max="5" />
<label for="warningcellvoltage">
<span data-i18n="configurationBatteryWarning"></span>
</label>
</div>
<div class="number">
<input type="number" id="voltagescale" name="voltagescale" step="1" min="10" max="65535" />
<label for="voltagescale">
@ -311,13 +286,6 @@
<span data-i18n="configurationBatteryVoltage"></span>
</label>
</div>
</div>
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="configurationCurrent"></div>
</div>
<div class="spacer_box">
<div class="features batteryCurrent"></div>
<div class="select">
<select id="current_meter_type" data-setting="current_meter_type" />
@ -330,6 +298,7 @@
<label for="currentscale">
<span data-i18n="configurationCurrentScale"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationCurrentScaleHelp"></div>
</div>
<div class="number">
<input type="number" id="currentoffset" name="currentoffset" step="0.1" min="-3276.8" max="3276.7" />
@ -347,14 +316,44 @@
</div>
<div class="config-section gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" data-i18n="configurationBatteryCapacity"></div>
<div class="spacer_box_title" data-i18n="configurationBatterySettings"></div>
<div class="helpicon cf_tip" data-i18n_title="configurationBatterySettingsHelp"></div>
</div>
<div class="spacer_box">
<div class="number">
<input type="number" id="cells" name="cells" step="1" min="0" max="8" />
<label for="cells"><span data-i18n="configurationBatteryCells"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationBatteryCellsHelp"></div>
</div>
<div class="number">
<input type="number" id="celldetectvoltage" name="celldetectvoltage" step="0.01" min="1" max="5" />
<label for="celldetectvoltage"><span data-i18n="configurationBatteryCellDetectVoltage"></span></label>
<div class="helpicon cf_tip" data-i18n_title="configurationBatteryCellDetectVoltageHelp"></div>
</div>
<div class="number">
<input type="number" id="mincellvoltage" name="mincellvoltage" step="0.01" min="1" max="5" />
<label for="mincellvoltage"><span data-i18n="configurationBatteryMinimum"></span></label>
</div>
<div class="number">
<input type="number" id="maxcellvoltage" name="maxcellvoltage" step="0.01" min="1" max="5" />
<label for="maxcellvoltage">
<span data-i18n="configurationBatteryMaximum"></span>
</label>
</div>
<div class="number">
<input type="number" id="warningcellvoltage" name="warningcellvoltage" step="0.01" min="1" max="5" />
<label for="warningcellvoltage">
<span data-i18n="configurationBatteryWarning"></span>
</label>
</div>
<div class="select">
<select id="battery_capacity_unit">
<option value="mAh">mAh</option>
<option value="mWh">mWh</option>
</select>
<label for="warningcellvoltage">
<span data-i18n="configurationBatteryCapacityUnit"></span>
</label>
</div>
<div class="number">
<input type="number" id="battery_capacity" name="battery_capacity" step="1" min="0" max="4294967296" />

2
tabs/firmware_flasher.js
Unescape Escape View File

@ -139,7 +139,7 @@ TABS.firmware_flasher.initialize = function (callback) {
TABS.firmware_flasher.releases = releases;
};
$.get('https://api.github.com/repos/iNavFlight/inav/releases', function (releasesData){
$.get('https://api.github.com/repos/iNavFlight/inav/releases?per_page=10', function (releasesData){
TABS.firmware_flasher.releasesData = releasesData;
buildBoardOptions();

2
tabs/gps.html
Unescape Escape View File

@ -86,7 +86,7 @@
<div class="spacer_box_title" data-i18n="gpsMapHead"></div>
</div>
<div id="loadmap">
<div id="gps-map">
<div style="height:100%" id="gps-map">
<button class="map-button" id="center_button" data-i18n="gps_map_center"></button>
</div>
</div>

2
tabs/mission_control.html
Unescape Escape View File

@ -114,7 +114,7 @@
</div>
</div>
<div class="cf_column threefourth_left">
<div id="missionMap"></div>
<div style="height:100%" id="missionMap"></div>
<div id="notLoadMap" data-i18n="useOnlyStandalone" style="display: none;"></div>
</div>
</div>

8
tabs/osd.html
Unescape Escape View File

@ -68,9 +68,14 @@
<label>
<select class="update_preview" data-setting="osd_coordinate_digits" data-live="true"></select> Coordinate Digits
</label>
<div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_DIGITS_HELP"></div>
<label>
<select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select> Plus Code Digits
</label>
<div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_SHORT_HELP"></div>
<label>
<select class="update_preview" data-setting="osd_plus_code_short" data-live="true"></select> Plus Code Remove Leading Digits
</label>
<label>
<select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select> Crosshairs Style
</label>
@ -87,6 +92,9 @@
<label>
<input type="checkbox" class="toggle update_preview" data-setting="osd_sidebar_scroll_arrows" data-live="true"> Sidebar Scroll Arrows
</label>
<label>
<input type="checkbox" class="toggle update_preview" data-setting="osd_home_position_arm_screen" data-live="true"> Home Position on Arming Screen
</label>
</div>
</div>
</div>

3
tabs/osd.js
Unescape Escape View File

@ -1191,8 +1191,9 @@ OSD.constants = {
id: 97,
preview: function() {
let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;
let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_short')) * 2;
console.log("DITIS", digits);
return '9547X6PM+VWCCC'.substr(0, digits);
return '9547X6PM+VWCCC'.substr(digitsRemoved, digits-digitsRemoved);
}
},
{

Write Preview
Loading…
Cancel
Save