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

Refactor. Core build mode. #3236

Merged
merged 5 commits into from
Jan 14, 2023
Merged

Refactor. Core build mode. #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cecc9f3
Refactor. Core build mode.
blckmn Jan 12, 2023
fccffdf
Be explicit.
blckmn Jan 12, 2023
6dd709f
Removing example
blckmn Jan 13, 2023
d0e73b7
Removed reference to classic
blckmn Jan 13, 2023
ba4ce07
Updated description.
blckmn Jan 13, 2023
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
4 changes: 2 additions & 2 deletions locales/ca/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6745,10 +6745,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Definicions personalitzades"
},
"classicBuild": {
"coreBuild": {
"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."
}
}
4 changes: 2 additions & 2 deletions locales/da/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Brugertilpasset Defines"
},
"classicBuild": {
"coreBuild": {
"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."
}
}
4 changes: 2 additions & 2 deletions locales/de/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6622,10 +6622,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Benutzer-Definitionen"
},
"classicBuild": {
"coreBuild": {
"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."
}
}
8 changes: 4 additions & 4 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6848,10 +6848,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Custom Defines"
},
"classicBuild": {
"message": "Classic Mode"
"coreBuild": {
"message": "Core Only"
},
"classicBuildModeDescription": {
"message": "This mode ignores all the parameters here. This essentially achieves the same as the classic nightlies, and is provided for convenience."
"coreBuildModeDescription": {
"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."
}
}
4 changes: 2 additions & 2 deletions locales/es/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Defines personalizados"
},
"classicBuild": {
"coreBuild": {
"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."
}
}
4 changes: 2 additions & 2 deletions locales/fr/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6734,10 +6734,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Définitions personnalisées"
},
"classicBuild": {
"coreBuild": {
"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é."
}
}
2 changes: 1 addition & 1 deletion locales/gl/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6631,7 +6631,7 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Definicións personalizadas"
},
"classicBuild": {
"coreBuild": {
"message": "Modo clásico"
}
}
4 changes: 2 additions & 2 deletions locales/it/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "Define Personalizzati"
},
"classicBuild": {
"coreBuild": {
"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à."
}
}
4 changes: 2 additions & 2 deletions locales/ja/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "カスタム定義"
},
"classicBuild": {
"coreBuild": {
"message": "クラシックモード"
},
"classicBuildModeDescription": {
"coreBuildModeDescription": {
"message": "このモードでは、ここにあるすべてのパラメータが無視されます。これは基本的に古典的なナイトリービルドと同様なことを実現するもので、利便性のために提供されています。"
}
}
4 changes: 2 additions & 2 deletions locales/ko/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "사용자 정의"
},
"classicBuild": {
"coreBuild": {
"message": "클래식 모드"
},
"classicBuildModeDescription": {
"coreBuildModeDescription": {
"message": "이 모드는 여기의 모든 매개 변수를 무시합니다. 이것은 기본적으로 고전적인 집합체와 동일한 것을 달성하며, 편의를 위해 제공됩니다."
}
}
4 changes: 2 additions & 2 deletions locales/pt/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6737,10 +6737,10 @@
"firmwareFlasherBuildCustomDefines": {
"message": "'Defines' personalizadas"
},
"classicBuild": {
"coreBuild": {
"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."
}
}
14 changes: 8 additions & 6 deletions src/js/tabs/firmware_flasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,12 +674,12 @@ firmware_flasher.initialize = function (callback) {
$('input.flash_manual_baud').prop('checked', false);
}

$('input.classicbuild_mode').change(function () {
$('input.corebuild_mode').change(function () {
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
$('input.flash_manual_baud').change(function() {
Expand Down Expand Up @@ -830,14 +830,16 @@ firmware_flasher.initialize = function (callback) {
target: targetDetail.target,
release: targetDetail.release,
options: [],
classicBuild: false,
client: {
version: CONFIGURATOR.version,
},
};

request.classicBuild = !targetDetail.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked');
if (!request.classicBuild) {
const coreBuild = (targetDetail.cloudBuild !== true) || $('input[name="coreBuildModeCheckbox"]').is(':checked');
if (coreBuild === true) {
request.options.push("CORE_BUILD");
} else {
request.options.push("CLOUD_BUILD");
$('select[name="radioProtocols"] option:selected').each(function () {
request.options.push($(this).val());
});
Expand Down
27 changes: 13 additions & 14 deletions src/tabs/firmware_flasher.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<table class="cf_table" style="margin-top: 10px;">
<tr class="option">
<td>
<label>
<input class="show_development_releases toggle" type="checkbox" />
<label>
<input class="show_development_releases toggle" type="checkbox" />
<span i18n="firmwareFlasherShowDevelopmentReleases"></span>
</label>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherShowDevelopmentReleasesDescription"></div>
Expand Down Expand Up @@ -66,8 +66,8 @@
</tr>
<tr>
<td>
<label>
<input class="updating toggle" type="checkbox" />
<label>
<input class="updating toggle" type="checkbox" />
<span i18n="firmwareFlasherNoReboot"></span>
</label>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherNoRebootDescription"></div>
Expand All @@ -78,7 +78,7 @@
<tr class="option flash_on_connect_wrapper">
<td>
<label>
<input class="flash_on_connect toggle" type="checkbox" />
<input class="flash_on_connect toggle" type="checkbox" />
<span i18n="firmwareFlasherFlashOnConnect"></span>
</label>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherFlashOnConnectDescription"></div>
Expand All @@ -101,7 +101,7 @@
<td>
<label>
<input class="flash_manual_baud toggle" type="checkbox" />
<span i18n="firmwareFlasherManualBaud"></span>
<span i18n="firmwareFlasherManualBaud"></span>
<select id="flash_manual_baud_rate" i18n_title="firmwareFlasherBaudRate">
<option value="921600">921600</option>
<option value="460800">460800</option>
Expand Down Expand Up @@ -153,15 +153,15 @@
<div class="darkgrey_box gui_box_titlebar">
<div class="build_configuration_toggle_wrapper">
<label id="build_configuration_toggle_label">
<input class="classicbuild_mode toggle" type="checkbox" name="classicBuildModeCheckbox" />
<span id="build_configuration_toggle_label_text" i18n="classicBuild"></span>
<input class="corebuild_mode toggle" type="checkbox" name="coreBuildModeCheckbox" />
<span id="build_configuration_toggle_label_text" i18n="coreBuild"></span>
</label>
<div class="helpicon cf_tip_wide" i18n_title="classicBuildModeDescription"></div>
<div class="helpicon cf_tip_wide" i18n_title="coreBuildModeDescription"></div>
</div>
<div class="spacer_box_title" style="text-align: center;" i18n="firmwareFlasherBuildConfigurationHead">
</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 style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildRadioProtocols"></strong>
Expand All @@ -181,7 +181,7 @@
</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 style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildOptions"></strong>
Expand All @@ -201,7 +201,7 @@
</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 style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildCustomDefines"></strong>
Expand Down Expand Up @@ -247,7 +247,7 @@
<span class="date"></span>
<br />
<strong i18n="firmwareFlasherConfigurationFile"></strong>
<span class="configFilename"></span>
<span class="configFilename"></span>
</div>
<div id="cloudTargetInfo">
<strong i18n="firmwareFlasherCloudBuildDetails"></strong>
Expand All @@ -271,7 +271,6 @@
<p i18n="firmwareFlasherRecoveryText"></p>
</div>
</div>

</div>
<div class="content_toolbar">
<div class="info"><a name="progressbar"></a>
Expand Down