Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00
Code Issues Wiki Activity

Merge pull request #2335 from Asizon/improve_hardwareId_check

Browse source 
Improving hardwareId behavior
This commit is contained in:
Michael Keller 2020-12-13 12:51:15 +01:00 • committed by GitHub
commit 21f51371aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/betaflight-logo/BetaflightLogo.vue
View file

@ -18,6 +18,8 @@
opacity: 0.5; opacity: 0.5;
font-size: 10px; font-size: 10px;
min-width: 210px; min-width: 210px;
display: flex;
flex-direction: column;
} }
.tab_container .logo { .tab_container .logo {
@ -73,15 +75,13 @@
<div class="logo_text"> <div class="logo_text">
<span> <span>
{{ $t("versionLabelConfigurator") }}: {{ configuratorVersion }} {{ $t("versionLabelConfigurator") }}: {{ configuratorVersion }}
<br /> </span>
<span v-if="firmwareVersion && firmwareId"> <span v-if="firmwareVersion && firmwareId">
{{ $t("versionLabelFirmware") }}: {{ firmwareVersion }} {{ $t("versionLabelFirmware") }}: {{ firmwareVersion }}
{{ firmwareId }} {{ firmwareId }}
</span> </span>
<br /> <span v-if="hardwareId">
<span v-if="hardwareId"> {{ $t("versionLabelTarget") }}: {{ hardwareId }}
{{ $t("versionLabelTarget") }}: {{ hardwareId }}
</span>
</span> </span>
</div> </div>
</div> </div>

2
src/js/port_handler.js
View file

@ -90,7 +90,7 @@ PortHandler.check_usb_devices = function (callback) {
callback(self.dfu_available); callback(self.dfu_available);
} }
if (!$('option:selected', self.portPickerElement).data().isDFU) { if (!$('option:selected', self.portPickerElement).data().isDFU) {
if (!GUI.connected_to) { if (!(GUI.connected_to || GUI.connect_lock)) {
FC.resetState(); FC.resetState();
} }
self.portPickerElement.trigger('change'); self.portPickerElement.trigger('change');