Skip to content

Maintenance 8.x.x #2348

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

Merged
merged 20 commits into from
Nov 20, 2025
Merged

Maintenance 8.x.x #2348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4190480
New video system type
mmosca Oct 29, 2024
104bb75
Update new option name
mmosca Nov 1, 2024
d3b0cbf
MSPHelper.js: Servo mixer use unsigned
sensei-hacker Jan 25, 2025
06defd8
Update osd.js
mmosca Jan 27, 2025
ab9f6db
missing ,
mmosca Feb 13, 2025
6721e4d
Merge pull request #2222 from iNavFlight/mmosca-dji-no-compat
mmosca Feb 13, 2025
5f85ccc
smartaudio 8 levels
sensei-hacker Feb 19, 2025
c6b8a9d
Set version to 8.0.1
mmosca Feb 25, 2025
8673a3c
Merge pull request #2352 from iNavFlight/mmosca-8.0.1
mmosca Feb 25, 2025
c1a687a
update sitl binaries
mmosca Feb 25, 2025
546d403
fix permissions
mmosca Feb 25, 2025
68d176f
Merge pull request #2347 from sensei-hacker/smartaudio_8_levels_maint8
mmosca Feb 28, 2025
7bf1622
Merge pull request #2326 from sensei-hacker/servo_mix_uint
mmosca Mar 26, 2025
6f3b20f
Update sitl files
mmosca Mar 26, 2025
45024fb
Move Active column in IPF
MrD-RC Jun 12, 2025
c25ae30
Changed Active to Active when
MrD-RC Jun 12, 2025
39cf902
Merge pull request #2387 from iNavFlight/MrD_Reorder-IPF-columns
sensei-hacker Jun 13, 2025
59f954a
led strip: Do not hide the channel option
sensei-hacker Jun 15, 2025
2e2db3d
Merge pull request #2389 from sensei-hacker/led_dont_hide_channel_8
sensei-hacker Oct 13, 2025
a382027
Merge branch 'master' into maintenance-8.x.x
sensei-hacker Nov 16, 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
2 changes: 1 addition & 1 deletion js/logicCondition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op
self.render = function (index, $container) {

$container.find('tbody').append('<tr>\
<td class="logic_cell__activator"></div></td>\
<td class="logic_cell__index"></td>\
<td class="logic_cell__enabled"></td>\
<td class="logic_cell__operation"></td>\
<td class="logic_cell__operandA"></td>\
<td class="logic_cell__operandB"></td>\
<td class="logic_cell__activator"></div></td>\
<td class="logic_cell__flags"></div></td>\
<td class="logic_cell__status"></td>\
</tr>\
Expand Down
6 changes: 3 additions & 3 deletions js/msp/MSPHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,10 +439,10 @@ var mspHelper = (function () {
if (data.byteLength % 6 === 0) {
for (let i = 0; i < data.byteLength; i += 6) {
FC.SERVO_RULES.put(new ServoMixRule(
data.getInt8(i),
data.getInt8(i + 1),
data.getUint8(i),
data.getUint8(i + 1),
data.getInt16(i + 2, true),
data.getInt8(i + 4),
data.getUint8(i + 4),
data.getInt8(i + 5)
));
}
Expand Down
2 changes: 1 addition & 1 deletion js/vtx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var VTX = (function() {

self.getMaxPower = function(vtxDev) {
if ((vtxDev == self.DEV_SMARTAUDIO) || (vtxDev == self.DEV_TRAMP)) {
return 5;
return 8;
}
if (vtxDev == self.DEV_MSP) {
return 4;
Expand Down
2 changes: 1 addition & 1 deletion locale/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5198,7 +5198,7 @@
"message": "Close"
},
"logicActivator": {
"message": "Active"
"message": "Active when"
},
"save": {
"message": "Save"
Expand Down
Binary file modified resources/sitl/linux/arm64/inav_SITL
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sitl/linux/inav_SITL
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sitl/macos/inav_SITL
View file
Open in desktop
Binary file not shown.
Binary file modified resources/sitl/windows/inav_SITL.exe
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions src/css/tabs/programming.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,8 @@
padding: 2px;
margin-right: 1em;
font-size: 13px;
}

.logic_cell__activator {
width: 145px;
}
2 changes: 1 addition & 1 deletion tabs/led_strip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<option value="function-s" class="extra_functions20" i18n="ledStripFunctionRSSIOption"></option>
<option value="function-g" class="extra_functions20" i18n="ledStripFunctionGPSOption"></option>
<option value="function-r" class="" i18n="ledStripFunctionRingOption"></option>
<option value="function-h" class="channel_info" i18n="ledStripFunctionChannelOption"></option>
<option value="function-h" class="" i18n="ledStripFunctionChannelOption"></option>
</select>
</div>

Expand Down
22 changes: 13 additions & 9 deletions tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,8 @@ OSD.constants = {
'DJIWTF',
'AVATAR',
'BF43COMPAT',
'BFHDCOMPAT'
'BFHDCOMPAT',
'DJI_NATIVE'
],
VIDEO_LINES: {
PAL: 16,
Expand All @@ -667,7 +668,8 @@ OSD.constants = {
DJIWTF: 22,
AVATAR: 20,
BF43COMPAT: 16,
BFHDCOMPAT: 20
BFHDCOMPAT: 20,
DJI_NATIVE: 20
},
VIDEO_COLS: {
PAL: 30,
Expand All @@ -676,7 +678,8 @@ OSD.constants = {
DJIWTF: 60,
AVATAR: 53,
BF43COMPAT: 30,
BFHDCOMPAT: 53
BFHDCOMPAT: 53,
DJI_NATIVE: 53,
},
VIDEO_BUFFER_CHARS: {
PAL: 480,
Expand All @@ -685,7 +688,8 @@ OSD.constants = {
DJIWTF: 1320,
AVATAR: 1060,
BF43COMPAT: 480,
BFHDCOMPAT: 1060
BFHDCOMPAT: 1060,
DJI_NATIVE: 1060
},
UNIT_TYPES: [
{name: 'osdUnitImperial', value: 0},
Expand Down Expand Up @@ -2498,9 +2502,9 @@ OSD.updateDisplaySize = function () {
$('.preview').toggleClass('preview_hdzero cut43_left', (video_type == 'HDZERO'))
$('.third_right').toggleClass('preview_hdzero_side', (video_type == 'HDZERO'))
// -- BFHDCOMPAT
$('.third_left').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT'))
$('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT'))
$('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT'))
$('.third_left').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))
$('.preview').toggleClass('preview_bfhdcompat cut43_left', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))
$('.third_right').toggleClass('preview_bfhdcompat_side', (video_type == 'BFHDCOMPAT' || video_type == 'DJI_NATIVE'))

OSD.GUI.updateGuidesView($('#videoGuides').find('input').is(':checked'));
};
Expand Down Expand Up @@ -2792,7 +2796,7 @@ OSD.GUI.checkAndProcessSymbolPosition = function(pos, charCode) {
}
};

const mspVideoSystem = [1,3,4,5,6,7]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT & BFHDCOMPAT
const mspVideoSystem = [1,3,4,5,6,7,8]; // indexes of PAL, HDZERO, DJIWTF, AVATAR, BF43COMPAT, BFHDCOMPAT & DJI_NATIVE
const analogVideoSystem = [0,1,2]; // indexes of AUTO, PAL, & NTSC

OSD.GUI.updateVideoMode = function() {
Expand Down Expand Up @@ -3109,7 +3113,7 @@ OSD.GUI.updateGuidesView = function(on) {
$('.hd_avatar_storage_box_left').toggleClass('hd_avatar_storagebox_l', (isAvatar && on))
$('.hd_avatar_storage_box_right').toggleClass('hd_avatar_storagebox_r', (isAvatar && on))

let isBfHdCompat = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'BFHDCOMPAT';
let isBfHdCompat = OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'BFHDCOMPAT' || OSD.constants.VIDEO_TYPES[OSD.data.preferences.video_system] == 'DJI_NATIVE';
$('.hd_43_margin_left').toggleClass('hd_bfhdcompat_43_left', (isBfHdCompat && on));
$('.hd_43_margin_right').toggleClass('hd_bfhdcompat_43_right', (isBfHdCompat && on));
$('.hd_bfhdcompat_bottom_box').toggleClass('hd_bfhdcompat_bottom', (isBfHdCompat && on));
Expand Down
2 changes: 1 addition & 1 deletion tabs/programming.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ <h2>GVAR 0</h2>
<table class="mixer-table logic__table">
<thead>
<tr>
<th data-i18n="logicActivator"></th>
<th style="width: 50px" data-i18n="logicId"></th>
<th style="width: 80px" data-i18n="logicEnabled"></th>
<th style="width: 120px" data-i18n="logicOperation"></th>
<th data-i18n="logicOperandA"></th>
<th data-i18n="logicOperandB"></th>
<th data-i18n="logicActivator"></th>
<th style="width: 40px" data-i18n="logicFlags"></th>
<th style="width: 50px" data-i18n="logicStatus"></th>
</tr>
Expand Down
Loading