forked from Blendman974/faceclaw
Merge branch 'main' into rayneo-io-support
This commit is contained in:
commit
b2b6c5c8d8
36 files changed
+822
-39
No files matched your search
@@ -43,6 +43,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;
|
||||
@@ -121,6 +124,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)); }
|
||||
@@ -216,6 +222,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>();
|
||||
@@ -288,6 +295,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); }
|
||||
|
||||
@@ -379,6 +395,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);
|
||||
|
||||
@@ -30,6 +30,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;
|
||||
@@ -152,6 +159,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>();
|
||||
@@ -217,6 +225,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));
|
||||
},
|
||||
@@ -337,6 +353,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.
|
||||
|
||||
@@ -199,6 +199,14 @@ export class FaceclawVoiceControlBridge {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Capture could not be started for a reason other than a denied permission.
|
||||
* Without this the dialog keeps showing the idle "Voice control stopped."
|
||||
*/
|
||||
reportStartFailed(reason: string): void {
|
||||
this.setStatus("Voice input couldn't start.", reason);
|
||||
}
|
||||
|
||||
/** Begin push-to-talk capture (momentary; released with stopPushToTalk). */
|
||||
startPushToTalk(options: PushToTalkOptions): void {
|
||||
this.acquireCapture("ptt", options);
|
||||
|
||||
Reference in new issue
Block a user