1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-20 23:05:15 +03:00

Refactor. Core build mode. (#3236)

* Refactor. Core build mode.

* Be explicit.

* Removing example

* Removed reference to classic

* Updated description.
This commit is contained in:
J Blackman 2023-01-15 07:24:36 +11:00 committed by GitHub
parent d9e119f275
commit ce2b69843f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 44 additions and 43 deletions

View file

@ -6745,10 +6745,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Definicions personalitzades" "message": "Definicions personalitzades"
}, },
"classicBuild": { "coreBuild": {
"message": "Mode clàssic" "message": "Mode clàssic"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Aquest mode ignora tots els paràmetres aquí. Això bàsicament aconsegueix el mateix que les clàssiques versions intermitjas, i es proporciona per comoditat." "message": "Aquest mode ignora tots els paràmetres aquí. Això bàsicament aconsegueix el mateix que les clàssiques versions intermitjas, i es proporciona per comoditat."
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Brugertilpasset Defines" "message": "Brugertilpasset Defines"
}, },
"classicBuild": { "coreBuild": {
"message": "Klassisk" "message": "Klassisk"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Denne tilstand ignorer alle parametre herunder. Overordnet set er det samme indstilling, som gælder for et natligt byg, og kan anvendes for bekvemmelighed." "message": "Denne tilstand ignorer alle parametre herunder. Overordnet set er det samme indstilling, som gælder for et natligt byg, og kan anvendes for bekvemmelighed."
} }
} }

View file

@ -6622,10 +6622,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Benutzer-Definitionen" "message": "Benutzer-Definitionen"
}, },
"classicBuild": { "coreBuild": {
"message": "Classic-Modus" "message": "Classic-Modus"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Dieser Modus ignoriert alle hier aufgeführten Parameter. Dies erreicht im Grunde das gleiche wie die Nightlies und dient der Bequemlichkeit." "message": "Dieser Modus ignoriert alle hier aufgeführten Parameter. Dies erreicht im Grunde das gleiche wie die Nightlies und dient der Bequemlichkeit."
} }
} }

View file

@ -6848,10 +6848,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Custom Defines" "message": "Custom Defines"
}, },
"classicBuild": { "coreBuild": {
"message": "Classic Mode" "message": "Core Only"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "This mode ignores all the parameters here. This essentially achieves the same as the classic nightlies, and is provided for convenience." "message": "This option builds a firmware that contains the hardware drivers (and some limited features). It is available to assist in the detection of the hardware on a flight controller, and is provided for that convenience only. Not all features will be available (only hardware) using this option."
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Defines personalizados" "message": "Defines personalizados"
}, },
"classicBuild": { "coreBuild": {
"message": "Modo clásico" "message": "Modo clásico"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Este modo ignora todos los parámetros de aquí. Básicamente consigue lo mismo que las compilaciones clásicas, y se proporciona por comodidad." "message": "Este modo ignora todos los parámetros de aquí. Básicamente consigue lo mismo que las compilaciones clásicas, y se proporciona por comodidad."
} }
} }

View file

@ -6734,10 +6734,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Définitions personnalisées" "message": "Définitions personnalisées"
}, },
"classicBuild": { "coreBuild": {
"message": "Mode Classique" "message": "Mode Classique"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Ce mode ignore tous les paramètres d'ici. Ceci mène au même résultat que les nightlies classiques, fournit par commodité." "message": "Ce mode ignore tous les paramètres d'ici. Ceci mène au même résultat que les nightlies classiques, fournit par commodité."
} }
} }

View file

@ -6631,7 +6631,7 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Definicións personalizadas" "message": "Definicións personalizadas"
}, },
"classicBuild": { "coreBuild": {
"message": "Modo clásico" "message": "Modo clásico"
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "Define Personalizzati" "message": "Define Personalizzati"
}, },
"classicBuild": { "coreBuild": {
"message": "Modalità Classica" "message": "Modalità Classica"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Questa modalità ignora tutti i parametri. Si avrà lo stesso risultato delle classiche build nightly, ed è fornita per comodità." "message": "Questa modalità ignora tutti i parametri. Si avrà lo stesso risultato delle classiche build nightly, ed è fornita per comodità."
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "カスタム定義" "message": "カスタム定義"
}, },
"classicBuild": { "coreBuild": {
"message": "クラシックモード" "message": "クラシックモード"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "このモードでは、ここにあるすべてのパラメータが無視されます。これは基本的に古典的なナイトリービルドと同様なことを実現するもので、利便性のために提供されています。" "message": "このモードでは、ここにあるすべてのパラメータが無視されます。これは基本的に古典的なナイトリービルドと同様なことを実現するもので、利便性のために提供されています。"
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "사용자 정의" "message": "사용자 정의"
}, },
"classicBuild": { "coreBuild": {
"message": "클래식 모드" "message": "클래식 모드"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "이 모드는 여기의 모든 매개 변수를 무시합니다. 이것은 기본적으로 고전적인 집합체와 동일한 것을 달성하며, 편의를 위해 제공됩니다." "message": "이 모드는 여기의 모든 매개 변수를 무시합니다. 이것은 기본적으로 고전적인 집합체와 동일한 것을 달성하며, 편의를 위해 제공됩니다."
} }
} }

View file

@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": { "firmwareFlasherBuildCustomDefines": {
"message": "'Defines' personalizadas" "message": "'Defines' personalizadas"
}, },
"classicBuild": { "coreBuild": {
"message": "Modo Clássico" "message": "Modo Clássico"
}, },
"classicBuildModeDescription": { "coreBuildModeDescription": {
"message": "Este modo ignora todos os parâmetros aqui. Isto essencialmente consegue o mesmo que as nightlies clássicas, e é fornecido por conveniência." "message": "Este modo ignora todos os parâmetros aqui. Isto essencialmente consegue o mesmo que as nightlies clássicas, e é fornecido por conveniência."
} }
} }

View file

@ -674,12 +674,12 @@ firmware_flasher.initialize = function (callback) {
$('input.flash_manual_baud').prop('checked', false); $('input.flash_manual_baud').prop('checked', false);
} }
$('input.classicbuild_mode').change(function () { $('input.corebuild_mode').change(function () {
const status = $(this).is(':checked'); const status = $(this).is(':checked');
$('.hide-in-classic-build-mode').toggle(!status); $('.hide-in-core-build-mode').toggle(!status);
}); });
$('input.classicbuild_mode').change(); $('input.corebuild_mode').change();
// bind UI hook so the status is saved on change // bind UI hook so the status is saved on change
$('input.flash_manual_baud').change(function() { $('input.flash_manual_baud').change(function() {
@ -830,14 +830,16 @@ firmware_flasher.initialize = function (callback) {
target: targetDetail.target, target: targetDetail.target,
release: targetDetail.release, release: targetDetail.release,
options: [], options: [],
classicBuild: false,
client: { client: {
version: CONFIGURATOR.version, version: CONFIGURATOR.version,
}, },
}; };
request.classicBuild = !targetDetail.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked'); const coreBuild = (targetDetail.cloudBuild !== true) || $('input[name="coreBuildModeCheckbox"]').is(':checked');
if (!request.classicBuild) { if (coreBuild === true) {
request.options.push("CORE_BUILD");
} else {
request.options.push("CLOUD_BUILD");
$('select[name="radioProtocols"] option:selected').each(function () { $('select[name="radioProtocols"] option:selected').each(function () {
request.options.push($(this).val()); request.options.push($(this).val());
}); });

View file

@ -153,15 +153,15 @@
<div class="darkgrey_box gui_box_titlebar"> <div class="darkgrey_box gui_box_titlebar">
<div class="build_configuration_toggle_wrapper"> <div class="build_configuration_toggle_wrapper">
<label id="build_configuration_toggle_label"> <label id="build_configuration_toggle_label">
<input class="classicbuild_mode toggle" type="checkbox" name="classicBuildModeCheckbox" /> <input class="corebuild_mode toggle" type="checkbox" name="coreBuildModeCheckbox" />
<span id="build_configuration_toggle_label_text" i18n="classicBuild"></span> <span id="build_configuration_toggle_label_text" i18n="coreBuild"></span>
</label> </label>
<div class="helpicon cf_tip_wide" i18n_title="classicBuildModeDescription"></div> <div class="helpicon cf_tip_wide" i18n_title="coreBuildModeDescription"></div>
</div> </div>
<div class="spacer_box_title" style="text-align: center;" i18n="firmwareFlasherBuildConfigurationHead"> <div class="spacer_box_title" style="text-align: center;" i18n="firmwareFlasherBuildConfigurationHead">
</div> </div>
</div> </div>
<div class="spacer hide-in-classic-build-mode" style="margin-bottom: 10px;"> <div class="spacer hide-in-core-build-mode" style="margin-bottom: 10px;">
<div class="margin-bottom"> <div class="margin-bottom">
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildRadioProtocols"></strong> <strong i18n="firmwareFlasherBuildRadioProtocols"></strong>
@ -181,7 +181,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="spacer hide-in-classic-build-mode" style="margin-bottom: 10px;"> <div class="spacer hide-in-core-build-mode" style="margin-bottom: 10px;">
<div class="margin-bottom"> <div class="margin-bottom">
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildOptions"></strong> <strong i18n="firmwareFlasherBuildOptions"></strong>
@ -201,7 +201,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="expertOptions spacer hide-in-classic-build-mode" style="margin-bottom: 10px;"> <div class="expertOptions spacer hide-in-core-build-mode" style="margin-bottom: 10px;">
<div class="margin-bottom"> <div class="margin-bottom">
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildCustomDefines"></strong> <strong i18n="firmwareFlasherBuildCustomDefines"></strong>
@ -271,7 +271,6 @@
<p i18n="firmwareFlasherRecoveryText"></p> <p i18n="firmwareFlasherRecoveryText"></p>
</div> </div>
</div> </div>
</div> </div>
<div class="content_toolbar"> <div class="content_toolbar">
<div class="info"><a name="progressbar"></a> <div class="info"><a name="progressbar"></a>