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

Improving hardwareId behavior

Browse source 
Fix indendation

Add css changes

Change hiden to reset data aproach

Add semicolons
This commit is contained in:
Asizon 2020-12-13 10:38:57 +01:00
parent 8b006c48db
commit 1647ca6ec5
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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,16 +75,14 @@
<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 class="hardwareId" v-if="hardwareId">
<span v-if="hardwareId">
{{ $t("versionLabelTarget") }}: {{ hardwareId }} {{ $t("versionLabelTarget") }}: {{ hardwareId }}
</span> </span>
</span>
</div> </div>
</div> </div>
</template> </template>

3
src/js/port_handler.js
View file

@ -90,9 +90,6 @@ 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) {
FC.resetState();
}
self.portPickerElement.trigger('change'); self.portPickerElement.trigger('change');
} }
}); });

3
src/js/protocols/stm32usbdfu.js
View file

@ -775,6 +775,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
for (var j = 0; j < self.flash_layout.sectors[i].num_pages; j++) { for (var j = 0; j < self.flash_layout.sectors[i].num_pages; j++) {
if (self.options.erase_chip) { if (self.options.erase_chip) {
// full chip erase // full chip erase
FC.resetState();
erase_pages.push({'sector': i, 'page': j}); erase_pages.push({'sector': i, 'page': j});
} else { } else {
// local erase // local erase
@ -1074,6 +1075,8 @@ STM32DFU_protocol.prototype.leave = function () {
STM32DFU_protocol.prototype.cleanup = function () { STM32DFU_protocol.prototype.cleanup = function () {
const self = this; const self = this;
FC.resetState();
self.releaseInterface(0); self.releaseInterface(0);
GUI.connect_lock = false; GUI.connect_lock = false;