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

removing obsolete notify, first hooks to GUI.log

Browse source
This commit is contained in:
cTn 2014-02-03 08:45:21 +01:00
parent 7fb560acb1
commit a30569077a
5 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
css/style.css
View file

@ -278,8 +278,3 @@ input[type="number"]::-webkit-inner-spin-button {
border-top: 1px solid #7d7d79; border-top: 1px solid #7d7d79;
background-color: #bfbeb5; background-color: #bfbeb5;
} }
#status-bar .notify {
float: right;
}
#status-bar .notify span {
}

6
js/serial_backend.js
View file

@ -134,7 +134,7 @@ function onOpen(openInfo) {
// disconnect after 10 seconds with error if we don't get IDENT data // disconnect after 10 seconds with error if we don't get IDENT data
GUI.timeout_add('connecting', function() { GUI.timeout_add('connecting', function() {
if (!configuration_received) { if (!configuration_received) {
notify('Did not received configuration within <span style="color: red">10 seconds</span>, communication <span style="color: red">failed</span> - Disconnecting'); GUI.log('Did not received configuration within <span style="color: red">10 seconds</span>, communication <span style="color: red">failed</span> - Disconnecting');
$('div#port-picker a.connect').click(); // disconnect $('div#port-picker a.connect').click(); // disconnect
} }
@ -155,7 +155,7 @@ function onOpen(openInfo) {
}); });
} else { } else {
console.log('Failed to open serial port'); console.log('Failed to open serial port');
notify('Failed to open serial port', 'red'); GUI.log('Failed to open serial port', 'red');
$('div#port-picker a.connect').text('Connect'); $('div#port-picker a.connect').text('Connect');
$('div#port-picker a.connect').removeClass('active'); $('div#port-picker a.connect').removeClass('active');
@ -174,7 +174,7 @@ function onClosed(result) {
$('#tabs > ul li').removeClass('active'); // de-select any selected tabs $('#tabs > ul li').removeClass('active'); // de-select any selected tabs
tab_initialize_default(); tab_initialize_default();
} else { // Something went wrong } else { // Something went wrong
notify('Failed to close serial port', 'red'); GUI.log('Failed to close serial port', 'red');
} }
} }

1
main.html
View file

@ -117,7 +117,6 @@
Packet error: <span class="packet-error">0</span> | Packet error: <span class="packet-error">0</span> |
Firmware Version: <span class="software-version">0.0</span> | Firmware Version: <span class="software-version">0.0</span> |
Cycle Time: <span class="cycle-time">0</span> Cycle Time: <span class="cycle-time">0</span>
<span class="notify"></span>
</div> </div>
</div> </div>
</div> </div>

10
main.js
View file

@ -35,7 +35,7 @@ $(document).ready(function() {
$('a', tabs).click(function() { $('a', tabs).click(function() {
if ($(this).parent().hasClass('active') == false) { // only initialize when the tab isn't already active if ($(this).parent().hasClass('active') == false) { // only initialize when the tab isn't already active
if (configuration_received == false) { // if there is no active connection, return if (configuration_received == false) { // if there is no active connection, return
notify('You need to connect before you can view any of the tabs', 'red'); GUI.log('You need to connect before you can view any of the tabs', 'red');
return; return;
} }
@ -151,14 +151,6 @@ $(document).ready(function() {
}); });
}); });
function notify(message, color) {
$('span.notify').html('<span style="color: ' + color + '">' + message + '</span>');+
$('span.notify span').fadeOut(5000, function() {
$(this).remove();
});
}
function microtime() { function microtime() {
var now = new Date().getTime() / 1000; var now = new Date().getTime() / 1000;

2
tabs/firmware_flasher.js
View file

@ -102,7 +102,7 @@ function tab_initialize_firmware_flasher() {
if (!GUI.connect_lock) { // button disabled while flashing is in progress if (!GUI.connect_lock) { // button disabled while flashing is in progress
tab_initialize_default(); tab_initialize_default();
} else { } else {
notify('You <span style="color: red">can\'t</span> do this right now, please wait for current operation to finish ...'); GUI.log('You <span style="color: red">can\'t</span> do this right now, please wait for current operation to finish ...');
} }
}); });
}); });