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

Output map simplication

Browse source 
No need to special case MR/FW for output mapping.
This commit is contained in:
Marcelo Bezerra 2023-09-10 19:51:26 +02:00
parent ac1cc38f03
commit 99877167b3
1 changed files with 17 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

49
js/outputMapping.js
View file

@ -9,11 +9,11 @@ let OutputMappingCollection = function () {
const TIM_USE_ANY = 0; const TIM_USE_ANY = 0;
const TIM_USE_PPM = 0; const TIM_USE_PPM = 0;
const TIM_USE_PWM = 1; const TIM_USE_PWM = 1;
const TIM_USE_MC_MOTOR = 2; // Multicopter motor output const TIM_USE_MOTOR = 2; // Multicopter motor output
const TIM_USE_MC_SERVO = 3; // Multicopter servo output (i.e. TRI) const TIM_USE_SERVO = 3; // Multicopter servo output (i.e. TRI)
const TIM_USE_MC_CHNFW = 4; // Deprecated and not used after removal of CHANNEL_FORWARDING feature //const TIM_USE_MC_CHNFW = 4; // Deprecated and not used after removal of CHANNEL_FORWARDING feature
const TIM_USE_FW_MOTOR = 5; //const TIM_USE_FW_MOTOR = 5;
const TIM_USE_FW_SERVO = 6; //const TIM_USE_FW_SERVO = 6;
const TIM_USE_LED = 24; const TIM_USE_LED = 24;
const TIM_USE_BEEPER = 25; const TIM_USE_BEEPER = 25;
@ -56,22 +56,12 @@ let OutputMappingCollection = function () {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
timerMap[i] = null; timerMap[i] = null;
if (isMR) { if (servosToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_SERVO)) {
if (servosToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_MC_SERVO)) { servosToGo--;
servosToGo--; timerMap[i] = OUTPUT_TYPE_SERVO;
timerMap[i] = OUTPUT_TYPE_SERVO; } else if (motorsToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_MOTOR)) {
} else if (motorsToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_MC_MOTOR)) { motorsToGo--;
motorsToGo--; timerMap[i] = OUTPUT_TYPE_MOTOR;
timerMap[i] = OUTPUT_TYPE_MOTOR;
}
} else {
if (servosToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_FW_SERVO)) {
servosToGo--;
timerMap[i] = OUTPUT_TYPE_SERVO;
} else if (motorsToGo > 0 && bit_check(data[i]['usageFlags'], TIM_USE_FW_MOTOR)) {
motorsToGo--;
timerMap[i] = OUTPUT_TYPE_MOTOR;
}
} }
} }
@ -98,7 +88,6 @@ let OutputMappingCollection = function () {
outputMap[i] = "Servo " + servos[currentServoIndex]; outputMap[i] = "Servo " + servos[currentServoIndex];
currentServoIndex++; currentServoIndex++;
} }
} }
return outputMap; return outputMap;
@ -117,10 +106,8 @@ let OutputMappingCollection = function () {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if ( if (
bit_check(data[i]['usageFlags'], TIM_USE_MC_MOTOR) || bit_check(data[i]['usageFlags'], TIM_USE_MOTOR) ||
bit_check(data[i]['usageFlags'], TIM_USE_MC_SERVO) || bit_check(data[i]['usageFlags'], TIM_USE_SERVO)
bit_check(data[i]['usageFlags'], TIM_USE_FW_MOTOR) ||
bit_check(data[i]['usageFlags'], TIM_USE_FW_SERVO)
) { ) {
retVal++; retVal++;
}; };
@ -132,10 +119,8 @@ let OutputMappingCollection = function () {
function getFirstOutputOffset() { function getFirstOutputOffset() {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if ( if (
bit_check(data[i]['usageFlags'], TIM_USE_MC_MOTOR) || bit_check(data[i]['usageFlags'], TIM_USE_MOTOR) ||
bit_check(data[i]['usageFlags'], TIM_USE_MC_SERVO) || bit_check(data[i]['usageFlags'], TIM_USE_SERVO)
bit_check(data[i]['usageFlags'], TIM_USE_FW_MOTOR) ||
bit_check(data[i]['usageFlags'], TIM_USE_FW_SERVO)
) { ) {
return i; return i;
} }
@ -171,11 +156,11 @@ let OutputMappingCollection = function () {
} }
self.getFwServoOutput = function (servoIndex) { self.getFwServoOutput = function (servoIndex) {
return getOutput(servoIndex, TIM_USE_FW_SERVO); return getOutput(servoIndex, TIM_USE_SERVO);
}; };
self.getMrServoOutput = function (index) { self.getMrServoOutput = function (index) {
return getOutput(index, TIM_USE_MC_SERVO); return getOutput(index, TIM_USE_SERVO);
}; };
return self; return self;