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

cosmetic change

Browse source
This commit is contained in:
cTn 2014-06-20 14:29:16 +02:00
parent 8273081fdd
commit 61bed4770f
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/port_handler.js
View file

@ -65,7 +65,7 @@ port_handler.prototype.check = function() {
if (port == result.last_used_port) { if (port == result.last_used_port) {
console.log('Selecting last used port: ' + result.last_used_port); console.log('Selecting last used port: ' + result.last_used_port);
$('div#port-picker .port select').val(result.last_used_port); $('div#port-picker #port').val(result.last_used_port);
} }
}); });
} else { } else {
@ -98,9 +98,9 @@ port_handler.prototype.check = function() {
// select / highlight new port, if connected -> select connected port // select / highlight new port, if connected -> select connected port
if (!GUI.connected_to) { if (!GUI.connected_to) {
$('div#port-picker .port select').val(new_ports[0]); $('div#port-picker #port').val(new_ports[0]);
} else { } else {
$('div#port-picker .port select').val(GUI.connected_to); $('div#port-picker #port').val(GUI.connected_to);
} }
// start connect procedure (if statement is valid) // start connect procedure (if statement is valid)
@ -143,13 +143,13 @@ port_handler.prototype.check = function() {
function check_usb_devices() { function check_usb_devices() {
chrome.usb.getDevices(usbDevices.STM32DFU, function(result) { chrome.usb.getDevices(usbDevices.STM32DFU, function(result) {
if (result.length) { if (result.length) {
if (!$("div#port-picker .port select [value='DFU']").length) { if (!$("div#port-picker #port [value='DFU']").length) {
$('div#port-picker .port select').append('<option value="DFU">DFU</option>'); $('div#port-picker #port').append('<option value="DFU">DFU</option>');
$('div#port-picker .port select').val('DFU'); $('div#port-picker #port').val('DFU');
} }
} else { } else {
if ($("div#port-picker .port select [value='DFU']").length) { if ($("div#port-picker #port [value='DFU']").length) {
$("div#port-picker .port select [value='DFU']").remove(); $("div#port-picker #port [value='DFU']").remove();
} }
} }
}); });
@ -157,14 +157,14 @@ port_handler.prototype.check = function() {
}; };
port_handler.prototype.update_port_select = function(ports) { port_handler.prototype.update_port_select = function(ports) {
$('div#port-picker .port select').html(''); // drop previous one $('div#port-picker #port').html(''); // drop previous one
if (ports.length > 0) { if (ports.length > 0) {
for (var i = 0; i < ports.length; i++) { for (var i = 0; i < ports.length; i++) {
$('div#port-picker .port select').append($("<option/>", {value: ports[i], text: ports[i]})); $('div#port-picker #port').append($("<option/>", {value: ports[i], text: ports[i]}));
} }
} else { } else {
$('div#port-picker .port select').append($("<option/>", {value: 0, text: 'No Ports'})); $('div#port-picker #port').append($("<option/>", {value: 0, text: 'No Ports'}));
} }
}; };

2
js/serial_backend.js
View file

@ -5,7 +5,7 @@ $(document).ready(function() {
if (GUI.connect_lock != true) { // GUI control overrides the user control if (GUI.connect_lock != true) { // GUI control overrides the user control
var clicks = $(this).data('clicks'); var clicks = $(this).data('clicks');
var selected_port = String($('div#port-picker .port select').val()); var selected_port = String($('div#port-picker #port').val());
var selected_baud = parseInt($('div#port-picker #baud').val()); var selected_baud = parseInt($('div#port-picker #baud').val());
if (selected_port != '0' && selected_port != 'DFU') { if (selected_port != '0' && selected_port != 'DFU') {

2
js/stm32.js
View file

@ -52,7 +52,7 @@ STM32_protocol.prototype.connect = function(hex) {
var self = this; var self = this;
self.hex = hex; self.hex = hex;
var selected_port = String($('div#port-picker .port select').val()); var selected_port = String($('div#port-picker #port').val());
var baud = parseInt($('div#port-picker #baud').val()); var baud = parseInt($('div#port-picker #baud').val());
if (selected_port != '0') { if (selected_port != '0') {

2
tabs/firmware_flasher.js
View file

@ -103,7 +103,7 @@ function tab_initialize_firmware_flasher() {
if (!$(this).hasClass('locked')) { if (!$(this).hasClass('locked')) {
if (!GUI.connect_lock) { // button disabled while flashing is in progress if (!GUI.connect_lock) { // button disabled while flashing is in progress
if (parsed_hex != false) { if (parsed_hex != false) {
if (String($('div#port-picker .port select').val()) != 'DFU') { if (String($('div#port-picker #port').val()) != 'DFU') {
STM32.connect(parsed_hex); STM32.connect(parsed_hex);
} else { } else {
STM32DFU.connect(parsed_hex); STM32DFU.connect(parsed_hex);