Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow LED pin to be reassigned as MOTOR or SERVO #2069

Merged
merged 10 commits into from
May 31, 2024
Merged

Allow LED pin to be reassigned as MOTOR or SERVO #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c98bf6e
Allow reassignment of led pin to servos or motors
mmosca May 11, 2024
b7b81b4
Fix output display when a remmaped led output overlaps motors/servos
mmosca May 12, 2024
02f058c
Merge remote-tracking branch 'origin/master' into mmosca-led-reassign…
mmosca May 12, 2024
edf5444
Merge remote-tracking branch 'origin/master' into mmosca-led-reassign…
mmosca May 12, 2024
3b7504c
quick fix
mmosca May 19, 2024
9ce5716
Merge remote-tracking branch 'origin/master' into mmosca-led-reassign…
mmosca May 19, 2024
f31c6a7
Merge remote-tracking branch 'origin/master' into mmosca-led-reassign…
mmosca May 28, 2024
dc21e79
Merge remote-tracking branch 'origin/master' into mmosca-led-reassign…
mmosca May 31, 2024
442859e
Merge branch 'mmosca-led-reassignment' of github.com:iNavFlight/inav-…
mmosca May 31, 2024
16b212e
Use new special label info from msp to tag led pin.
mmosca May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/bitHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var BitHelper = function() {
}

self.bit_check = function (num, bit) {
return ((num >> bit) % 2 != 0);
return ((1 << bit) & num) != 0;
}

self.bit_set = function (num, bit) {
Expand Down
1 change: 1 addition & 0 deletions js/msp/MSPCodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ var MSPCodes = {
MSP2_INAV_MC_BRAKING: 0x200B,
MSP2_INAV_SET_MC_BRAKING: 0x200C,
MSPV2_INAV_OUTPUT_MAPPING_EXT: 0x200D,
MSPV2_INAV_OUTPUT_MAPPING_EXT2: 0x210D,
MSP2_INAV_TIMER_OUTPUT_MODE: 0x200E,
MSP2_INAV_SET_TIMER_OUTPUT_MODE: 0x200F,

Expand Down
15 changes: 10 additions & 5 deletions js/msp/MSPHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,22 +1409,26 @@ var mspHelper = (function () {
case MSPCodes.MSP2_INAV_SET_CUSTOM_OSD_ELEMENTS:
console.log('OSD custom elements preferences saved');
break;
/*
case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING:
FC.OUTPUT_MAPPING.flush();
for (let i = 0; i < data.byteLength; ++i)
FC.OUTPUT_MAPPING.put({
'timerId': i,
'usageFlags': data.getUint8(i)});
break;
case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING_EXT:
*/
case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING_EXT2:
FC.OUTPUT_MAPPING.flush();
for (let i = 0; i < data.byteLength; i += 2) {
for (let i = 0; i < data.byteLength; i += 6) {
let timerId = data.getUint8(i);
let usageFlags = data.getUint8(i + 1);
let usageFlags = data.getUint32(i + 1, true);
let specialLabels = data.getUint8(i + 5);
FC.OUTPUT_MAPPING.put(
{
'timerId': timerId,
'usageFlags': usageFlags
'usageFlags': usageFlags,
'specialLabels': specialLabels
});
}
break;
Expand Down Expand Up @@ -2771,11 +2775,12 @@ var mspHelper = (function () {
};

self.loadOutputMapping = function (callback) {
alert('Obsolete MSPHelper.loadOutputMapping call');
MSP.send_message(MSPCodes.MSPV2_INAV_OUTPUT_MAPPING, false, false, callback);
};

self.loadOutputMappingExt = function (callback) {
MSP.send_message(MSPCodes.MSPV2_INAV_OUTPUT_MAPPING_EXT, false, false, callback);
MSP.send_message(MSPCodes.MSPV2_INAV_OUTPUT_MAPPING_EXT2, false, false, callback);
};

self.loadTimerOutputModes = function(callback) {
Expand Down
27 changes: 23 additions & 4 deletions js/outputMapping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ var OutputMappingCollection = function () {

const OUTPUT_TYPE_MOTOR = 0;
const OUTPUT_TYPE_SERVO = 1;
const OUTPUT_TYPE_LED = 2;

const SPECIAL_LABEL_LED = 1;

self.TIMER_OUTPUT_MODE_AUTO = 0;
self.TIMER_OUTPUT_MODE_MOTORS = 1;
self.TIMER_OUTPUT_MODE_SERVOS = 2;
self.TIMER_OUTPUT_MODE_LED = 3;

self.flushTimerOverrides = function() {
timerOverrides = {};
Expand All @@ -53,6 +57,10 @@ var OutputMappingCollection = function () {
return colorTable[timerIndex % colorTable.length];
}

self.isLedPin = function(timer) {
return data[timer].specialLabels == SPECIAL_LABEL_LED;
}

self.getOutputTimerColor = function (output) {
let timerId = self.getTimerId(output);

Expand All @@ -79,10 +87,15 @@ var OutputMappingCollection = function () {
for (let i = 0; i < data.length; i++) {
timerMap[i] = null;

if (servosToGo > 0 && BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_SERVO)) {
if (servosToGo > 0 && BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_LED)) {
console.log(i + ": LED");
timerMap[i] = OUTPUT_TYPE_LED;
} else if (servosToGo > 0 && BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_SERVO)) {
console.log(i + ": SERVO");
servosToGo--;
timerMap[i] = OUTPUT_TYPE_SERVO;
} else if (motorsToGo > 0 && BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_MOTOR)) {
console.log(i + ": MOTOR");
motorsToGo--;
timerMap[i] = OUTPUT_TYPE_MOTOR;
}
Expand All @@ -98,6 +111,7 @@ var OutputMappingCollection = function () {
outputMap = [],
offset = getFirstOutputOffset();

console.log("Offset: " + offset)
for (let i = 0; i < self.getOutputCount(); i++) {

let assignment = timerMap[i + offset];
Expand All @@ -110,6 +124,8 @@ var OutputMappingCollection = function () {
} else if (assignment == OUTPUT_TYPE_SERVO) {
outputMap[i] = "Servo " + servos[currentServoIndex];
currentServoIndex++;
} else if (assignment == OUTPUT_TYPE_LED) {
outputMap[i] = "Led";
}
}

Expand All @@ -128,9 +144,11 @@ var OutputMappingCollection = function () {
let retVal = 0;

for (let i = 0; i < data.length; i++) {
let flags = data[i]['usageFlags'];
if (
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_MOTOR) ||
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_SERVO)
BitHelper.bit_check(flags, TIM_USE_MOTOR) ||
BitHelper.bit_check(flags, TIM_USE_SERVO) ||
BitHelper.bit_check(flags, TIM_USE_LED)
) {
retVal++;
};
Expand All @@ -143,7 +161,8 @@ var OutputMappingCollection = function () {
for (let i = 0; i < data.length; i++) {
if (
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_MOTOR) ||
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_SERVO)
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_SERVO) ||
BitHelper.bit_check(data[i]['usageFlags'], TIM_USE_LED)
) {
return i;
}
Expand Down
4 changes: 3 additions & 1 deletion tabs/mixer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ TABS.mixer.initialize = function (callback, scrollPosition) {

let timerId = FC.OUTPUT_MAPPING.getTimerId(i - 1);
let color = FC.OUTPUT_MAPPING.getOutputTimerColor(i - 1);
let isLed = FC.OUTPUT_MAPPING.isLedPin(i - 1);

$outputRow.append('<td style="background-color: ' + color + '">S' + i + ' (Timer ' + (timerId + 1) + ')</td>');
$outputRow.append('<td style="background-color: ' + color + '">S' + i + (isLed ? '/LED' : '') + ' (Timer&nbsp;' + (timerId + 1) + ')</td>');
$functionRow.append('<td id="function-' + i +'">-</td>');
}

Expand Down Expand Up @@ -131,6 +132,7 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
'<option value=' + FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_AUTO + '' + (usageMode == FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_AUTO ? ' selected' : '')+ '>AUTO</option>'+
'<option value=' + FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_MOTORS + '' + (usageMode == FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_MOTORS ? ' selected' : '')+ '>MOTORS</option>'+
'<option value=' + FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_SERVOS + '' + (usageMode == FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_SERVOS ? ' selected' : '')+ '>SERVOS</option>'+
'<option value=' + FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_LED + '' + (usageMode == FC.OUTPUT_MAPPING.TIMER_OUTPUT_MODE_LED ? ' selected' : '')+ '>LED</option>'+
'</select>' +
'<label for="timer-output-' + t + '">' +
'<span> Timer ' + (parseInt(t) + 1) + '</span>' +
Expand Down
2 changes: 1 addition & 1 deletion tabs/outputs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TABS.outputs.initialize = function (callback) {
mspHelper.loadServoMixRules,
mspHelper.loadMixerConfig,
mspHelper.loadServoConfiguration,
mspHelper.loadOutputMapping,
mspHelper.loadOutputMappingExt,
mspHelper.loadRcData,
mspHelper.loadAdvancedConfig,
function(callback) {
Expand Down
Loading