Merge branch 'master' into 20240430_nw-builder_3.8.3

emuflight · Jun 11, 2024 · 01f94c5 · 01f94c5
2 parents 0e3f8cd + 5175d8f
commit 01f94c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/manifest.json b/manifest.json
@@ -37,6 +37,10 @@
                 {
                     "vendorId": 10473,
                     "productId": 393
+                },
+                {
+                    "vendorId": 12619,
+                    "productId": 262
                 }
             ]
         },

diff --git a/src/js/port_handler.js b/src/js/port_handler.js
@@ -4,7 +4,8 @@ const TIMEOUT_CHECK = 500; // With 250 it seems that it produces a memory leak a
 
 var usbDevices = { filters: [
     {'vendorId': 1155, 'productId': 57105},
-    {'vendorId': 10473, 'productId': 393}
+    {'vendorId': 10473, 'productId': 393},
+    {'vendorId': 12619, 'productId': 262} // APM32 DFU Bootloader
 ] };
 
 var PortHandler = new function () {

diff --git a/src/js/tabs/cli.js b/src/js/tabs/cli.js
@@ -369,7 +369,7 @@ function writeLineToOutput(text) {
         return; // suppress output if in building state
     }
 
-    if (text.startsWith("###ERROR: ")) {
+    if (text.startsWith("###ERROR")) {
         writeToOutput('<span class="error_message">' + text + '</span><br>');
     } else {
         writeToOutput(text + "<br>");