Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-15 04:15:28 +03:00
Code Wiki Activity

Merge branch 'iNavFlight:master' into strobe-configurator

Browse source
This commit is contained in:
Marcelo Bezerra 2022-11-16 21:24:48 +01:00 • committed by GitHub
commit e567dce178
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/fc.js
View file

@ -1239,7 +1239,10 @@ var FC = {
7: "Horizon",
8: "Air",
9: "USER 1",
10: "USER 2"
10: "USER 2",
11: "Course Hold",
12: "USER 3",
13: "USER 4",
}
},
4: {

22
js/gui.js
View file

@ -279,11 +279,27 @@ GUI_control.prototype.renderOperandValue = function ($container, operandMetadata
$t.append('<option value="' + i + '">' + i + '</option>');
}
} else if (operandMetadata.type == "dictionary") {
for (let k in operandMetadata.values) {
if (operandMetadata.values.hasOwnProperty(k)) {
$t.append('<option value="' + k + '">' + operandMetadata.values[k] + '</option>');
let operandValues = [];
for (let j in operandMetadata.values) {
if (operandMetadata.values.hasOwnProperty(j)) {
operandValues[parseInt(j,10)] = {
id: parseInt(j, 10),
name: operandMetadata.values[j],
};
}
}
operandValues.sort((a, b) => {
let ovAN = a.name.toLowerCase(),
ovBN = b.name.toLowerCase();
return (ovAN < ovBN) ? -1 : 1;
});
operandValues.forEach( val => {
$t.append('<option value="' + val.id + '">' + val.name + '</option>');
});
}
$t.val(value);

4
src/css/tabs/calibration.css
View file

@ -148,8 +148,8 @@
}
#calib_btn a.resetCalibration {
background-color: #860000;
color: #e4e4e4;
background-color: grey;
color: rgb(212, 212, 212);
}
#calib_btn a.resetCalibration:hover {

2
tabs/auxiliary.js
View file

@ -46,7 +46,7 @@ TABS.auxiliary.initialize = function (callback) {
modeSections["Multi-rotor"] = ["FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ"];
modeSections["OSD Modes"] = ["OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3"];
modeSections["FPV Camera Modes"] = ["CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3"];
modeSections["Misc Modes"] = ["BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2"];
modeSections["Misc Modes"] = ["BEEPER", "LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2", "USER3", "USER4"];
function sort_modes_for_display() {
// Sort the modes