forked from Blendman974/faceclaw
Case battery: stop showing stale charging; read after the layout
Review fixes for the charging-case battery: - The case reports whether the glasses are docked. An empty caseInfo (the reply out of the case) now parses as "not docked, no level" instead of nothing, and undocking is reported even when the level and charge state are unchanged. TS keeps the last level but clears caseCharging while the glasses are out of the case. - The phone line shows the charging mark only while it is live: G2 and Case only with a link to the glasses (connected or charging), and Case only while docked. Levels stay as the last known ones. - The session-start case read waits until the layout is up, so a firmware that ignored it could no longer hold up the first frame. When the glasses are already charging at connect, the charging-mode read is the only one; the old duplicate read and its "late ACK" log are gone. - Case dedup state resets on every connect, as wearState does, so each session's read reaches TS. - caseCharging uses > 0 like the headset, and is normalized to 0/1. - iOS now feeds the reading into the shell battery state, and the assistant's describeState includes the case level. - The batteryLine accessors move above connectionStatusLabel's doc comment.
This commit is contained in:
1 parent
9c0535014a
commit
fa7f33bfe8
15 files changed
+199
-61
No files matched your search
@@ -43,7 +43,7 @@ export type HeadsetBatteryState = {
|
||||
};
|
||||
|
||||
/** See the Android communicator's CaseBatteryState. */
|
||||
export type CaseBatteryState = { battery: number; charging: boolean };
|
||||
export type CaseBatteryState = { battery: number | null; charging: boolean; docked: boolean };
|
||||
|
||||
export type FrameMetrics = {
|
||||
paintMs: number;
|
||||
@@ -123,8 +123,8 @@ 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));
|
||||
}
|
||||
onCaseStateCaseBatteryCaseCharging(caseBattery: number, caseCharging: number): void {
|
||||
this.bridge.handleCaseState(Number(caseBattery), Number(caseCharging) === 1);
|
||||
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)); }
|
||||
@@ -288,8 +288,12 @@ export class FaceclawCommunicatorBridge {
|
||||
}
|
||||
|
||||
/** @internal */
|
||||
handleCaseState(battery: number, charging: boolean): void {
|
||||
this.emitAsync(this.caseListeners, { battery, charging });
|
||||
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 */
|
||||
|
||||
@@ -29,8 +29,12 @@ export type HeadsetBatteryState = {
|
||||
ringChargingStatus?: number;
|
||||
};
|
||||
|
||||
/** The charging case's level (0..100) and whether it is itself charging, as the glasses relay it. */
|
||||
export type CaseBatteryState = { battery: number; charging: boolean };
|
||||
/**
|
||||
* 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;
|
||||
@@ -216,8 +220,13 @@ export class FaceclawCommunicatorBridge {
|
||||
};
|
||||
this.emitAsync(this.batteryListeners, state);
|
||||
},
|
||||
onCaseState: (caseBattery: number, caseCharging: number) => {
|
||||
this.emitAsync(this.caseListeners, { battery: Number(caseBattery), charging: Number(caseCharging) === 1 });
|
||||
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));
|
||||
@@ -339,7 +348,10 @@ export class FaceclawCommunicatorBridge {
|
||||
return () => this.batteryListeners.delete(listener);
|
||||
}
|
||||
|
||||
/** Charging-case readings: read on docking, then pushed by the glasses on every change. */
|
||||
/**
|
||||
* 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);
|
||||
|
||||
Reference in new issue
Block a user