Skip to content

Commit 3cf67ff

Browse files
committed
Add Firmware/Download to Setup tab, add ':', formatting (#4444)
1 parent 01f879c commit 3cf67ff

File tree

3 files changed

+37
-14
lines changed

3 files changed

+37
-14
lines changed

locales/en/messages.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1183,20 +1183,29 @@
11831183
"initialSetupInfoBuildConfig": {
11841184
"message": "Config"
11851185
},
1186+
"initialSetupInfoBuildDownload": {
1187+
"message": "Download"
1188+
},
1189+
"initialSetupInfoBuildFirmware": {
1190+
"message": "Firmware:"
1191+
},
11861192
"initialSetupInfoBuildLog": {
11871193
"message": "Log"
11881194
},
11891195
"initialSetupInfoBuildOptions": {
11901196
"message": "Options"
11911197
},
1198+
"initialSetupInfoBuildOptionsLabel": {
1199+
"message": "Options:"
1200+
},
11921201
"initialSetupInfoBuildOptionList": {
11931202
"message": "Options defined in firmware build"
11941203
},
11951204
"initialSetupInfoBuildEmpty": {
11961205
"message": "Local Build - no Cloud information"
11971206
},
11981207
"initialSetupInfoBuildType": {
1199-
"message": "Build type"
1208+
"message": "Build type:"
12001209
},
12011210
"initialSetupInfoBuildLocal": {
12021211
"message": "Local Build"

src/js/tabs/setup.js

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ setup.initialize = function (callback) {
212212
build_date_e = $(".build-date"),
213213
build_type_e = $(".build-type"),
214214
build_info_e = $(".build-info"),
215+
build_firmware_e = $(".build-firmware"),
215216
build_options_e = $(".build-options");
216217

217218
// DISARM FLAGS
@@ -369,29 +370,39 @@ setup.initialize = function (callback) {
369370

370371
if (supported && ispConnected()) {
371372
const buildRoot = `https://build.betaflight.com/api/builds/${FC.CONFIG.buildKey}`;
373+
372374
const buildConfig = `<span class="buildInfoBtn" title="${i18n.getMessage(
373375
"initialSetupInfoBuildConfig",
374376
)}: ${buildRoot}/json">
375-
<a href="${buildRoot}/json" target="_blank"><strong>${i18n.getMessage(
377+
<a href="${buildRoot}/json" target="_blank"><strong>${i18n.getMessage(
376378
"initialSetupInfoBuildConfig",
377379
)}</strong></a></span>`;
380+
378381
const buildLog = `<span class="buildInfoBtn" title="${i18n.getMessage(
379382
"initialSetupInfoBuildLog",
380383
)}: ${buildRoot}/log">
381-
<a href="${buildRoot}/log" target="_blank"><strong>${i18n.getMessage(
384+
<a href="${buildRoot}/log" target="_blank"><strong>${i18n.getMessage(
382385
"initialSetupInfoBuildLog",
383386
)}</strong></a></span>`;
384-
build_info_e.html(`<span class="buildInfoBtn" title="${i18n.getMessage(
385-
"initialSetupInfoBuildOptions",
386-
)}">
387-
<a class="buildOptions" href=#"><strong>${i18n.getMessage(
388-
"initialSetupInfoBuildOptionList",
389-
)}</strong></a></span>`);
387+
390388
build_info_e.html(`${buildConfig} ${buildLog}`);
389+
390+
const buildDownload = `<span class="buildInfoBtn" title="${i18n.getMessage(
391+
"initialSetupInfoBuildDownload",
392+
)}: ${buildRoot}/hex">
393+
<a href="${buildRoot}/hex" target="_blank"><strong>${i18n.getMessage(
394+
"initialSetupInfoBuildDownload",
395+
)}</strong></a></span>`;
396+
397+
build_firmware_e.html(buildDownload);
391398
} else {
392399
build_info_e.html(
393400
supported ? i18n.getMessage("initialSetupNotOnline") : i18n.getMessage("initialSetupNoBuildInfo"),
394401
);
402+
403+
build_firmware_e.html(
404+
supported ? i18n.getMessage("initialSetupNotOnline") : i18n.getMessage("initialSetupNoBuildInfo"),
405+
);
395406
}
396407
};
397408

@@ -418,7 +429,7 @@ setup.initialize = function (callback) {
418429
const buildOptions = `<span class="buildInfoBtn" title="${i18n.getMessage(
419430
"initialSetupInfoBuildOptionList",
420431
)}">
421-
<a class="buildOptions" href=#"><strong>${i18n.getMessage(
432+
<a class="buildOptions" href=#"><strong>${i18n.getMessage(
422433
"initialSetupInfoBuildOptions",
423434
)}</strong></a></span>`;
424435

src/tabs/setup.html

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,24 @@
226226
<td id="api-version" i18n="initialSetupInfoAPIversion"></td>
227227
<td class="api-version"></td>
228228
</tr>
229-
<tr>
229+
<tr>
230230
<td id="build-date" i18n="initialSetupInfoBuildDate"></td>
231231
<td class="build-date"></td>
232232
</tr>
233233
<tr>
234234
<td id="build-type" i18n="initialSetupInfoBuildType"></td>
235235
<td class="build-type"></td>
236236
</tr>
237-
</tr>
238-
<tr>
237+
<tr>
239238
<td id="build-info" i18n="initialSetupInfoBuildInfo"></td>
240239
<td class="build-info"></td>
241240
</tr>
242241
<tr>
243-
<td id="build-options" i18n="initialSetupInfoBuildOptions"></td>
242+
<td id="build-firmware" i18n="initialSetupInfoBuildFirmware"></td>
243+
<td class="build-firmware"></td>
244+
</tr>
245+
<tr>
246+
<td id="build-options" i18n="initialSetupInfoBuildOptionsLabel"></td>
244247
<td class="build-options"></td>
245248
</tr>
246249
</tbody>

0 commit comments

Comments
 (0)