Skip to content

Commit

Permalink
Fix Windows transport list lacking info, electron announce
Browse files Browse the repository at this point in the history
  • Loading branch information
Silver Valdvee committed Mar 28, 2023
1 parent 77d5621 commit a0133d5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion yukon/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "2023.3.41"
__version__ = "2023.3.42"
2 changes: 2 additions & 0 deletions yukon/web/main/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ window.console = new Proxy(old_console, {
if (!isRunningInElectron(yukon_state)) {
zubax_api.announce_running_in_browser();
document.title = "Yukon (browser)";
} else {
zubax_api.announce_running_in_electron();
}

function setUpMonitorComponent() {
Expand Down
1 change: 0 additions & 1 deletion yukon/web/modules/panels/registers.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ export function add_node_id_headers(table_header_row, yukon_state) {
table_header_cell.style.setProperty("max-width", widthFromSettings + "px", "important");
// Add a listener to the hover event of table_header_cell
table_header_cell.addEventListener('mouseover', function () {
console.log("Mouse over node id header");
isMouseOverLoopRunning = true;
let myInterval = null;
myInterval = setInterval(function () {
Expand Down
7 changes: 6 additions & 1 deletion yukon/web/modules/panels/transports.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function initTransports(container, yukon_state) {
if (productId == 24600) {
return "Dronecode probe"
} else if (productId == 24775) {
return "Babel (CAN to USB)"
return "Zubax"
}
return null;

Expand Down Expand Up @@ -55,9 +55,14 @@ export function initTransports(container, yukon_state) {
option.disabled = true;
}
let device_name = port.usb_description;
// If the operating system is windows, then display detectDeviceFromProductId instead
if (window.navigator.platform == "Win32") {
device_name = detectDeviceFromProductId(port.product_id);
}
if (device_name == null) {
device_name = port.description;
}
option.title = JSON.stringify(port);
option.text = port.device + " — " + device_name;
sTransport.add(option);
}
Expand Down

0 comments on commit a0133d5

Please sign in to comment.