Merge branch 'case-battery-ui'

This commit is contained in:
James Babcock committed 2026-11-02 00:31:41 -08:00
commit c896ce9ac8
31 files changed
+729 -35

No files matched your search

+21
View File
@@ -42,6 +42,9 @@ export type HeadsetBatteryState = {
ringChargingStatus?: number;
};
/** See the Android communicator's CaseBatteryState. */
export type CaseBatteryState = { battery: number | null; charging: boolean; docked: boolean };
export type FrameMetrics = {
paintMs: number;
transmitMs: number;
@@ -120,6 +123,9 @@ class SessionListener extends NSObject {
onBatteryStateHeadsetBatteryHeadsetChargingRingBatteryRingCharging(headsetBattery: number, headsetCharging: number, ringBattery: number, ringCharging: number): void {
this.bridge.handleBatteryState(Number(headsetBattery), Number(headsetCharging), Number(ringBattery), Number(ringCharging));
}
onCaseStateCaseBatteryCaseChargingCaseDocked(caseBattery: number, caseCharging: number, caseDocked: boolean): void {
this.bridge.handleCaseState(Number(caseBattery), Number(caseCharging), Boolean(caseDocked));
}
onSilentModeSilent(silent: boolean): void { this.bridge.handleSilentMode(Boolean(silent)); }
onWearStateWearing(wearing: boolean): void { this.bridge.handleWearState(Boolean(wearing)); }
onPhoneLockStateLocked(locked: boolean): void { this.bridge.handlePhoneLockState(Boolean(locked)); }
@@ -215,6 +221,7 @@ export class FaceclawCommunicatorBridge {
private readonly stateListeners = new Set<(state: CommunicatorState) => void>();
private readonly ringListeners = new Set<(event: RawInputEvent) => void>();
private readonly batteryListeners = new Set<(state: HeadsetBatteryState) => void>();
private readonly caseListeners = new Set<(state: CaseBatteryState) => void>();
private readonly silentModeListeners = new Set<(silent: boolean) => void>();
private readonly wearStateListeners = new Set<(wearing: boolean) => void>();
private readonly phoneLockStateListeners = new Set<(locked: boolean) => void>();
@@ -284,6 +291,15 @@ export class FaceclawCommunicatorBridge {
this.emitAsync(this.batteryListeners, { battery, chargingStatus, ringBattery, ringChargingStatus });
}
/** @internal */
handleCaseState(battery: number, charging: number, docked: boolean): void {
this.emitAsync(this.caseListeners, {
battery: Number.isInteger(battery) && battery >= 0 && battery <= 100 ? battery : null,
charging: charging > 0,
docked,
});
}
/** @internal */
handleSilentMode(silent: boolean): void { this.emitAsync(this.silentModeListeners, silent); }
@@ -375,6 +391,11 @@ export class FaceclawCommunicatorBridge {
return () => this.batteryListeners.delete(listener);
}
onCaseState(listener: (state: CaseBatteryState) => void): () => void {
this.caseListeners.add(listener);
return () => this.caseListeners.delete(listener);
}
onSilentMode(listener: (silent: boolean) => void): () => void {
this.silentModeListeners.add(listener);
return () => this.silentModeListeners.delete(listener);
+25
View File
@@ -29,6 +29,13 @@ export type HeadsetBatteryState = {
ringChargingStatus?: number;
};
/**
* A charging-case reading, as the glasses relay it. battery is 0..100, or null when the reading
* has none (the glasses are out of the case). charging (the case is on USB) is only known while
* docked.
*/
export type CaseBatteryState = { battery: number | null; charging: boolean; docked: boolean };
export type FrameMetrics = {
paintMs: number;
transmitMs: number;
@@ -151,6 +158,7 @@ export class FaceclawCommunicatorBridge {
private readonly stateListeners = new Set<(state: CommunicatorState) => void>();
private readonly ringListeners = new Set<(event: RawInputEvent) => void>();
private readonly batteryListeners = new Set<(state: HeadsetBatteryState) => void>();
private readonly caseListeners = new Set<(state: CaseBatteryState) => void>();
private readonly silentModeListeners = new Set<(silent: boolean) => void>();
private readonly wearStateListeners = new Set<(wearing: boolean) => void>();
private readonly phoneLockStateListeners = new Set<(locked: boolean) => void>();
@@ -214,6 +222,14 @@ export class FaceclawCommunicatorBridge {
};
this.emitAsync(this.batteryListeners, state);
},
onCaseState: (caseBattery: number, caseCharging: number, caseDocked: boolean) => {
const battery = Number(caseBattery);
this.emitAsync(this.caseListeners, {
battery: Number.isInteger(battery) && battery >= 0 && battery <= 100 ? battery : null,
charging: Number(caseCharging) > 0,
docked: Boolean(caseDocked),
});
},
onSilentMode: (silent: boolean) => {
this.emitAsync(this.silentModeListeners, Boolean(silent));
},
@@ -334,6 +350,15 @@ export class FaceclawCommunicatorBridge {
return () => this.batteryListeners.delete(listener);
}
/**
* Charging-case readings: read at session start and on docking, then pushed by the glasses
* on every change, including leaving the case.
*/
onCaseState(listener: (state: CaseBatteryState) => void): () => void {
this.caseListeners.add(listener);
return () => this.caseListeners.delete(listener);
}
/**
* Silent mode, toggled on the glasses by long-pressing both touchpads. While
* it is on the firmware ignores all input and blanks the display.