forked from Blendman974/faceclaw
Add ring debug; change GATT locking
This commit is contained in:
1 parent
a8c9ab0a98
commit
c119883ca0
13 files changed
+915
-81
No files matched your search
@@ -7,6 +7,7 @@ import { AccelerometerDemoLayer } from "./accelerometer-demo";
|
||||
import { BandwidthBenchmarkLayer } from "./bandwidth-benchmark";
|
||||
import { LightSensorDemoLayer } from "./light-sensor-demo";
|
||||
import { ResourceUsageLayer } from "./resource-usage";
|
||||
import { RingStatusLayer } from "./ring-status";
|
||||
import { LoadAppFromQrLayer, LoadAppFromUrlLayer } from "./load-app";
|
||||
import { unicodeTestMenu } from "./unicode-test";
|
||||
import { type AppContext } from "../app-definition";
|
||||
@@ -85,6 +86,14 @@ function debugTestsMenu(openInputEvents: (ctx: Parameters<MenuItem["onSelect"]>[
|
||||
ctx.stack.push(new LightSensorDemoLayer(DEVELOPER_WINDOW_ID, ctx.actions.requestRender));
|
||||
},
|
||||
},
|
||||
{
|
||||
label: "Ring status",
|
||||
disabled: global.isIOS,
|
||||
description: global.isIOS ? "Not available on iOS yet." : undefined,
|
||||
onSelect: (ctx) => {
|
||||
ctx.stack.push(new RingStatusLayer(DEVELOPER_WINDOW_ID, ctx.actions.requestRender));
|
||||
},
|
||||
},
|
||||
{
|
||||
label: "BLE bandwidth",
|
||||
onSelect: (ctx) => {
|
||||
|
||||
@@ -0,0 +1,220 @@
|
||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
||||
import { GrayImage } from "../../graphics/image";
|
||||
import { type InputEvent } from "../../ui/gestures";
|
||||
import { Layer, type LayerContext } from "../../ui/layers";
|
||||
import { shell } from "../../ui/shell/shell";
|
||||
import { ringConnectionModeSetting } from "../../ui/dashboard-settings";
|
||||
import { loadDeviceAddresses } from "../../g2/device-addresses";
|
||||
import {
|
||||
getRingSessionStatus,
|
||||
getRingSystemBluetoothState,
|
||||
setGlassesRingLink,
|
||||
type GlassesRingLinkAction,
|
||||
type RingSessionStatus,
|
||||
type RingSystemBluetoothState,
|
||||
} from "../../native/ring-status";
|
||||
|
||||
const POLL_INTERVAL_MS = 1_000;
|
||||
const LEFT_X = 16;
|
||||
const VALUE_X = 130;
|
||||
const BUTTON_GAP = 8;
|
||||
|
||||
type Row = { label: string; value: string; dim?: boolean };
|
||||
type Button = { label: string; action: GlassesRingLinkAction | "mode" };
|
||||
|
||||
const BUTTONS: readonly Button[] = [
|
||||
{ label: "Disconnect", action: "disconnect" },
|
||||
{ label: "Release", action: "release" },
|
||||
{ label: "Reconnect", action: "connect" },
|
||||
{ label: "Mode", action: "mode" },
|
||||
];
|
||||
|
||||
/**
|
||||
* Where R1 ring input is coming from: the phone's own Bluetooth link to the
|
||||
* ring, the direct-link session state, and when input last arrived directly
|
||||
* versus relayed by the glasses. A ring connected to the glasses does not
|
||||
* also report gestures to a phone that connects to it directly, so the two
|
||||
* "input" rows are the quickest way to see which path is live.
|
||||
*
|
||||
* The buttons are EXPERIMENTAL glasses-side ring link commands (sid 0x80,
|
||||
* see GlassesSessionRing.kt): Disconnect / Release ask the glasses to let go
|
||||
* of the ring, Reconnect hands it back, and Mode flips the Developer "Ring
|
||||
* connection" setting, which applies on the next glasses connection.
|
||||
*/
|
||||
export class RingStatusLayer implements Layer {
|
||||
private session: RingSessionStatus | null = null;
|
||||
private system: RingSystemBluetoothState | null = null;
|
||||
private timer: ReturnType<typeof setInterval> | null = null;
|
||||
private selected = 0;
|
||||
private notice = "";
|
||||
|
||||
constructor(
|
||||
private readonly windowId: string,
|
||||
private readonly requestRender: () => void,
|
||||
) {
|
||||
this.poll();
|
||||
this.timer = setInterval(() => {
|
||||
this.poll();
|
||||
if (shell.isWindowVisible(this.windowId)) this.requestRender();
|
||||
}, POLL_INTERVAL_MS);
|
||||
}
|
||||
|
||||
onRemoved(): void {
|
||||
if (this.timer !== null) {
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
}
|
||||
}
|
||||
|
||||
private ringAddress(): string {
|
||||
return this.session?.ringAddress || loadDeviceAddresses().ring;
|
||||
}
|
||||
|
||||
private poll(): void {
|
||||
this.session = getRingSessionStatus();
|
||||
const address = this.ringAddress();
|
||||
this.system = address ? getRingSystemBluetoothState(address) : null;
|
||||
}
|
||||
|
||||
paint(ctx: LayerContext): GrayImage {
|
||||
const font = getDefaultSmallFont();
|
||||
const { width, height } = ctx.stack.getBaseSize();
|
||||
const image = new GrayImage(width, height, 0);
|
||||
const lineStep = font.lineHeight + 2;
|
||||
const buttonHeight = font.lineHeight + 8;
|
||||
const buttonTop = height - buttonHeight - 6;
|
||||
|
||||
image.drawText(font, 18, 10, "Ring status", 230);
|
||||
let y = 10 + lineStep + 4;
|
||||
const rows = this.rows();
|
||||
if (this.notice) rows.push({ label: "", value: this.notice });
|
||||
for (const row of rows) {
|
||||
if (y + font.lineHeight > buttonTop - 4) break;
|
||||
image.drawText(font, LEFT_X, y, row.label, row.dim ? 100 : 150);
|
||||
image.drawText(font, VALUE_X, y, row.value, row.dim ? 120 : 220);
|
||||
y += lineStep;
|
||||
}
|
||||
|
||||
const buttonWidth = Math.floor((width - 2 * LEFT_X - BUTTON_GAP * (BUTTONS.length - 1)) / BUTTONS.length);
|
||||
BUTTONS.forEach((button, index) => {
|
||||
const x = LEFT_X + index * (buttonWidth + BUTTON_GAP);
|
||||
const selected = index === this.selected;
|
||||
if (selected) image.fillRoundedRect(x, buttonTop, buttonWidth, buttonHeight, 40, 4);
|
||||
image.drawRoundedRect(x, buttonTop, buttonWidth, buttonHeight, selected ? 200 : 70, 4);
|
||||
const text = button.action === "mode"
|
||||
? (ringConnectionModeSetting.get() === "direct" ? "Mode: direct" : "Mode: glasses")
|
||||
: button.label;
|
||||
image.drawText(font, x + Math.max(0, Math.floor((buttonWidth - font.measureText(text)) / 2)),
|
||||
buttonTop + 4, text, selected ? 255 : 170);
|
||||
});
|
||||
return image;
|
||||
}
|
||||
|
||||
private rows(): Row[] {
|
||||
const s = this.session;
|
||||
const address = this.ringAddress();
|
||||
const rows: Row[] = [
|
||||
{ label: "Ring", value: address || "none paired" },
|
||||
{ label: "Phone BT", value: describeSystem(this.system) },
|
||||
];
|
||||
|
||||
if (!s) {
|
||||
rows.push({ label: "Session", value: "not connected to glasses", dim: true });
|
||||
return rows;
|
||||
}
|
||||
|
||||
if (!s.directEnabled) {
|
||||
const pending = ringConnectionModeSetting.get() === "direct";
|
||||
rows.push({ label: "Direct link", value: pending ? "on after glasses reconnect" : "off (mode: glasses)", dim: true });
|
||||
} else {
|
||||
const state = s.directNotificationsReady ? "subscribed"
|
||||
: s.directConnected ? "connected, subscribing"
|
||||
: "not connected";
|
||||
const since = s.directStateAgeMs >= 0 ? ` ${formatAge(s.directStateAgeMs)}` : "";
|
||||
const battery = s.directBattery >= 0 ? `, ${s.directBattery}%` : "";
|
||||
rows.push({ label: "Direct link", value: `${state}${since}, ${s.directConnectCount} connects${battery}` });
|
||||
}
|
||||
rows.push({ label: "Direct input", value: describeInput(s.lastDirectInputAgeMs, s.lastDirectInput) });
|
||||
if (s.directEnabled) {
|
||||
rows.push({ label: "Direct pkts", value: describeAge(s.lastDirectNotifyAgeMs) });
|
||||
}
|
||||
rows.push({ label: "Glasses input", value: describeInput(s.lastGlassesInputAgeMs, s.lastGlassesInput) });
|
||||
rows.push({
|
||||
label: "Glasses ring",
|
||||
value: (s.glassesRingBatteryAgeMs < 0 ? "battery not reported"
|
||||
: `${s.glassesRingBattery >= 0 ? `battery ${s.glassesRingBattery}%` : "no battery"} ${formatAge(s.glassesRingBatteryAgeMs)} ago`)
|
||||
+ (s.glassesRingMac ? `, mac ${s.glassesRingMac}` : ""),
|
||||
});
|
||||
if (s.lastGlassesReport) {
|
||||
rows.push({ label: "Glasses said", value: `${s.lastGlassesReport} (${formatAge(s.lastGlassesReportAgeMs)} ago)` });
|
||||
}
|
||||
if (s.lastCommand) {
|
||||
rows.push({ label: "Sent", value: `${s.lastCommand} ${formatAge(s.lastCommandAgeMs)} ago` });
|
||||
rows.push({ label: "Result", value: `R ${s.lastCommandResultR}; L ${s.lastCommandResultL}` });
|
||||
}
|
||||
if (s.lastDirectError) rows.push({ label: "Direct error", value: s.lastDirectError, dim: true });
|
||||
return rows;
|
||||
}
|
||||
|
||||
private activate(): void {
|
||||
const button = BUTTONS[this.selected]!;
|
||||
if (button.action === "mode") {
|
||||
const next = ringConnectionModeSetting.get() === "direct" ? "glasses" : "direct";
|
||||
ringConnectionModeSetting.set(next);
|
||||
this.notice = `Ring connection set to ${ringConnectionModeSetting.displayValue(next)}; applies on next glasses connection`;
|
||||
return;
|
||||
}
|
||||
const address = this.ringAddress();
|
||||
const name = this.system?.name ?? "";
|
||||
this.notice = setGlassesRingLink(button.action, address, name)
|
||||
? `${button.label} sent (experimental)`
|
||||
: `${button.label} not sent (no session or no ring address)`;
|
||||
this.poll();
|
||||
}
|
||||
|
||||
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||
switch (event.type) {
|
||||
case "scroll-up":
|
||||
this.selected = (this.selected + BUTTONS.length - 1) % BUTTONS.length;
|
||||
return;
|
||||
case "scroll-down":
|
||||
this.selected = (this.selected + 1) % BUTTONS.length;
|
||||
return;
|
||||
case "click":
|
||||
this.activate();
|
||||
return;
|
||||
case "double-click":
|
||||
ctx.stack.pop();
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function describeSystem(sys: RingSystemBluetoothState | null): string {
|
||||
if (!sys) return "unknown";
|
||||
if (sys.error) return `error: ${sys.error}`;
|
||||
if (sys.bonded === undefined) return "unknown";
|
||||
const parts = [sys.bonded ? "bonded" : "not bonded"];
|
||||
if (sys.gattConnected !== undefined) parts.push(sys.gattConnected ? "GATT up" : "no GATT");
|
||||
if (sys.aclConnected !== undefined) parts.push(sys.aclConnected ? "link up" : "no link");
|
||||
return parts.join(", ");
|
||||
}
|
||||
|
||||
function describeInput(ageMs: number, label: string): string {
|
||||
if (ageMs < 0) return "never";
|
||||
return label ? `${formatAge(ageMs)} ago: ${label}` : `${formatAge(ageMs)} ago`;
|
||||
}
|
||||
|
||||
function describeAge(ageMs: number): string {
|
||||
return ageMs < 0 ? "never" : `${formatAge(ageMs)} ago`;
|
||||
}
|
||||
|
||||
function formatAge(ageMs: number): string {
|
||||
const seconds = Math.floor(ageMs / 1000);
|
||||
if (seconds < 60) return `${seconds}s`;
|
||||
const minutes = Math.floor(seconds / 60);
|
||||
if (minutes < 60) return `${minutes}m ${seconds % 60}s`;
|
||||
return `${Math.floor(minutes / 60)}h ${minutes % 60}m`;
|
||||
}
|
||||
Reference in new issue
Block a user