fix bluetooth support issue for chrome on android.

and usb otg serial support for chrome on android. Update src/js/protocols/bluetooth.js Co-authored-by: Mark Haslinghuis <[email protected]>
betaflight · Oct 28, 2024 · 8a51391 · 8a51391
1 parent 0ae4af9
commit 8a51391
Show file tree

Hide file tree

Showing 5 changed files with 675 additions and 11 deletions.
diff --git a/src/js/DarkTheme.js b/src/js/DarkTheme.js
@@ -32,7 +32,7 @@ DarkTheme.apply = function() {
             self.applyNormal();
         }
 
-        if (chrome.app.window !== undefined) {
+        if (chrome?.app?.window !== undefined) {
             windowWatcherUtil.passValue(chrome.app.window.get("receiver_msp"), 'darkTheme', isEnabled);
         }
     });

diff --git a/src/js/main.js b/src/js/main.js
@@ -420,6 +420,15 @@ function startProcess() {
         $(this).data('state', state);
     });
 
+
+    $("#menu_btn").on('click', function () {
+        $("#tab-content-container .tab_container").addClass('reveal');
+    });
+
+    $("#tab-content-container .tab_container").on('click', function () {
+        $("#tab-content-container .tab_container").removeClass('reveal');
+    });
+
     let result = getConfig('logopen');
     if (result.logopen) {
         $("#showlog").trigger('click');

diff --git a/src/js/protocols/bluetooth.js b/src/js/protocols/bluetooth.js
@@ -22,6 +22,7 @@ const bluetoothDevices = [
 class BT extends EventTarget {
     constructor() {
         super();
+        this.lastWrite=null;
 
         if (!this.bluetooth && window && window.navigator && window.navigator.bluetooth) {
             this.bluetooth = navigator.bluetooth;
@@ -96,10 +97,14 @@ class BT extends EventTarget {
     }
 
     async loadDevices() {
-        const devices = await this.getDevices();
+        try{
+            const devices = await this.bluetooth.getDevices();
 
-        this.portCounter = 1;
-        this.devices = devices.map(device => this.createPort(device));
+            this.portCounter = 1;
+            this.devices = devices.map(device => this.createPort(device));
+        }catch(e){
+
+        }
     }
 
     async requestPermissionDevice() {
@@ -260,8 +265,12 @@ class BT extends EventTarget {
         }
 
         this.readCharacteristic.addEventListener('characteristicvaluechanged', this.handleNotification.bind(this));
-
-        return await this.readCharacteristic.readValue();
+        try{
+            return await this.readCharacteristic.readValue();
+        }catch(e){
+            console.error(e);
+            return;
+        }
     }
 
     handleNotification(event) {
@@ -270,8 +279,9 @@ class BT extends EventTarget {
         for (let i = 0; i < event.target.value.byteLength; i++) {
             buffer[i] = event.target.value.getUint8(i);
         }
-
-        this.dispatchEvent(new CustomEvent("receive", { detail: buffer }));
+        setTimeout(()=>{
+            this.dispatchEvent(new CustomEvent("receive", { detail: buffer }));
+        },0);
     }
 
     startNotifications() {
@@ -348,8 +358,14 @@ class BT extends EventTarget {
         this.bytesSent += data.byteLength;
 
         const dataBuffer = new Uint8Array(data);
-
-        await this.writeCharacteristic.writeValue(dataBuffer);
+        try {
+            if (this.lastWrite){
+                await this.lastWrite;
+            }
+        } catch(error) {
+            console.error(error);
+        }
+        this.lastWrite = this.writeCharacteristic.writeValueWithoutResponse(dataBuffer);
 
         return {
             bytesSent: data.byteLength,

diff --git a/src/js/utils/checkBrowserCompatibilty.js b/src/js/utils/checkBrowserCompatibilty.js
@@ -1,3 +1,5 @@
+import { serial as serialPolyfill } from './web-serial-polyfill/serial.ts';
+
 export function isChromium() {
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
     if (!navigator.userAgentData) {
@@ -13,7 +15,18 @@ export function isChromium() {
 }
 
 export function checkBrowserCompatibility() {
-    const compatible = "serial" in navigator;
+    let compatible = "serial" in navigator;
+    if (!compatible) {
+        if('usb' in navigator &&
+            !('brave' in navigator)
+        ) {
+            navigator.serial = serialPolyfill;
+        }
+
+        if(navigator?.serial || navigator?.bluetooth){
+            compatible = true;
+        }
+    }
 
     if (isChromium() && compatible) {
         return true;