Skip to content

VTX: Fetch power level count and min from FC (resolves #2202 conflict) #2486

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

Open
sensei-hacker wants to merge 3 commits into
base: maintenance-9.x
Choose a base branch
from
Open

VTX: Fetch power level count and min from FC (resolves #2202 conflict) #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20c4812
vtx: fetch powerlevel count from fc
bkleiner Oct 1, 2024
17828c9
Merge master and fix VTX power level conflict
sensei-hacker Dec 19, 2025
45bbd2a
Improve VTX parsing robustness for truncated packets
sensei-hacker Dec 19, 2025
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
4 changes: 4 additions & 0 deletions js/fc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@ var FC = {
power: 0,
pitmode: 0,
low_power_disarm: 0,
band_count: 0,
channel_count: 0,
power_count: 0,
power_min: 1,
};

this.ADVANCED_CONFIG = {
Expand Down
23 changes: 22 additions & 1 deletion js/msp/MSPHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,9 +1146,30 @@ var mspHelper = (function () {
FC.VTX_CONFIG.channel = data.getUint8(offset++);
FC.VTX_CONFIG.power = data.getUint8(offset++);
FC.VTX_CONFIG.pitmode = data.getUint8(offset++);
// Ignore wether the VTX is ready for now
// Ignore whether the VTX is ready for now
offset++;
FC.VTX_CONFIG.low_power_disarm = data.getUint8(offset++);

// Check if firmware supports VTX table (INAV 9.0+)
if (offset < data.byteLength) {
const vtxtable_available = data.getUint8(offset++);
if (vtxtable_available) {
if (offset + 2 < data.byteLength) {
FC.VTX_CONFIG.band_count = data.getUint8(offset++);
FC.VTX_CONFIG.channel_count = data.getUint8(offset++);
FC.VTX_CONFIG.power_count = data.getUint8(offset++);
}

// Check if firmware sends powerMin (INAV 9.1+)
if (offset < data.byteLength) {
FC.VTX_CONFIG.power_min = data.getUint8(offset++);
} else {
// Firmware 9.0 doesn't send powerMin, use fallback
// MSP VTX supports power off (index 0), others start at 1
FC.VTX_CONFIG.power_min = (FC.VTX_CONFIG.device_type == VTX.DEV_MSP) ? 0 : 1;
}
}
}
}
break;
case MSPCodes.MSP_ADVANCED_CONFIG:
Expand Down
17 changes: 0 additions & 17 deletions js/vtx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,6 @@ var VTX = (function() {
self.CHANNEL_MIN = 1;
self.CHANNEL_MAX = 8;

self.getMinPower = function(vtxDev) {
if (vtxDev == self.DEV_MSP) {
return 0;
}
return 1;
}

self.getMaxPower = function(vtxDev) {
if ((vtxDev == self.DEV_SMARTAUDIO) || (vtxDev == self.DEV_TRAMP)) {
return 8;
}
if (vtxDev == self.DEV_MSP) {
return 4;
}
return 3;
}

self.LOW_POWER_DISARM_MIN = 0;
self.LOW_POWER_DISARM_MAX = 2;

Expand Down
4 changes: 1 addition & 3 deletions tabs/configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {

var vtx_power = $('#vtx_power');
vtx_power.empty();
var minPower = VTX.getMinPower(FC.VTX_CONFIG.device_type);
var maxPower = VTX.getMaxPower(FC.VTX_CONFIG.device_type);
for (var ii = minPower; ii <= maxPower; ii++) {
for (var ii = FC.VTX_CONFIG.power_min; ii <= FC.VTX_CONFIG.power_count; ii++) {
var option = $('<option value="' + ii + '">' + ii + '</option>');
if (ii == FC.VTX_CONFIG.power) {
option.prop('selected', true);
Expand Down