forked from Blendman974/faceclaw
G1 support: Preserve connections after flashing, debug
This commit is contained in:
1 parent
595b462b2e
commit
b353483ac2
38 files changed
+1291
-178
No files matched your search
@@ -48,6 +48,13 @@ class AndroidSessionLink(private val bleManager: FaceclawBleManager) : SessionLi
|
||||
|
||||
override fun requestBond(address: String) = bleManager.requestBond(address)
|
||||
|
||||
override fun removeBond(address: String): Boolean = bleManager.removeBond(address)
|
||||
|
||||
override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean =
|
||||
bleManager.hasCharacteristic(address, characteristicUuid)
|
||||
|
||||
override fun refreshServices(address: String, timeoutMs: Int): Boolean = bleManager.refreshServices(address, timeoutMs)
|
||||
|
||||
override fun prepareBenchmarkLink(address: String, mode: Int) = bleManager.prepareBenchmarkLink(address, mode)
|
||||
|
||||
override fun recordDisplayFrameSent() = FaceclawBleManager.recordDisplayFrameSent()
|
||||
|
||||
@@ -52,6 +52,13 @@ class AndroidStockLink(context: Context) : StockLink, FaceclawBleListener {
|
||||
|
||||
override fun requestBond(address: String) = bleManager.requestBond(address)
|
||||
|
||||
override fun removeBond(address: String): Boolean = bleManager.removeBond(address)
|
||||
|
||||
override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean =
|
||||
bleManager.hasCharacteristic(address, characteristicUuid)
|
||||
|
||||
override fun refreshServices(address: String, timeoutMs: Int): Boolean = bleManager.refreshServices(address, timeoutMs)
|
||||
|
||||
override fun disconnect(address: String) = bleManager.disconnect(address)
|
||||
|
||||
override fun close() = bleManager.close()
|
||||
|
||||
@@ -27,6 +27,11 @@ import java.util.concurrent.atomic.AtomicLong
|
||||
class FaceclawBleManager(context: Context) {
|
||||
companion object {
|
||||
private const val TAG = "FaceclawBle"
|
||||
|
||||
/** Not public API, but long stable, and the only way short of sending the user to Settings. */
|
||||
fun removeBond(device: BluetoothDevice): Boolean =
|
||||
device.bondState == BluetoothDevice.BOND_NONE || device.javaClass.getMethod("removeBond").invoke(device) == true
|
||||
|
||||
private val WRITE_RETRY_DELAYS_MS = intArrayOf(1, 1, 1, 2, 4, 8, 12, 20, 35, 100, 200)
|
||||
|
||||
// Gap after each LE 2M PHY request before checking whether it landed and asking
|
||||
@@ -160,6 +165,21 @@ class FaceclawBleManager(context: Context) {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove this phone's half of a pairing the other side no longer has. False when the platform refused.
|
||||
*/
|
||||
fun removeBond(address: String?): Boolean {
|
||||
if (address == null || address.trim().isEmpty()) {
|
||||
return false
|
||||
}
|
||||
return try {
|
||||
removeBond(bluetoothAdapter.getRemoteDevice(address))
|
||||
} catch (t: Throwable) {
|
||||
Log.w(TAG, "removeBond failed: $address", t)
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
/** Start bonding, without waiting: the OS may ask the user, and [isBonded] tells when it is done. */
|
||||
fun requestBond(address: String?) {
|
||||
if (address == null || address.trim().isEmpty()) {
|
||||
@@ -379,6 +399,31 @@ class FaceclawBleManager(context: Context) {
|
||||
return status == BluetoothGatt.GATT_SUCCESS
|
||||
}
|
||||
|
||||
/** After discovery: whether the service table has this characteristic. */
|
||||
fun hasCharacteristic(address: String, characteristicUuid: String): Boolean {
|
||||
synchronized(bluetoothApiLock) {
|
||||
val gatt = links[address]?.gatt ?: return false
|
||||
val target = UUID.fromString(characteristicUuid)
|
||||
return gatt.services.any { it.getCharacteristic(target) != null }
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Forget the service table Android remembers for a bonded device and read it again. A G1 arm keeps its address across an
|
||||
* install that changes its services, and a cached table would make new firmware look like the old one.
|
||||
*/
|
||||
fun refreshServices(address: String, timeoutMs: Int): Boolean {
|
||||
synchronized(bluetoothApiLock) {
|
||||
val gatt = links[address]?.gatt ?: return false
|
||||
try {
|
||||
gatt.javaClass.getMethod("refresh").invoke(gatt)
|
||||
} catch (t: Throwable) {
|
||||
Log.w(TAG, "refresh failed: $address", t)
|
||||
}
|
||||
}
|
||||
return discoverServices(address, timeoutMs)
|
||||
}
|
||||
|
||||
fun enableNotifications(address: String, characteristicUuid: String, enable: Boolean, timeoutMs: Int): Boolean {
|
||||
synchronized(bluetoothApiLock) {
|
||||
val gatt = requireGatt(address)
|
||||
|
||||
@@ -141,9 +141,9 @@ class FaceclawDeviceDiscovery(context: Context) {
|
||||
val upper = name.uppercase()
|
||||
// A bare "R1" substring also matches unrelated hardware ("Oppo Enco
|
||||
// R1"), and TS only classifies rings from the stock name prefix.
|
||||
// Even G1: its stock name, or g1v0's G1v0_L / G1v0S_R (safe mode).
|
||||
// Even G1: its stock name, or g1v0's G1CFW_L_XXXXXX (before 0.5.66: G1v0_L, G1v0S_R).
|
||||
return upper.contains("G2") || upper.startsWith("EVEN R1") || upper.startsWith("RAYNEO") ||
|
||||
upper.startsWith("EVEN G1") || upper.startsWith("G1V0")
|
||||
upper.startsWith("EVEN G1") || upper.startsWith("G1CFW_") || upper.startsWith("G1V0")
|
||||
}
|
||||
|
||||
private fun buildJson(
|
||||
|
||||
@@ -76,6 +76,16 @@ class FaceclawG1Flasher(context: Context, address: String?, side: String?, firmw
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
/** The phone's pairing with an address these glasses no longer use. */
|
||||
@JvmStatic
|
||||
fun forgetPairing(context: Context, address: String?) {
|
||||
if (address == null) return
|
||||
val manager = context.applicationContext.getSystemService(Context.BLUETOOTH_SERVICE) as android.bluetooth.BluetoothManager
|
||||
FaceclawBleManager.removeBond(manager.adapter.getRemoteDevice(address))
|
||||
}
|
||||
}
|
||||
|
||||
private fun post(action: (FaceclawFirmwareFlasherListener) -> Unit) {
|
||||
mainHandler.post {
|
||||
val current = listener
|
||||
|
||||
Reference in new issue
Block a user