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

Merge pull request #1203 from timman2er/change_connect_to_configure

Browse source 
change firmware flasher" to "firmware updater" and move button
This commit is contained in:
Michael Keller 2018-10-08 01:02:20 +13:00 • committed by GitHub
commit 8036ff3b02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 121 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locales/en/messages.json
View file

@ -3837,5 +3837,8 @@
},
"modeCameraChangeMode": {
"message": "CAMERA CHANGE MODE"
},
"flashTab": {
"message": "Update Firmware"
}
}

72
src/css/main.css
View file

@ -119,7 +119,7 @@ input[type="number"]::-webkit-inner-spin-button {
}
.headerbar {
height:110px;
height:115px;
width:100%;
background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.15));
}
@ -1458,6 +1458,18 @@ dialog {
margin-left: 20px;
}
/* firmware update button */
.open_firmware_flasher {
position: relative;
float: right;
left: 0px;
top: 19px;
height: 70px;
width: 60px;
margin-right: 20px;
margin-left: 20px;
}
.connect_b {
float: left;
}
@ -1504,6 +1516,52 @@ dialog {
background-color: #f21212;
}
.firmware_b {
float: left;
}
.firmware_b a {
height: 50px;
width: 50px;
border-radius: 100px;
box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.35);
float: left;
margin-left: 5px;
margin-bottom: 7px;
transition: none;
}
.firmware_b a.flash.disabled {
background-color: #808080;
pointer-events: none;
cursor: default;
}
.firmware_b a.flash {
background-color: #ffbb00;
border: 1px solid #dba718;
background-image: url(../images/icons/cf_icon_flasher_white.svg);
background-repeat: no-repeat;
background-size: 30px;
background-position: center 10px;
transition: none;
}
.firmware_b a.flash:hover {
background-color: #ffcc3f;
}
.firmware_b a.flash.active {
background-color: #e60000;
border: 1px solid #fe0000;
background-image: url(../images/icons/cf_icon_flasher_white.svg);
transition: none;
}
.firmware_b a.flash.active:hover {
background-color: #f21212;
}
.connect_state {
float: left;
height: 20px;
@ -1516,6 +1574,18 @@ dialog {
margin-top: -1px;
}
.flash_state {
float: left;
height: 20px;
width: 100%;
text-align: center;
color: #fff;
font-size: 12px;
font-family: 'open_sansregular', Arial;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
margin-top: -1px;
}
/* fixing padding for all Tabs*/
.tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-failsafe, .tab-firmware_flasher,
.tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver,

15
src/js/main.js
View file

@ -78,6 +78,7 @@ function setupAnalytics(result) {
}
$('.connect_b a.connect').removeClass('disabled');
$('.firmware_b a.flash').removeClass('disabled');
}
//Process to execute to real start the app
@ -149,7 +150,14 @@ function startProcess() {
return;
}
if (GUI.allowedTabs.indexOf(tab) < 0) {
if (GUI.allowedTabs.indexOf(tab) < 0 && tabName == "Firmware Flasher") {
if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click();
} else {
self.disconnect();
}
$('div.open_firmware_flasher a.flash').click();
} else if (GUI.allowedTabs.indexOf(tab) < 0) {
GUI.log(i18n.getMessage('tabSwitchUpgradeRequired', [tabName]));
return;
}
@ -164,6 +172,11 @@ function startProcess() {
GUI.tab_switch_in_progress = true;
GUI.tab_switch_cleanup(function () {
// disable active firmware flasher if it was active
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').addClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
}
// disable previously active tab highlight
$('li', ui_tabs).removeClass('active');

25
src/js/serial_backend.js
View file

@ -67,6 +67,10 @@ function initializeSerialBackend() {
toggleStatus();
} else {
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
}
GUI.timeout_kill_all();
GUI.interval_kill_all();
GUI.tab_switch_cleanup();
@ -82,6 +86,23 @@ function initializeSerialBackend() {
}
});
$('div.open_firmware_flasher a.flash').click(function () {
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
document.getElementById("tab_landing").style.display = "block";
document.getElementById("tab_help").style.display = "block";
$('#tabs ul.mode-disconnected .tab_landing a').click();
} else {
$('#tabs ul.mode-disconnected .tab_firmware_flasher a').click();
$('div.open_firmware_flasher a.flash_state').text(i18n.getMessage('flashTab'));
$('div#flashbutton a.flash_state').addClass('active');
$('div#flashbutton a.flash').addClass('active');
document.getElementById("tab_landing").style.display = "none";
document.getElementById("tab_help").style.display = "none";
}
});
// auto-connect
chrome.storage.local.get('auto_connect', function (result) {
if (result.auto_connect === 'undefined' || result.auto_connect) {
@ -337,6 +358,10 @@ function connectCli() {
}
function onConnect() {
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
}
GUI.timeout_remove('connecting'); // kill connecting timer
$('div#connectbutton a.connect_state').text(i18n.getMessage('disconnect')).addClass('active');
$('div#connectbutton a.connect').addClass('active');

10
src/main.html
View file

@ -129,6 +129,12 @@
</div>
<a class="connect_state" i18n="connect"></a>
</div>
<div class="open_firmware_flasher" id="flashbutton">
<div class="firmware_b">
<a class="flash disabled" href="#"></a>
</div>
<a class="flash_state" i18n="flashTab"></a>
</div>
<div id="portsinput">
<div class="dropdown dropdown-dark">
<select class="dropdown-select" id="port" i18n_title="firmwareFlasherManualPort">
@ -226,9 +232,9 @@
<div class="tab_container">
<div id="tabs">
<ul class="mode-disconnected">
<li class="tab_landing"><a href="#" i18n="tabLanding" class="tabicon ic_welcome" i18n_title="tabLanding"></a>
<li class="tab_landing" id="tab_landing"><a href="#" i18n="tabLanding" class="tabicon ic_welcome" i18n_title="tabLanding"></a>
</li>
<li class="tab_help"><a href="#" i18n="tabHelp" class="tabicon ic_help"
<li class="tab_help" id="tab_help"><a href="#" i18n="tabHelp" class="tabicon ic_help"
i18n_title="tabHelp"></a></li>
<li class="tab_firmware_flasher"><a href="#" i18n="tabFirmwareFlasher" class="tabicon ic_flasher"
i18n_title="tabFirmwareFlasher"></a></li>