forked from Blendman974/faceclaw
Build out Ring Status debug tool; fix some aspects of ring direct communication
This commit is contained in:
1 parent
e12cfaaf38
commit
f38595422c
16 files changed
+812
-173
No files matched your search
@@ -199,7 +199,7 @@ export class FaceclawCommunicatorBridge {
|
||||
private microphoneWork: Promise<void> = Promise.resolve();
|
||||
private microphoneToken = 0;
|
||||
|
||||
constructor(addresses: { right: string; left: string; ring?: string }) {
|
||||
constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string }) {
|
||||
this.communicator = FaceclawKitIosGlassesSession.alloc().initWithRightAddressLeftAddressRingAddress(
|
||||
String(addresses.right ?? "").toUpperCase(),
|
||||
String(addresses.left ?? "").toUpperCase(),
|
||||
@@ -207,6 +207,10 @@ export class FaceclawCommunicatorBridge {
|
||||
);
|
||||
// The shared session halts on any other firmware ("incompatible-firmware").
|
||||
this.communicator.setRequiredFirmwareRevisionRevision(REQUIRED_FACECLAW_FIRMWARE_VERSION);
|
||||
// Guarded: an older framework build may not export it yet.
|
||||
if (addresses.ringRole && typeof this.communicator.setDirectRingRoleRole === "function") {
|
||||
this.communicator.setDirectRingRoleRole(addresses.ringRole);
|
||||
}
|
||||
this.listenerProxy = SessionListener.new() as SessionListener;
|
||||
this.listenerProxy.bridge = this;
|
||||
this.communicator.setListenerListener(this.listenerProxy);
|
||||
|
||||
@@ -161,7 +161,7 @@ export class FaceclawCommunicatorBridge {
|
||||
private readonly firmwareInfoListeners = new Set<(info: FirmwareInfo) => void>();
|
||||
private readonly previewAnimationListeners = new Set<() => void>();
|
||||
|
||||
constructor(addresses: { right: string; left: string; ring?: string }) {
|
||||
constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string }) {
|
||||
const context = Utils.android.getApplicationContext();
|
||||
if (!context) throw new Error("Android application context unavailable");
|
||||
|
||||
@@ -173,6 +173,8 @@ export class FaceclawCommunicatorBridge {
|
||||
);
|
||||
// The shared session halts on any other firmware ("incompatible-firmware").
|
||||
this.communicator.setRequiredFirmwareRevision(REQUIRED_FACECLAW_FIRMWARE_VERSION);
|
||||
// Which R1 role the direct ring link claims; only matters with a ring address.
|
||||
if (addresses.ringRole) this.communicator.setDirectRingRole(addresses.ringRole);
|
||||
this.listenerProxy = new com.faceclaw.app.FaceclawBleCommunicatorListener({
|
||||
onStateChange: (phase: string, status: string) => {
|
||||
const state = {
|
||||
|
||||
@@ -37,14 +37,38 @@ export type RingSessionStatus = {
|
||||
lastCommandAgeMs: number;
|
||||
lastCommandResultR: string;
|
||||
lastCommandResultL: string;
|
||||
/** Which ring role the direct link claims: "both", "phone" or "glasses". */
|
||||
directRole: string;
|
||||
lastRingCommand: string;
|
||||
lastRingCommandAgeMs: number;
|
||||
lastRingCommandResult: string;
|
||||
/** Last direct-link notification nothing decoded: characteristic prefix and hex. */
|
||||
lastDirectRaw: string;
|
||||
lastDirectRawAgeMs: number;
|
||||
};
|
||||
|
||||
/**
|
||||
* EXPERIMENTAL glasses-side ring link control (sid 0x80 pair manager):
|
||||
* "disconnect" drops the glasses' ring link, "release" also clears their
|
||||
* connect mode (may hold off auto-reconnect), "connect" hands the ring back.
|
||||
* connect mode (may hold off auto-reconnect), "unpair" makes them forget the
|
||||
* ring, "connect" hands the ring back.
|
||||
*/
|
||||
export type GlassesRingLinkAction = "disconnect" | "release" | "connect";
|
||||
export type GlassesRingLinkAction = "disconnect" | "release" | "unpair" | "connect";
|
||||
|
||||
/**
|
||||
* EXPERIMENTAL ring-side binding commands over the direct link (see
|
||||
* GlassesSessionCore.sendRingConfigCommand). "bind" and "unbind" combine the
|
||||
* ring and glasses halves in the official app's order.
|
||||
*/
|
||||
export type RingConfigAction =
|
||||
| "bind"
|
||||
| "unbind"
|
||||
| "pair-auth"
|
||||
| "targets-glasses"
|
||||
| "targets-clear"
|
||||
| "touch-on"
|
||||
| "touch-off"
|
||||
| "remove-ring";
|
||||
|
||||
export type RingSystemBluetoothState = {
|
||||
address: string;
|
||||
@@ -100,3 +124,26 @@ export function setGlassesRingLink(action: GlassesRingLinkAction, fallbackAddres
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/** A one-line outcome for the UI. */
|
||||
export function sendRingConfigCommand(action: RingConfigAction, fallbackAddress: string, fallbackName: string): string {
|
||||
const active = activeCommunicator();
|
||||
if (!active) return "not sent: no glasses session";
|
||||
try {
|
||||
return String(active.sendRingConfigCommand(action, fallbackAddress, fallbackName));
|
||||
} catch (error) {
|
||||
console.warn(`sendRingConfigCommand failed: ${error}`);
|
||||
return `failed: ${error}`;
|
||||
}
|
||||
}
|
||||
|
||||
/** Apply a direct ring role to the running session (reconnects the direct link if it is up). */
|
||||
export function setDirectRingRole(role: string): void {
|
||||
const active = activeCommunicator();
|
||||
if (!active) return;
|
||||
try {
|
||||
active.setDirectRingRole(role);
|
||||
} catch (error) {
|
||||
console.warn(`setDirectRingRole failed: ${error}`);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user