Reduce load in write III

Author: haslinghuis

android/app/src/main/java/betaflight/configurator/protocols/bluetooth/BetaflightBluetoothPlugin.java

@@ -105,8 +105,12 @@ private static final class DiscoveredDevice {
 	private Runnable connectTimeoutRunnable;
 	private PluginCall pendingConnectCall;
 	private String connectedDeviceId;
+
+	// Cached per connection
 	private BluetoothGattCharacteristic writeCharacteristic = null;
 	private boolean writeNoResponseSupported = false;
+	private int cachedWriteType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
+
 	private final Queue<PluginCall> pendingStartNotificationCalls = new ConcurrentLinkedQueue<>();
 	private volatile boolean servicesDiscovered = false;
 
@@ -328,32 +332,19 @@ public void disconnect(PluginCall call) {
 	@PluginMethod
 	public void write(PluginCall call) {
 		if (!ensureConnected(call)) return;
-
 		final BluetoothGatt gatt = bluetoothGatt;
 		if (gatt == null || !servicesDiscovered) { call.reject("Not connected"); return; }
 
 		final BluetoothGattCharacteristic target = writeCharacteristic;
 		if (target == null) { call.reject("Write characteristic not available"); return; }
 
-		// Params and payload decode only
 		final String value = call.getString("value", call.getString("data"));
 		final String encoding = call.getString("encoding", "base64");
-		final boolean withoutResponse = call.getBoolean("withoutResponse", false);
-
 		final byte[] payload;
-		try {
-			payload = decodePayload(value, encoding);
-		} catch (IllegalArgumentException ex) {
-			call.reject("Failed to decode payload: " + ex.getMessage());
-			return;
-		}
-
-		// Minimal branch based on cached capability (no property reads here)
-		final int writeType = (withoutResponse && writeNoResponseSupported)
-				? BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
-				: BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
+		try { payload = decodePayload(value, encoding); }
+		catch (IllegalArgumentException ex) { call.reject("Failed to decode payload: " + ex.getMessage()); return; }
 
-		final boolean ok = submitWrite(gatt, target, payload, writeType);
+		final boolean ok = submitWrite(gatt, target, payload, cachedWriteType);
 		if (ok) {
 			JSObject result = new JSObject();
 			result.put("bytesSent", payload.length);
@@ -646,6 +637,7 @@ private void cleanupGatt() {
 		bluetoothGatt = null;
 		writeCharacteristic = null;
 		writeNoResponseSupported = false;
+		cachedWriteType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
 		connectedDeviceId = null;
 		servicesDiscovered = false;
 	}
@@ -948,6 +940,7 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
 			} else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
 				connectionState.set(ConnectionState.DISCONNECTED);
 				cleanupGatt();
+				// notifyConnectionState("disconnected", null);
 				failConnect(status == BluetoothGatt.GATT_SUCCESS ? "Disconnected" : "Connect status: " + status);
 			}
 		}
@@ -959,33 +952,29 @@ public void onServicesDiscovered(BluetoothGatt gatt, int status) {
 
 			writeCharacteristic = null;
 			writeNoResponseSupported = false;
+			cachedWriteType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
 
 			try {
 				for (BluetoothGattService svc : gatt.getServices()) {
-					BluetoothGattCharacteristic preferred = null;
-					BluetoothGattCharacteristic fallback  = null;
-
+					BluetoothGattCharacteristic preferred = null, fallback = null;
 					for (BluetoothGattCharacteristic ch : svc.getCharacteristics()) {
-						final int props = ch.getProperties();
-						if ((props & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) != 0) {
-							preferred = ch; // best option
-							break;
-						}
-						if (fallback == null && (props & BluetoothGattCharacteristic.PROPERTY_WRITE) != 0) {
-							fallback = ch;
-						}
+						int props = ch.getProperties();
+						if ((props & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) != 0) { preferred = ch; break; }
+						if (fallback == null && (props & BluetoothGattCharacteristic.PROPERTY_WRITE) != 0) fallback = ch;
 					}
-
-					final BluetoothGattCharacteristic chosen = (preferred != null) ? preferred : fallback;
+					BluetoothGattCharacteristic chosen = (preferred != null) ? preferred : fallback;
 					if (chosen != null) {
 						writeCharacteristic = chosen;
 						writeNoResponseSupported =
-								(chosen.getProperties() & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) != 0;
+							(chosen.getProperties() & BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE) != 0;
+						cachedWriteType = writeNoResponseSupported
+							? BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
+							: BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT;
 						break;
 					}
 				}
 			} catch (Exception ignored) {
-				// leave writeCharacteristic null; write() will report unavailable
+				// leave writeCharacteristic null; write() will reject
 			}
 
 			flushPendingStartNotificationCalls();

src/js/msp/MSPHelper.js

@@ -2933,30 +2933,49 @@ MspHelper.prototype.sendSerialConfig = function (callback) {
 };
 
 MspHelper.prototype.writeConfiguration = function (reboot, callback) {
-    if (reboot) {
-        GUI.interval_kill_all(); // stop status_pull and other tab timers immediately
-        MSP.callbacks_cleanup(); // drop any stale callbacks
+    // Quiet background traffic to avoid queue starvation on BLE
+    try {
+        GUI.interval_kill_all();
+        MSP.callbacks_cleanup();
+    } catch (e) {
+        console.warn("writeConfiguration: pre-save quieting failed:", e);
     }
 
-    // We need some protection when testing motors on motors tab
-    if (!FC.CONFIG.armingDisabled) {
-        this.setArmingEnabled(false, false);
-    }
+    const sendEeprom = () => {
+        let finished = false;
+        const finish = () => {
+            if (finished) return;
+            finished = true;
 
-    setTimeout(function () {
-        MSP.send_message(MSPCodes.MSP_EEPROM_WRITE, false, false, function () {
-            gui_log(i18n.getMessage("configurationEepromSaved"));
-            console.log("Configuration saved to EEPROM");
             if (reboot) {
                 GUI.tab_switch_cleanup(function () {
                     return reinitializeConnection();
                 });
             }
-            if (callback) {
-                callback();
-            }
+            if (callback) callback();
+        };
+
+        // Fallback in case the EEPROM ack is missed under BLE load
+        const fallbackTimer = setTimeout(() => {
+            console.warn("MSP_EEPROM_WRITE ack timeout; proceeding to reboot via fallback.");
+            finish();
+        }, 3000); // conservative for Android BLE
+
+        MSP.send_message(MSPCodes.MSP_EEPROM_WRITE, false, false, function () {
+            clearTimeout(fallbackTimer);
+            gui_log(i18n.getMessage("configurationEepromSaved"));
+            console.log("Configuration saved to EEPROM");
+            finish();
         });
-    }, 200); // 200ms delay before sending MSP_EEPROM_WRITE to ensure that all settings have been received
+    };
+
+    // Keep your arming safety, but don’t block on it
+    if (!FC.CONFIG.armingDisabled) {
+        this.setArmingEnabled(false, false);
+        setTimeout(sendEeprom, 200); // current delay retained
+    } else {
+        setTimeout(sendEeprom, 200);
+    }
 };
 
 let mspHelper;