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

[10.10-MAINT] Add CPU LOAD warning to the OSD tab (#4021) #4022

Merged
merged 1 commit into from
Jun 19, 2024
Merged

[10.10-MAINT] Add CPU LOAD warning to the OSD tab (#4021) #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6422,6 +6422,15 @@
"osdWarningRSNR": {
"message": "Warns when RSNR value is below alarm setting"
},
"osdWarningTextLoad": {
"message": "LOAD",
"description": "One of the warnings that can be selected to be shown in the OSD"
},
"osdWarningLoad": {
"message": "Warns if the CPU LOAD of the flight controller is too high",
"description": "Description of one of the warnings that can be selected to be shown in the OSD"
},

"osdWarningTextUnknown": {
"message": "Unknown $1"
},
Expand Down
10 changes: 10 additions & 0 deletions src/js/tabs/osd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,6 +1827,11 @@ OSD.constants = {
text: 'osdWarningTextRSNR',
desc: 'osdWarningRSNR',
},
LOAD: {
name: 'LOAD',
text: 'osdWarningTextLoad',
desc: 'osdWarningLoad',
},

},
FONT_TYPES: [
Expand Down Expand Up @@ -2096,6 +2101,11 @@ OSD.chooseFields = function() {
F.RSNR,
]);
}
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
OSD.constants.WARNINGS = OSD.constants.WARNINGS.concat([
F.LOAD,
]);
}
};

OSD.updateDisplaySize = function() {
Expand Down