Skip to content

Commit 8a26a1f

Browse files
haslinghuishaslinghuis
committed
Fix PortHandler
1 parent ee3ddc1 commit 8a26a1f

File tree

3 files changed

+64
-63
lines changed

3 files changed

+64
-63
lines changed

‎src/js/port_handler.js‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ PortHandler.initialize = function () {
2121
const portPickerElementSelector = "div#port-picker #port";
2222
this.portPickerElement = $(portPickerElementSelector);
2323
this.selectList = document.querySelector(portPickerElementSelector);
24-
this.initialWidth = this.selectList.offsetWidth + 12;
24+
this.initialWidth = this.selectList.offsetWidth;
25+
26+
this.showVirtualMode = ConfigStorage.get('showVirtualMode').showVirtualMode;
27+
this.showAllSerialDevices = ConfigStorage.get('showAllSerialDevices').showAllSerialDevices;
2528

2629
// fill dropdown with version numbers
2730
generateVirtualApiVersions();
@@ -34,15 +37,13 @@ PortHandler.check = function () {
3437
const self = this;
3538
let result;
3639

37-
result = ConfigStorage.get('showVirtualMode');
38-
self.showVirtualMode = result.showVirtualMode;
39-
result = ConfigStorage.get('showAllSerialDevices');
40-
self.showAllSerialDevices = result.showAllSerialDevices;
41-
42-
self.check_usb_devices();
43-
self.check_serial_devices();
40+
if (!self.port_available) {
41+
self.check_usb_devices();
42+
}
4443

45-
GUI.updateManualPortVisibility();
44+
if (!self.dfu_available) {
45+
self.check_serial_devices();
46+
}
4647

4748
setTimeout(function () {
4849
self.check();
@@ -87,14 +88,6 @@ PortHandler.check_usb_devices = function (callback) {
8788
data: {isDFU: true},
8889
}));
8990

90-
if (self.showVirtualMode) {
91-
self.portPickerElement.append($('<option/>', {
92-
value: 'virtual',
93-
text: i18n.getMessage('portsSelectVirtual'),
94-
data: {isVirtual: true},
95-
}));
96-
}
97-
9891
self.portPickerElement.append($('<option/>', {
9992
value: 'manual',
10093
text: i18n.getMessage('portsSelectManual'),
@@ -112,14 +105,16 @@ PortHandler.check_usb_devices = function (callback) {
112105
}
113106
self.dfu_available = false;
114107
}
115-
if(callback) {
108+
if (callback) {
116109
callback(self.dfu_available);
117110
}
118111
if (!$('option:selected', self.portPickerElement).data().isDFU) {
119112
if (!(GUI.connected_to || GUI.connect_lock)) {
120113
FC.resetState();
121114
}
122-
self.portPickerElement.trigger('change');
115+
if (self.dfu_available) {
116+
self.portPickerElement.trigger('change');
117+
}
123118
}
124119
});
125120
};
@@ -159,6 +154,7 @@ PortHandler.removePort = function(currentPorts) {
159154
self.initialPorts.splice(self.initialPorts.indexOf(removePorts[i]), 1);
160155
}
161156
self.updatePortSelect(self.initialPorts);
157+
self.portPickerElement.trigger('change');
162158
}
163159
};
164160

@@ -188,6 +184,8 @@ PortHandler.detectPort = function(currentPorts) {
188184
TABS.firmware_flasher.boardNeedsVerification = true;
189185
}
190186

187+
self.portPickerElement.trigger('change');
188+
191189
// auto-connect if enabled
192190
if (GUI.auto_connect && !GUI.connecting_to && !GUI.connected_to) {
193191
// start connect procedure. We need firmware flasher protection over here
@@ -269,7 +267,7 @@ PortHandler.selectPort = function(ports) {
269267
const pathSelect = ports[i].path;
270268
const isWindows = (OS === 'Windows');
271269
const isTty = pathSelect.includes('tty');
272-
const deviceRecognized = portName.includes('STM') || portName.includes('CP210');
270+
const deviceRecognized = portName.includes('STM') || portName.includes('CP210') || portName.startsWith('SPR');
273271
const legacyDeviceRecognized = portName.includes('usb');
274272
if (isWindows && deviceRecognized || isTty && (deviceRecognized || legacyDeviceRecognized)) {
275273
this.portPickerElement.val(pathSelect);
@@ -295,7 +293,7 @@ PortHandler.setPortsInputWidth = function() {
295293
return max;
296294
}
297295

298-
const correction = 24; // account for up/down button and spacing
296+
const correction = 32; // account for up/down button and spacing
299297
let width = findMaxLengthOption(this.selectList) + correction;
300298

301299
width = (width > this.initialWidth) ? width : this.initialWidth;

‎src/js/serial_backend.js‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ let connectionTimestamp;
55
let clicks = false;
66

77
function initializeSerialBackend() {
8-
GUI.updateManualPortVisibility = function(){
8+
GUI.updateManualPortVisibility = function() {
99
const selected_port = $('div#port-picker #port option:selected');
1010
if (selected_port.data().isManual) {
1111
$('#port-override-option').show();
@@ -19,12 +19,8 @@ function initializeSerialBackend() {
1919
else {
2020
$('#firmware-virtual-option').hide();
2121
}
22-
if (selected_port.data().isDFU) {
23-
$('select#baud').hide();
24-
}
25-
else {
26-
$('select#baud').show();
27-
}
22+
23+
$('#auto-connect-and-baud').toggle(!selected_port.data().isDFU);
2824
};
2925

3026
GUI.updateManualPortVisibility();

‎src/js/tabs/firmware_flasher.js‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -847,15 +847,24 @@ firmware_flasher.initialize = function (callback) {
847847
if (String(portPickerElement.val()) !== '0') {
848848
const port = String(portPickerElement.val());
849849
let baud = 115200;
850+
850851
if ($('input.flash_manual_baud').is(':checked')) {
851852
baud = parseInt($('#flash_manual_baud_rate').val());
852853
}
854+
853855
GUI.log(i18n.getMessage('firmwareFlasherDetectBoardQuery'));
854-
if (!(serial.connected || serial.connectionId)) {
855-
serial.connect(port, {bitrate: baud}, onConnect);
856+
857+
const isLoaded = self.releases ? Object.keys(self.releases).length > 0 : false;
858+
859+
if (isLoaded) {
860+
if (!(serial.connected || serial.connectionId)) {
861+
serial.connect(port, {bitrate: baud}, onConnect);
862+
} else {
863+
console.warn('Attempting to connect while there still is a connection', serial.connected, serial.connectionId);
864+
serial.disconnect();
865+
}
856866
} else {
857-
console.warn('Attempting to connect while there still is a connection', serial.connected, serial.connectionId);
858-
serial.disconnect();
867+
console.log('Releases not loaded yet');
859868
}
860869
} else {
861870
GUI.log(i18n.getMessage('firmwareFlasherNoValidPort'));
@@ -864,32 +873,24 @@ firmware_flasher.initialize = function (callback) {
864873
}
865874

866875
const detectBoardElement = $('a.detect-board');
867-
let isClickable = true;
868876

869877
detectBoardElement.on('click', () => {
870878
detectBoardElement.addClass('disabled');
871879

872-
if (isClickable) {
873-
isClickable = false;
874-
verifyBoard();
875-
setTimeout(() => isClickable = true, 1000);
876-
}
880+
verifyBoard();
881+
882+
setTimeout(() => detectBoardElement.removeClass('disabled'), 1000);
877883
});
878884

879885
function updateDetectBoardButton() {
880-
const isDfu = portPickerElement.val().includes('DFU');
886+
const isDfu = PortHandler.dfu_available;
881887
const isBusy = GUI.connect_lock;
882-
const isLoaded = self.releases ? Object.keys(self.releases).length > 0 : false;
883-
const isAvailable = PortHandler.port_available || false;
884-
const isButtonDisabled = isDfu || isBusy || !isLoaded || !isAvailable;
888+
const isAvailable = PortHandler.port_available;
889+
const isButtonDisabled = isDfu || isBusy || !isAvailable;
885890

886891
detectBoardElement.toggleClass('disabled', isButtonDisabled);
887892
}
888893

889-
document.querySelector('select[name="build_type"]').addEventListener('change', updateDetectBoardButton);
890-
document.querySelector('select[name="board"]').addEventListener('change', updateDetectBoardButton);
891-
document.querySelector('select[name="firmware_version"]').addEventListener('change', updateDetectBoardButton);
892-
893894
let result = ConfigStorage.get('erase_chip');
894895
if (result.erase_chip) {
895896
$('input.erase_chip').prop('checked', true);
@@ -1114,11 +1115,14 @@ firmware_flasher.initialize = function (callback) {
11141115
});
11151116

11161117
const exitDfuElement = $('a.exit_dfu');
1118+
11171119
exitDfuElement.click(function () {
1118-
if (!$(this).hasClass('disabled')) {
1120+
if (!exitDfuElement.hasClass('disabled')) {
1121+
exitDfuElement.addClass("disabled");
11191122
if (!GUI.connect_lock) { // button disabled while flashing is in progress
11201123
analytics.sendEvent(analytics.EVENT_CATEGORIES.FLASHING, 'ExitDfu', null);
11211124
try {
1125+
console.log('Closing DFU');
11221126
STM32DFU.connect(usbDevices, self.parsed_hex, { exitDfu: true });
11231127
} catch (e) {
11241128
console.log(`Exiting DFU failed: ${e.message}`);
@@ -1127,25 +1131,27 @@ firmware_flasher.initialize = function (callback) {
11271131
}
11281132
});
11291133

1130-
portPickerElement.change(function () {
1131-
if (!GUI.connect_lock) {
1132-
if ($('option:selected', this).data().isDFU) {
1133-
exitDfuElement.removeClass('disabled');
1134-
} else {
1135-
// Porthandler resets board on port detect
1136-
if (self.boardNeedsVerification) {
1137-
// reset to prevent multiple calls
1138-
self.boardNeedsVerification = false;
1139-
verifyBoard();
1140-
}
1134+
portPickerElement.on('change', function () {
1135+
if (GUI.active_tab === 'firmware_flasher') {
1136+
if (!GUI.connect_lock) {
1137+
if ($('option:selected', this).data().isDFU) {
1138+
exitDfuElement.removeClass('disabled');
1139+
} else {
1140+
// Porthandler resets board on port detect
1141+
if (self.boardNeedsVerification) {
1142+
// reset to prevent multiple calls
1143+
self.boardNeedsVerification = false;
1144+
verifyBoard();
1145+
}
11411146

1142-
$("a.load_remote_file").removeClass('disabled');
1143-
$("a.load_file").removeClass('disabled');
1144-
exitDfuElement.addClass('disabled');
1147+
$("a.load_remote_file").removeClass('disabled');
1148+
$("a.load_file").removeClass('disabled');
1149+
exitDfuElement.addClass('disabled');
1150+
}
11451151
}
1152+
updateDetectBoardButton();
11461153
}
1147-
updateDetectBoardButton();
1148-
}).change();
1154+
}).trigger('change');
11491155

11501156
$('a.flash_firmware').click(function () {
11511157
if (!$(this).hasClass('disabled')) {
@@ -1214,6 +1220,7 @@ firmware_flasher.initialize = function (callback) {
12141220

12151221
function startFlashing() {
12161222
exitDfuElement.addClass('disabled');
1223+
$('a.flash_firmware').addClass('disabled');
12171224
$("a.load_remote_file").addClass('disabled');
12181225
$("a.load_file").addClass('disabled');
12191226
if (!GUI.connect_lock) { // button disabled while flashing is in progress

0 commit comments

Comments
 (0)