Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-13 11:29:53 +03:00
Code Wiki Activity

Merge pull request #2263 from sensei-hacker/outputs_preview_motor_numbers

Browse source
This commit is contained in:
Darren Lines 2024-11-30 07:57:58 +00:00 • committed by GitHub
commit d6b57e35b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/css/tabs/motors.css
View file

@ -464,3 +464,17 @@
.tab-motors .config-section .number input {
margin-right: 4px;
}
.tab-motors .mixerPreview {
position: relative;
}
.tab-motors .motorNumber {
position: absolute;
font-size: 1.4em;
visibility: hidden;
}
.tab-motors .mixer-preview-image-numbers {
width: fit-content;
}

3
tabs/mixer.js
View file

@ -476,6 +476,7 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
$("#motorNumber"+index).css("left", left_px + "px");
$("#motorNumber"+index).css("top", top_px + "px");
$("#motorNumber"+index).removeClass("is-hidden");
$("#motorNumber"+index).css("visibility", "visible");
}
}
}
@ -610,7 +611,6 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
}
}
return (errorCount == 0);
}
@ -661,7 +661,6 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
const path = './resources/motor_order/'
+ currentMixerPreset.image + (isReversed ? "_reverse" : "") + '.svg';
$('.mixerPreview img').attr('src', path);
renderServoOutputImage();
};

6
tabs/outputs.html
View file

@ -117,7 +117,11 @@
<div class="motors right">
<div class="half">
<div class="mixerPreview">
<img src="./resources/motor_order/custom.svg" />
<img src="./resources/motor_order/custom.svg" id="motor-mixer-preview-img" />
<div class="motorNumber" id="motorNumber1">1</div>
<div class="motorNumber" id="motorNumber2">2</div>
<div class="motorNumber" id="motorNumber3">3</div>
<div class="motorNumber" id="motorNumber4">4</div>
</div>
</div>
<div class="half">

33
tabs/outputs.js
View file

@ -257,6 +257,7 @@ TABS.outputs.initialize = function (callback) {
const path = './resources/motor_order/'
+ mixer.getById(val).image + (isReversed ? "_reverse" : "") + '.svg';
$('.mixerPreview img').attr('src', path);
labelMotorNumbers();
}
function process_servos() {
@ -717,6 +718,38 @@ TABS.outputs.initialize = function (callback) {
GUI.content_ready(callback);
}
function labelMotorNumbers() {
if (mixer.getById(FC.MIXER_CONFIG.appliedMixerPreset).image != 'quad_x') {
return;
}
let index = 0;
var rules = FC.MOTOR_RULES.get();
for (const i in rules) {
if (rules.hasOwnProperty(i)) {
const rule = rules[i];
index++;
let top_px = 30;
let left_px = 28;
if (rule.getRoll() < -0.5) {
left_px = $("#motor-mixer-preview-img").width() - 20;
}
if (rule.getPitch() > 0.5) {
top_px = $("#motor-mixer-preview-img").height() - 20;
}
$("#motorNumber"+index).css("left", left_px + "px");
$("#motorNumber"+index).css("top", top_px + "px");
$("#motorNumber"+index).css("visibility", "visible");
}
}
}
};
TABS.outputs.cleanup = function (callback) {