From b542569970c4316f3157c7d8d2ff689c8baa1d65 Mon Sep 17 00:00:00 2001 From: J Blackman Date: Sat, 18 May 2024 00:49:12 +1000 Subject: [PATCH 1/8] 10.10-maintenance update - including background colour activation cherry pick (#3966) Revert version change, and add 10.10.1 - Fix background color activation in modes tab in dark mode (#3961) (cherry picked from commit 66e822d3f3a5e31e306cfafd271e089b340fd27e) --- package.json | 2 +- src/css/tabs/auxiliary.less | 65 +++++++++++++++++++------------------ src/js/data_storage.js | 2 +- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/package.json b/package.json index a74de7aa21..d83c062ad1 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/css/tabs/auxiliary.less b/src/css/tabs/auxiliary.less index c00095e646..50fb52d170 100644 --- a/src/css/tabs/auxiliary.less +++ b/src/css/tabs/auxiliary.less @@ -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; diff --git a/src/js/data_storage.js b/src/js/data_storage.js index 05da42a999..8670d40e89 100644 --- a/src/js/data_storage.js +++ b/src/js/data_storage.js @@ -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, From daf55aad7e8db6405c44b5907ad9adb5cc77fc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=ADguel=20=C3=81ngel=20Mulero=20Mart=C3=ADnez?= Date: Wed, 19 Jun 2024 09:03:49 +0200 Subject: [PATCH 2/8] Add CPU LOAD warning to the OSD tab (#4021) (#4022) --- locales/en/messages.json | 9 +++++++++ src/js/tabs/osd.js | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/locales/en/messages.json b/locales/en/messages.json index dadb73d390..2a69a3c498 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -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" }, diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js index 241841557f..c92478fc7f 100644 --- a/src/js/tabs/osd.js +++ b/src/js/tabs/osd.js @@ -1827,6 +1827,11 @@ OSD.constants = { text: 'osdWarningTextRSNR', desc: 'osdWarningRSNR', }, + LOAD: { + name: 'LOAD', + text: 'osdWarningTextLoad', + desc: 'osdWarningLoad', + }, }, FONT_TYPES: [ @@ -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() { From 2ad84f28110b523a0fc0a98a7675c5fcbb5c49f7 Mon Sep 17 00:00:00 2001 From: J Blackman Date: Sat, 22 Jun 2024 09:20:31 +1000 Subject: [PATCH 3/8] 10.10-maintenance: Move analytics to its own domain and capture host (#4036) --- src/js/Analytics.js | 19 +++++++++++++------ src/js/BuildApi.js | 11 ----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/js/Analytics.js b/src/js/Analytics.js index 9e5115eab3..df8fa5a522 100644 --- a/src/js/Analytics.js +++ b/src/js/Analytics.js @@ -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'; @@ -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', @@ -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() { diff --git a/src/js/BuildApi.js b/src/js/BuildApi.js index 5f6a88f799..af94f8ee67 100644 --- a/src/js/BuildApi.js +++ b/src/js/BuildApi.js @@ -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", - }); - } } From f88d00080a5f7156eb93c865dfe83d7228e7b465 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 15 Jul 2024 14:26:13 +0200 Subject: [PATCH 4/8] [10.10-MAINT] Fix feedforward smooth factor range (#4099) --- src/js/tabs/pid_tuning.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js index 5f9770d794..efe36299fa 100644 --- a/src/js/tabs/pid_tuning.js +++ b/src/js/tabs/pid_tuning.js @@ -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(); From 72e078b61720045bec61b110a4d79b00b6d2c15f Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 15 Jul 2024 22:57:30 +0200 Subject: [PATCH 5/8] [10.10-MAINT] update macos build (#4100) [CI] Update macos build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a107cf0e47..d7329fbdbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: releaseArgs: --linux64 - name: macOS - os: macos-11 + os: macos-12 releaseArgs: --osx64 - name: Windows From 866ce2ccc486acadd1b4d4fdb59aa5eacc114859 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:32:24 -0500 Subject: [PATCH 6/8] [10.10.1] fast-fail false; do not abort other builds (#4153) --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7329fbdbd..a08bbfa64b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,7 @@ jobs: needs: test runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: include: - name: Android From 746a57fc75b14d88714fb87c05ed093f4cc796dc Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 16 Sep 2024 18:33:34 +0200 Subject: [PATCH 7/8] [10.10.1] Fix arming flag (#4152) --- src/js/tabs/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index 328508887e..ed60bf0b6a 100644 --- a/src/js/tabs/setup.js +++ b/src/js/tabs/setup.js @@ -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 From 41a5e30bb841e24e5d62d69e4856bbb0070e252d Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Thu, 13 Mar 2025 15:46:06 -0500 Subject: [PATCH 8/8] [10.10.1] macos-13 github runner --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a08bbfa64b..5ba0ad4521 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: releaseArgs: --linux64 - name: macOS - os: macos-12 + os: macos-13 releaseArgs: --osx64 - name: Windows