Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
needs: test
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- name: Android
Expand All @@ -52,7 +53,7 @@ jobs:
releaseArgs: --linux64

- name: macOS
os: macos-11
os: macos-13
releaseArgs: --osx64

- name: Windows
Expand Down
9 changes: 9 additions & 0 deletions locales/en/messages.json
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "betaflight-configurator",
"productName": "Betaflight Configurator",
"description": "Crossplatform configuration tool for Betaflight flight control system.",
"version": "11.0.0",
"version": "10.10.1",
"main": "main.html",
"chromium-args": "--disable-features=nw2",
"scripts": {
Expand Down
65 changes: 33 additions & 32 deletions src/css/tabs/auxiliary.less
Original file line number Diff line number Diff line change
Expand Up @@ -63,46 +63,47 @@
border-radius: 3px;
}
}
.mode.on {
.info {
background: var(--accent);
color: black;
}
&:nth-child(odd) {
.modes {
width: 100%;
}
.mode {
background-color: #f9f9f9;
vertical-align: top;
display: flex;

&.on {
.info {
background: var(--accent);
background: var(--accent) !important;
color: black;
}
&:nth-child(odd) {
.info {
background: var(--accent) !important;
}
}
}
}
.mode.off {
.info {
background: #828885;
color: white;
}
&:nth-child(odd) {
&.off {
.info {
background: #828885;
background: #828885 !important;
color: white;
}
&:nth-child(odd) {
.info {
background: #828885 !important;
}
}
}
}
.mode.disabled {
.info {
background: var(--error);
color: var(--quietText);
}
&:nth-child(odd) {
&.disabled {
.info {
background: var(--error);
background: var(--error) !important;
color: var(--quietText);
}
}
}
.modes {
width: 100%;
}
.mode {
background-color: #f9f9f9;
vertical-align: top;
display: flex;
&:nth-child(odd) {
.info {
background: var(--error) !important;
}
}
}
.name {
min-height: 80px;
padding: 5px 0;
Expand Down
19 changes: 13 additions & 6 deletions src/js/Analytics.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ShortUniqueId from 'short-unique-id';
import BuildApi from './BuildApi';
import { set as setConfig, get as getConfig } from './ConfigStorage';
import GUI from './gui';
import CONFIGURATOR from './data_storage';
Expand Down Expand Up @@ -74,7 +73,7 @@ class Analytics {
this.setOptOut(settings.optOut);

this._settings = settings;
this._api = new BuildApi();
this._url = 'https://analytics.betaflight.com';

this.EVENT_CATEGORIES = {
APPLICATION: 'Application',
Expand All @@ -90,11 +89,19 @@ class Analytics {
return;
}

this._api.sendAnalytics(name, {
sessionId: this._settings.sessionId,
userId: this._settings.userId,
[name]: properties,
const url = `${this._url}/analytics/${name}`;
$.ajax({
url: url,
type: "POST",
data: JSON.stringify({
sessionId: this._settings.sessionId,
userId: this._settings.userId,
[name]: properties,
}),
contentType: "application/json",
dataType: "json",
});

}

sendSettings() {
Expand Down
11 changes: 0 additions & 11 deletions src/js/BuildApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,4 @@ export default class BuildApi {
}
});
}

sendAnalytics(type, parcel) {
const url = `${this._url}/analytics/${type}`;
$.ajax({
url: url,
type: "POST",
data: JSON.stringify(parcel),
contentType: "application/json",
dataType: "json",
});
}
}
2 changes: 1 addition & 1 deletion src/js/data_storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/
API_VERSION_ACCEPTED: API_VERSION_1_41,
API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE: API_VERSION_1_41,
API_VERSION_MAX_SUPPORTED: API_VERSION_1_47,
API_VERSION_MAX_SUPPORTED: API_VERSION_1_46,

connectionValid: false,
connectionValidCliOnly: false,
Expand Down
10 changes: 10 additions & 0 deletions src/js/tabs/osd.js
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
1 change: 1 addition & 0 deletions src/js/tabs/pid_tuning.js
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ pid_tuning.initialize = function (callback) {
$('.dtermLowpassDynLegacy').hide();

$('.pid_filter input[name="dtermLowpassExpo"]').val(FC.FILTER_CONFIG.dyn_lpf_curve_expo);
$('input[name="feedforwardSmoothFactor"]').attr("max", "95");
} else {
// hide firmware filter switches
$('.gyroLowpass').hide();
Expand Down
2 changes: 1 addition & 1 deletion src/js/tabs/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ setup.initialize = function (callback) {
}

if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
disarmFlagElements.splice(disarmFlagElements.indexOf('RPMFILTER'), 0, 'DSHOT_TELEM');
disarmFlagElements.splice(disarmFlagElements.indexOf('RPMFILTER'), 1, 'DSHOT_TELEM');
}

// Always the latest element
Expand Down
Loading