forked from Blendman974/faceclaw
Use extended CFW options for sleep/wake handling to wake from sleep without a flash of dashboard
This commit is contained in:
1 parent
e5649e9782
commit
8ffccad7f0
6 files changed
+507
-32
No files matched your search
@@ -35,6 +35,8 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
new BleProtocol.ImageTileOptions("img00", 10, 0, 0, 576, 288);
|
||||
|
||||
private static final String G2_SCREEN_WAKE_LOCK_TAG = "Faceclaw:G2Screen";
|
||||
private static final long FACECLAW_WAKE_LEASE_RENEW_MS = 45_000;
|
||||
private static final long FACECLAW_WAKE_CONTROL_WAIT_MS = 1_500;
|
||||
|
||||
private final Context appContext;
|
||||
private final PowerManager powerManager;
|
||||
@@ -70,6 +72,14 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
private volatile boolean firmwareDebugFlagsEnabled;
|
||||
private int firmwareDebugFlagsLastSent = -1;
|
||||
private boolean startupProbePending;
|
||||
// Desired ownership of CFW's fail-open idle-wake lease. This survives a
|
||||
// transport reconnect; the lease itself is volatile firmware state and is
|
||||
// re-acquired once both arms are ready.
|
||||
private boolean faceclawWakeLeaseEnabled;
|
||||
private long lastFaceclawWakeLeaseQueuedAtMs;
|
||||
private int faceclawWakeControlGeneration;
|
||||
private int faceclawWakeControlSentCount;
|
||||
private int faceclawWakePendingNonce = -1;
|
||||
|
||||
private long reconnectAfterMs;
|
||||
private long ringReconnectAfterMs;
|
||||
@@ -228,8 +238,8 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
int magic;
|
||||
synchronized (lock) {
|
||||
if (!running || !sessionReady) {
|
||||
logLine("skip G2 mic enable; session not ready");
|
||||
if (!running || !sessionReady || shutdownRequested || !fixedLayoutCreated || !warmedUp) {
|
||||
logLine("skip G2 mic enable; EvenHub display path not ready");
|
||||
return false;
|
||||
}
|
||||
audioPacketListener = listener;
|
||||
@@ -267,6 +277,81 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Acquire/renew or release CFW's volatile wake-takeover lease on both
|
||||
* arms. Delivery (not a protocol ACK) is awaited so a caller can ensure
|
||||
* the fail-open firmware policy is installed before suspending EvenHub.
|
||||
*/
|
||||
public boolean setFaceclawWakeLeaseEnabled(boolean enabled) {
|
||||
int generation;
|
||||
synchronized (lock) {
|
||||
faceclawWakeLeaseEnabled = enabled;
|
||||
if (!running || !sessionReady) {
|
||||
return !enabled;
|
||||
}
|
||||
generation = enqueueFaceclawWakeControlLocked(
|
||||
enabled ? BleProtocol.FACECLAW_WAKE_OP_ACQUIRE : BleProtocol.FACECLAW_WAKE_OP_RELEASE,
|
||||
0,
|
||||
true
|
||||
);
|
||||
if (!enabled) {
|
||||
faceclawWakePendingNonce = -1;
|
||||
}
|
||||
}
|
||||
interruptibleSleep.interrupt();
|
||||
return waitForFaceclawWakeControlDelivery(generation, FACECLAW_WAKE_CONTROL_WAIT_MS);
|
||||
}
|
||||
|
||||
/**
|
||||
* Wait until the recreated layout, warmup, and retained compositor frame
|
||||
* have all landed. If this wake came from CFW's deferred double tap, READY
|
||||
* is then sent to both arms to cancel their stock-dashboard fallback.
|
||||
*/
|
||||
public boolean awaitEvenHubSessionReady(int timeoutMs) {
|
||||
long deadline = SystemClock.elapsedRealtime() + Math.max(0, timeoutMs);
|
||||
int readyGeneration = 0;
|
||||
synchronized (lock) {
|
||||
while (running && sessionReady) {
|
||||
boolean frameReady = false;
|
||||
synchronized (desiredTilesLock) {
|
||||
frameReady = !desiredFingerprint.isEmpty()
|
||||
&& desiredFingerprint.equals(displayedFingerprint);
|
||||
}
|
||||
if (!shutdownRequested && fixedLayoutCreated && warmedUp && frameReady) {
|
||||
if (faceclawWakePendingNonce >= 0) {
|
||||
readyGeneration = enqueueFaceclawWakeControlLocked(
|
||||
BleProtocol.FACECLAW_WAKE_OP_READY,
|
||||
faceclawWakePendingNonce,
|
||||
true
|
||||
);
|
||||
faceclawWakePendingNonce = -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
long remaining = deadline - SystemClock.elapsedRealtime();
|
||||
if (remaining <= 0) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
lock.wait(Math.min(remaining, 100));
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (!running || !sessionReady) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (readyGeneration != 0) {
|
||||
interruptibleSleep.interrupt();
|
||||
if (!waitForFaceclawWakeControlDelivery(readyGeneration, FACECLAW_WAKE_CONTROL_WAIT_MS)) {
|
||||
logLine("wake READY delivery not confirmed before fallback deadline");
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable or disable the IMU (accelerometer) report stream. Fire-and-forget:
|
||||
* the control message is queued ahead of other traffic; readings arrive via
|
||||
@@ -527,6 +612,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
* desiredBmp.
|
||||
*/
|
||||
public boolean resumeEvenHubSession() {
|
||||
int claimGeneration = 0;
|
||||
synchronized (lock) {
|
||||
if (!running || !sessionReady || chargingMode) {
|
||||
logLine("skip EvenHub resume; transport not ready");
|
||||
@@ -535,13 +621,24 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
if (!shutdownRequested) {
|
||||
return true;
|
||||
}
|
||||
if (faceclawWakePendingNonce >= 0
|
||||
&& hasPendingOrInflightKindLocked("wake-lease-control")) {
|
||||
claimGeneration = faceclawWakeControlGeneration;
|
||||
}
|
||||
logLine("replaying session prelude for EvenHub resume");
|
||||
}
|
||||
|
||||
// A custom double-tap wake has only a short unclaimed fail-open
|
||||
// deadline. Let the worker put CLAIM on both arms before the direct
|
||||
// prelude write begins.
|
||||
if (claimGeneration != 0) {
|
||||
waitForFaceclawWakeControlDelivery(claimGeneration, 500);
|
||||
}
|
||||
|
||||
try {
|
||||
// Empty-name Cmd=9 tears down the whole plugin task, not just its
|
||||
// image container. Re-run the launch prelude before Cmd=0 CREATE.
|
||||
sendPrelude();
|
||||
sendPrelude(true);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
handleTransportFailure("EvenHub resume prelude interrupted");
|
||||
@@ -561,7 +658,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
warmedUp = false;
|
||||
startupProbePending = false;
|
||||
audioCaptureActive = false;
|
||||
clearAllMessagesLocked("EvenHub resume");
|
||||
clearAllMessagesPreservingWakeLeaseLocked("EvenHub resume");
|
||||
displayedFingerprint = "";
|
||||
displayedBmp = new byte[0];
|
||||
imageRetryAfterMs = 0;
|
||||
@@ -733,7 +830,33 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
G2Event event = null;
|
||||
synchronized (lock) {
|
||||
lastIncomingAtMs = SystemClock.elapsedRealtime();
|
||||
boolean faceclawWakeNotification = false;
|
||||
if (shutdownRequested
|
||||
&& frame.ok
|
||||
&& frame.sid == BleProtocol.SID_UI_SETTING
|
||||
&& address.equalsIgnoreCase(rightAddress)) {
|
||||
int wakeNonce = BleProtocol.parseFaceclawWakeEvent(frame.pb);
|
||||
if (wakeNonce >= 0) {
|
||||
faceclawWakePendingNonce = wakeNonce;
|
||||
enqueueFaceclawWakeControlLocked(
|
||||
BleProtocol.FACECLAW_WAKE_OP_CLAIM,
|
||||
wakeNonce,
|
||||
true
|
||||
);
|
||||
faceclawWakeNotification = true;
|
||||
lastConnectionOrInputAtMs = lastIncomingAtMs;
|
||||
event = new G2Event(
|
||||
"display-wake",
|
||||
"",
|
||||
BleProtocol.EVENT_DOUBLE_CLICK,
|
||||
0,
|
||||
0
|
||||
);
|
||||
logLine("claimed deferred dashboard wake nonce=" + wakeNonce);
|
||||
}
|
||||
}
|
||||
if (!faceclawWakeNotification
|
||||
&& shutdownRequested
|
||||
&& address.equalsIgnoreCase(rightAddress)
|
||||
&& BleProtocol.isDisplayWakeStateChange(frame)) {
|
||||
// With no EvenHub page, ring/arm double-taps are handled by the
|
||||
@@ -748,7 +871,9 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
0
|
||||
);
|
||||
}
|
||||
if (frame.ok && frame.sid == BleProtocol.SID_UI_SETTING) {
|
||||
if (!faceclawWakeNotification
|
||||
&& frame.ok
|
||||
&& frame.sid == BleProtocol.SID_UI_SETTING) {
|
||||
// Device-initiated settings push. It carries a magic the glasses
|
||||
// chose, so it would otherwise fall through to resolveAckLocked,
|
||||
// match nothing, and be logged as an unexpected ack.
|
||||
@@ -758,11 +883,16 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (frame.ok && frame.msgSeq >= 0 && frame.flag != BleProtocol.FLAG_NOTIFY && frame.flag != BleProtocol.FLAG_NOTIFY_ALT) {
|
||||
if (!faceclawWakeNotification
|
||||
&& frame.ok
|
||||
&& frame.msgSeq >= 0
|
||||
&& frame.flag != BleProtocol.FLAG_NOTIFY
|
||||
&& frame.flag != BleProtocol.FLAG_NOTIFY_ALT) {
|
||||
lastAckAtMs = lastIncomingAtMs;
|
||||
resolveAckLocked(frame.sid, frame.msgSeq, frame.pb);
|
||||
}
|
||||
if (event == null
|
||||
if (!faceclawWakeNotification
|
||||
&& event == null
|
||||
&& frame.ok
|
||||
&& address.equalsIgnoreCase(rightAddress)
|
||||
&& (frame.flag == BleProtocol.FLAG_NOTIFY || frame.flag == BleProtocol.FLAG_NOTIFY_ALT)) {
|
||||
@@ -928,6 +1058,15 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
consecutiveAckTimeouts = 0;
|
||||
lastAudioControlAckMagic = 0;
|
||||
audioCaptureActive = false;
|
||||
faceclawWakePendingNonce = -1;
|
||||
lastFaceclawWakeLeaseQueuedAtMs = 0;
|
||||
if (faceclawWakeLeaseEnabled) {
|
||||
enqueueFaceclawWakeControlLocked(
|
||||
BleProtocol.FACECLAW_WAKE_OP_ACQUIRE,
|
||||
0,
|
||||
true
|
||||
);
|
||||
}
|
||||
}
|
||||
setStateDisplay("connected", "Connected.");
|
||||
logLine("session ready");
|
||||
@@ -1066,8 +1205,16 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
|
||||
private void sendPrelude() throws InterruptedException {
|
||||
sendPrelude(false);
|
||||
}
|
||||
|
||||
private void sendPrelude(boolean preserveWakeLeaseControls) throws InterruptedException {
|
||||
synchronized (lock) {
|
||||
clearAllMessagesLocked("prelude");
|
||||
if (preserveWakeLeaseControls) {
|
||||
clearAllMessagesPreservingWakeLeaseLocked("prelude");
|
||||
} else {
|
||||
clearAllMessagesLocked("prelude");
|
||||
}
|
||||
}
|
||||
long now = SystemClock.elapsedRealtime();
|
||||
OutboundMessage prelude = messageBuilder.prelude();
|
||||
@@ -1110,6 +1257,16 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
maybeFinishNoChangeDesiredFrame();
|
||||
|
||||
synchronized (lock) {
|
||||
if (faceclawWakeLeaseEnabled
|
||||
&& sessionReady
|
||||
&& now - lastFaceclawWakeLeaseQueuedAtMs >= FACECLAW_WAKE_LEASE_RENEW_MS
|
||||
&& !hasPendingOrInflightKindLocked("wake-lease-control")) {
|
||||
enqueueFaceclawWakeControlLocked(
|
||||
BleProtocol.FACECLAW_WAKE_OP_ACQUIRE,
|
||||
0,
|
||||
false
|
||||
);
|
||||
}
|
||||
if (!inFlightMessages.isEmpty()) {
|
||||
OutboundMessage oldest = inFlightMessages.peekFirst();
|
||||
if (oldest != null && oldest.ackDeadlineAtMs <= now) {
|
||||
@@ -1373,6 +1530,10 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
message.sentAtMs = sentAtMs;
|
||||
message.ackDeadlineAtMs = sentAtMs + message.ackTimeoutMs;
|
||||
logImageUpdateSendLandmarkLocked(message);
|
||||
if (result && message.onSent != null) {
|
||||
message.onSent.run();
|
||||
lock.notifyAll();
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -1942,6 +2103,61 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Replace any stale lease control with one right-arm and one left-arm
|
||||
* fire-and-forget write. With priority=true the right arm is sent first so
|
||||
* CLAIM reaches the lens that originated the deferred wake immediately.
|
||||
*/
|
||||
private int enqueueFaceclawWakeControlLocked(int operation, int nonce, boolean priority) {
|
||||
clearMessagesOfKindLocked("wake-lease-control");
|
||||
final int generation = ++faceclawWakeControlGeneration;
|
||||
faceclawWakeControlSentCount = 0;
|
||||
if (operation == BleProtocol.FACECLAW_WAKE_OP_ACQUIRE) {
|
||||
lastFaceclawWakeLeaseQueuedAtMs = SystemClock.elapsedRealtime();
|
||||
}
|
||||
Runnable onSent = () -> {
|
||||
if (faceclawWakeControlGeneration == generation) {
|
||||
faceclawWakeControlSentCount += 1;
|
||||
}
|
||||
};
|
||||
OutboundMessage right = messageBuilder.faceclawWakeControl(operation, nonce, false);
|
||||
OutboundMessage left = messageBuilder.faceclawWakeControl(operation, nonce, true);
|
||||
right.onSent = onSent;
|
||||
left.onSent = onSent;
|
||||
if (priority) {
|
||||
pendingMessages.addFirst(left);
|
||||
pendingMessages.addFirst(right);
|
||||
} else {
|
||||
pendingMessages.addLast(right);
|
||||
pendingMessages.addLast(left);
|
||||
}
|
||||
logLine("queue " + right.label + " + L");
|
||||
return generation;
|
||||
}
|
||||
|
||||
private boolean waitForFaceclawWakeControlDelivery(int generation, long timeoutMs) {
|
||||
long deadline = SystemClock.elapsedRealtime() + Math.max(0, timeoutMs);
|
||||
synchronized (lock) {
|
||||
while (running
|
||||
&& sessionReady
|
||||
&& faceclawWakeControlGeneration == generation
|
||||
&& faceclawWakeControlSentCount < 2) {
|
||||
long remaining = deadline - SystemClock.elapsedRealtime();
|
||||
if (remaining <= 0) {
|
||||
break;
|
||||
}
|
||||
try {
|
||||
lock.wait(Math.min(remaining, 100));
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
return faceclawWakeControlGeneration == generation
|
||||
&& faceclawWakeControlSentCount >= 2;
|
||||
}
|
||||
}
|
||||
|
||||
private void clearMessagesOfKindLocked(String kind) {
|
||||
Iterator<OutboundMessage> pendingIterator = pendingMessages.iterator();
|
||||
while (pendingIterator.hasNext()) {
|
||||
@@ -1983,6 +2199,36 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
lastEnqueuedFingerprint = "";
|
||||
}
|
||||
|
||||
/**
|
||||
* A custom wake queues CLAIM before NativeScript asks for a resume. Keep
|
||||
* that private control while flushing stale EvenHub traffic around the
|
||||
* direct prelude write.
|
||||
*/
|
||||
private void clearAllMessagesPreservingWakeLeaseLocked(String reason) {
|
||||
Iterator<OutboundMessage> pendingIterator = pendingMessages.iterator();
|
||||
while (pendingIterator.hasNext()) {
|
||||
OutboundMessage message = pendingIterator.next();
|
||||
if ("wake-lease-control".equals(message.kind)) {
|
||||
continue;
|
||||
}
|
||||
pendingIterator.remove();
|
||||
discardPrewriteIfMatchesLocked(message);
|
||||
discardImageUpdateStatsLocked(
|
||||
message.imageUpdateId,
|
||||
"pending messages cleared: " + reason
|
||||
);
|
||||
magicPool.release(
|
||||
message.sid,
|
||||
message.magic,
|
||||
message.label,
|
||||
"cleared pending: " + reason
|
||||
);
|
||||
}
|
||||
clearInFlightMessagesLocked(reason);
|
||||
lastEnqueuedImageBmp = new byte[0];
|
||||
lastEnqueuedFingerprint = "";
|
||||
}
|
||||
|
||||
/** Any image update whose fragments are still queued (not yet sent). */
|
||||
private boolean hasPendingImageLocked() {
|
||||
for (OutboundMessage message : pendingMessages) {
|
||||
@@ -2058,6 +2304,9 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
imageRetryAfterMs = 0;
|
||||
displayedFingerprint = "";
|
||||
displayedBmp = new byte[0];
|
||||
faceclawWakePendingNonce = -1;
|
||||
lastFaceclawWakeLeaseQueuedAtMs = 0;
|
||||
faceclawWakeControlSentCount = 0;
|
||||
clearAllMessagesLocked("transport failure: " + reason);
|
||||
reconnectAfterMs = SystemClock.elapsedRealtime() + ConnectionOptions.RECONNECT_DELAY_MS;
|
||||
bleManager.disconnect(rightAddress);
|
||||
@@ -2089,6 +2338,9 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable {
|
||||
lastAudioControlAckMagic = 0;
|
||||
audioCaptureActive = false;
|
||||
audioPacketListener = null;
|
||||
faceclawWakePendingNonce = -1;
|
||||
lastFaceclawWakeLeaseQueuedAtMs = 0;
|
||||
faceclawWakeControlSentCount = 0;
|
||||
displayedFingerprint = "";
|
||||
displayedBmp = new byte[0];
|
||||
// Deliberately not clearing silentMode: it is a property of the glasses,
|
||||
|
||||
@@ -34,6 +34,16 @@ public class BleProtocol {
|
||||
public static final int SID_STATE_CHANGE = 0x0d;
|
||||
/** G2SettingPackage.commandId for device-initiated pushes (vs. 2 = app read). */
|
||||
public static final int SETTINGS_CMD_DEVICE_SEND_TO_APP = 3;
|
||||
// Private Faceclaw/CFW wake-takeover protocol. Both payloads are unknown
|
||||
// protobuf fields to stock implementations, so they are safely ignored.
|
||||
public static final int FACECLAW_WAKE_CONTROL_FIELD = 101;
|
||||
public static final int FACECLAW_WAKE_EVENT_FIELD = 102;
|
||||
public static final int FACECLAW_WAKE_OP_ACQUIRE = 1;
|
||||
public static final int FACECLAW_WAKE_OP_RELEASE = 2;
|
||||
public static final int FACECLAW_WAKE_OP_CLAIM = 3;
|
||||
public static final int FACECLAW_WAKE_OP_READY = 4;
|
||||
private static final int FACECLAW_WAKE_EVENT = 1;
|
||||
private static final int FACECLAW_WAKE_PROTOCOL_VERSION = 1;
|
||||
// UI_FOREGROUND_EVEN_AI_ID: the stock "Even AI" assistant app. It is a
|
||||
// FOREGROUND app, whereas EvenHub (and therefore faceclaw) is the
|
||||
// BACKGROUND app -- which is why an Even AI launch draws over us.
|
||||
@@ -303,6 +313,47 @@ public class BleProtocol {
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the CFW-only wake lease control package. Magic zero deliberately
|
||||
* makes this fire-and-forget: the firmware consumes field 101 before its
|
||||
* stock nanopb decoder discards the unknown field.
|
||||
*/
|
||||
public static byte[] buildFaceclawWakeControl(int operation, int nonce) {
|
||||
byte[] control = new byte[] {
|
||||
'F',
|
||||
'C',
|
||||
(byte) FACECLAW_WAKE_PROTOCOL_VERSION,
|
||||
(byte) operation,
|
||||
(byte) (nonce & 0xff),
|
||||
(byte) ((nonce >>> 8) & 0xff)
|
||||
};
|
||||
return concat(CollectionUtils.listOf(
|
||||
encodeVarintField(1, 1),
|
||||
encodeVarintField(2, 0),
|
||||
encodeBytesField(FACECLAW_WAKE_CONTROL_FIELD, control)
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the uint16 wake nonce from a CFW field-102 notification, or -1
|
||||
* when this is an ordinary settings frame.
|
||||
*/
|
||||
public static int parseFaceclawWakeEvent(byte[] pb) {
|
||||
if (pb == null) {
|
||||
return -1;
|
||||
}
|
||||
byte[] event = readFieldBytes(stripTrailingCrc(pb), FACECLAW_WAKE_EVENT_FIELD);
|
||||
if (event == null
|
||||
|| event.length != 6
|
||||
|| event[0] != 'F'
|
||||
|| event[1] != 'C'
|
||||
|| (event[2] & 0xff) != FACECLAW_WAKE_PROTOCOL_VERSION
|
||||
|| (event[3] & 0xff) != FACECLAW_WAKE_EVENT) {
|
||||
return -1;
|
||||
}
|
||||
return (event[4] & 0xff) | ((event[5] & 0xff) << 8);
|
||||
}
|
||||
|
||||
public static BatterySnapshot parseSettingsBattery(byte[] pb) {
|
||||
byte[] root = stripTrailingCrc(pb);
|
||||
byte[] request = readFieldBytes(root, 4);
|
||||
|
||||
@@ -196,4 +196,18 @@ public class MessageBuilder {
|
||||
false
|
||||
);
|
||||
}
|
||||
|
||||
public OutboundMessage faceclawWakeControl(int operation, int nonce, boolean leftArm) {
|
||||
return new OutboundMessage(
|
||||
"wake-lease-control",
|
||||
"wake lease op=" + operation + " nonce=" + nonce + (leftArm ? " L" : " R"),
|
||||
BleProtocol.SID_UI_SETTING,
|
||||
BleProtocol.FLAG_REQUEST,
|
||||
0,
|
||||
BleProtocol.buildFaceclawWakeControl(operation, nonce),
|
||||
ACK_TIMEOUT_MS,
|
||||
-1,
|
||||
leftArm
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ public final class OutboundMessage {
|
||||
long writeStartedAtMs;
|
||||
long ackDeadlineAtMs;
|
||||
byte[] ackPayload = new byte[0];
|
||||
Runnable onSent;
|
||||
Runnable onAck;
|
||||
Runnable onTimeout;
|
||||
|
||||
|
||||
+161
-24
@@ -1,5 +1,12 @@
|
||||
import { ImageSource } from "@nativescript/core";
|
||||
import { EvenAIStatusName, EventSourceType, EventSourceTypeName, OsEventTypeList, OsEventTypeName } from "./events";
|
||||
import {
|
||||
EvenAIStatus,
|
||||
EvenAIStatusName,
|
||||
EventSourceType,
|
||||
EventSourceTypeName,
|
||||
OsEventTypeList,
|
||||
OsEventTypeName,
|
||||
} from "./events";
|
||||
import { loadDeviceAddresses } from "./device-addresses";
|
||||
import { ensureBlePermissions, ensureVoicePermissions } from "./android-permissions";
|
||||
import { FaceclawCommunicatorBridge, type FrameMetrics, type RawInputEvent } from "../native/faceclaw-communicator";
|
||||
@@ -82,6 +89,7 @@ import {
|
||||
suspendEvenHubWhenScreenOffSetting,
|
||||
systemCardNameSetting,
|
||||
voiceProviderSetting,
|
||||
wakeWordActionSetting,
|
||||
type ConfigSettingString,
|
||||
} from "../ui/dashboard-settings";
|
||||
import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } from "../native/battery-optimization";
|
||||
@@ -121,6 +129,7 @@ const SHELL_REFRESH_INTERVAL_MS = 60_000;
|
||||
const PREVIEW_INTERVAL_MS = 1_000;
|
||||
const SCREEN_TIMEOUT_CHECK_MS = 1_000;
|
||||
const EVENHUB_SCREEN_OFF_SUSPEND_DELAY_MS = 5_000;
|
||||
const EVENHUB_WAKE_READY_TIMEOUT_MS = 4_500;
|
||||
const FOREGROUND_NOTIFICATION_MIN_UPDATE_MS = 30_000;
|
||||
const FRAME_TRANSMIT_BACKPRESSURE_TIMEOUT_MS = 6_000;
|
||||
const CONNECTED_PREVIEW_MIN_UPDATE_MS = 1_000;
|
||||
@@ -184,6 +193,9 @@ class DashboardController {
|
||||
private screenTimeoutTimer: ReturnType<typeof setInterval> | null = null;
|
||||
private evenHubSuspendTimer: ReturnType<typeof setTimeout> | null = null;
|
||||
private evenHubSessionSuspended = false;
|
||||
private evenHubResumePromise: Promise<boolean> | null = null;
|
||||
private faceclawWakeLeaseSupported = false;
|
||||
private faceclawWakeLeaseState: boolean | null = null;
|
||||
private offState: (() => void) | null = null;
|
||||
private offLog: (() => void) | null = null;
|
||||
private offRing: (() => void) | null = null;
|
||||
@@ -283,28 +295,16 @@ class DashboardController {
|
||||
}
|
||||
|
||||
private handleScreenStateChanged(on: boolean): void {
|
||||
const communicator = this.communicator;
|
||||
if (!communicator) return;
|
||||
|
||||
if (on) {
|
||||
this.cancelEvenHubSuspendTimer();
|
||||
const shouldResumeEvenHub = this.evenHubSessionSuspended;
|
||||
this.evenHubSessionSuspended = false;
|
||||
void (async () => {
|
||||
await communicator.setG2ScreenOn(true);
|
||||
// Restore the retained frame before allowing Java's session driver to
|
||||
// recreate the layout, so its first real image is the current screen
|
||||
// rather than the black sleep frame.
|
||||
await communicator.setScreenBlanked(false);
|
||||
if (shouldResumeEvenHub) {
|
||||
await communicator.resumeEvenHubSession();
|
||||
}
|
||||
})().catch((error) => {
|
||||
void this.ensureEvenHubSessionActive().catch((error) => {
|
||||
this.appendLog(`screen wake failed: ${this.formatError(error)}`);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const communicator = this.communicator;
|
||||
if (!communicator) return;
|
||||
// Blanking is a compositor-level flag so worker-window surfaces go dark
|
||||
// too; retained state survives while the EvenHub page is absent.
|
||||
void (async () => {
|
||||
@@ -316,7 +316,65 @@ class DashboardController {
|
||||
this.scheduleEvenHubSuspend();
|
||||
}
|
||||
|
||||
/**
|
||||
* The single wake barrier for every source: restore the EvenHub lifecycle,
|
||||
* unblank the retained compositor, and resolve only after that frame is
|
||||
* visible. Concurrent display-wake, shell, and wakeword callbacks share the
|
||||
* same operation.
|
||||
*/
|
||||
private ensureEvenHubSessionActive(): Promise<boolean> {
|
||||
if (this.evenHubResumePromise) return this.evenHubResumePromise;
|
||||
const communicator = this.communicator;
|
||||
if (!communicator || this.phase === "charging" || this.phase === "disconnected") {
|
||||
return Promise.resolve(false);
|
||||
}
|
||||
|
||||
const operation = (async () => {
|
||||
await communicator.setG2ScreenOn(true);
|
||||
if (!(await communicator.resumeEvenHubSession())) {
|
||||
return false;
|
||||
}
|
||||
// Resume first: setScreenBlanked(false) then recomposites retained state
|
||||
// as the desired first frame for the fresh layout.
|
||||
await communicator.setScreenBlanked(false);
|
||||
const ready = await communicator.awaitEvenHubSessionReady(EVENHUB_WAKE_READY_TIMEOUT_MS);
|
||||
if (ready && this.communicator === communicator) {
|
||||
this.evenHubSessionSuspended = false;
|
||||
}
|
||||
return ready;
|
||||
})();
|
||||
this.evenHubResumePromise = operation;
|
||||
const clearOperation = () => {
|
||||
if (this.evenHubResumePromise === operation) {
|
||||
this.evenHubResumePromise = null;
|
||||
}
|
||||
};
|
||||
void operation.then(clearOperation, clearOperation);
|
||||
return operation;
|
||||
}
|
||||
|
||||
private desiredFaceclawWakeLeaseState(): boolean {
|
||||
return suspendEvenHubWhenScreenOffSetting.get() && this.faceclawWakeLeaseSupported;
|
||||
}
|
||||
|
||||
private async syncFaceclawWakeLease(
|
||||
communicator = this.communicator,
|
||||
force = false,
|
||||
): Promise<boolean> {
|
||||
if (!communicator || communicator !== this.communicator) return false;
|
||||
const enabled = this.desiredFaceclawWakeLeaseState();
|
||||
if (!force && this.faceclawWakeLeaseState === enabled) return true;
|
||||
const applied = await communicator.setFaceclawWakeLeaseEnabled(enabled);
|
||||
if (this.communicator === communicator) {
|
||||
this.faceclawWakeLeaseState = applied || !enabled ? enabled : null;
|
||||
}
|
||||
return applied;
|
||||
}
|
||||
|
||||
private syncEvenHubScreenOffSetting(): void {
|
||||
void this.syncFaceclawWakeLease().catch((error) => {
|
||||
this.appendLog(`wake takeover lease sync failed: ${this.formatError(error)}`);
|
||||
});
|
||||
if (suspendEvenHubWhenScreenOffSetting.get() && !shell.isScreenOn()) {
|
||||
this.scheduleEvenHubSuspend();
|
||||
return;
|
||||
@@ -328,11 +386,17 @@ class DashboardController {
|
||||
// Turning the experiment off restores the legacy all-black page even if
|
||||
// the screen remains asleep.
|
||||
const communicator = this.communicator;
|
||||
this.evenHubSessionSuspended = false;
|
||||
if (!communicator) return;
|
||||
void communicator.resumeEvenHubSession().catch((error) => {
|
||||
this.appendLog(`EvenHub resume failed: ${this.formatError(error)}`);
|
||||
});
|
||||
void communicator
|
||||
.resumeEvenHubSession()
|
||||
.then((resumed) => {
|
||||
if (resumed && this.communicator === communicator) {
|
||||
this.evenHubSessionSuspended = false;
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
this.appendLog(`EvenHub resume failed: ${this.formatError(error)}`);
|
||||
});
|
||||
}
|
||||
|
||||
private scheduleEvenHubSuspend(): void {
|
||||
@@ -359,10 +423,30 @@ class DashboardController {
|
||||
return;
|
||||
}
|
||||
|
||||
this.evenHubSessionSuspended = true;
|
||||
void communicator
|
||||
.suspendEvenHubSession()
|
||||
void (async () => {
|
||||
if (this.faceclawWakeLeaseSupported) {
|
||||
// Refresh immediately before teardown so the first suspended wake
|
||||
// cannot race an old lease's expiry.
|
||||
const leaseReady = await this.syncFaceclawWakeLease(communicator, true);
|
||||
if (!leaseReady) {
|
||||
this.appendLog("EvenHub suspend deferred; wake takeover lease was not delivered");
|
||||
this.scheduleEvenHubSuspend();
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (
|
||||
!suspendEvenHubWhenScreenOffSetting.get() ||
|
||||
shell.isScreenOn() ||
|
||||
this.phase !== "connected" ||
|
||||
this.communicator !== communicator
|
||||
) {
|
||||
return;
|
||||
}
|
||||
this.evenHubSessionSuspended = true;
|
||||
return communicator.suspendEvenHubSession();
|
||||
})()
|
||||
.then((suspended) => {
|
||||
if (suspended === undefined) return;
|
||||
if (suspended) {
|
||||
this.appendLog("EvenHub session suspended while screen is off");
|
||||
return;
|
||||
@@ -558,6 +642,9 @@ class DashboardController {
|
||||
);
|
||||
|
||||
let communicator: FaceclawCommunicatorBridge | null = null;
|
||||
this.faceclawWakeLeaseSupported = false;
|
||||
this.faceclawWakeLeaseState = null;
|
||||
this.evenHubResumePromise = null;
|
||||
|
||||
try {
|
||||
await ensureBlePermissions();
|
||||
@@ -655,6 +742,17 @@ class DashboardController {
|
||||
(info.capabilities ? ` caps="${info.capabilities}"` : " (no CFW capability string)"),
|
||||
);
|
||||
const warning = firmwareIncompatibilityMessage(info) ?? "";
|
||||
const wakeLeaseSupported = info.capabilities
|
||||
.trim()
|
||||
.split(/\s+/)
|
||||
.includes("wakelease");
|
||||
if (wakeLeaseSupported !== this.faceclawWakeLeaseSupported) {
|
||||
this.faceclawWakeLeaseSupported = wakeLeaseSupported;
|
||||
this.faceclawWakeLeaseState = null;
|
||||
void this.syncFaceclawWakeLease().catch((error) => {
|
||||
this.appendLog(`wake takeover lease sync failed: ${this.formatError(error)}`);
|
||||
});
|
||||
}
|
||||
if (warning !== this.firmwareWarningMessage) {
|
||||
this.firmwareWarningMessage = warning;
|
||||
if (warning) {
|
||||
@@ -735,9 +833,13 @@ class DashboardController {
|
||||
await nightscoutBridge.stop().catch(() => {});
|
||||
voiceControlBridge.stop();
|
||||
if (communicator) {
|
||||
await communicator.setFaceclawWakeLeaseEnabled(false).catch(() => false);
|
||||
await communicator.close().catch(() => {});
|
||||
}
|
||||
this.communicator = null;
|
||||
this.faceclawWakeLeaseSupported = false;
|
||||
this.faceclawWakeLeaseState = null;
|
||||
this.evenHubResumePromise = null;
|
||||
this.clearDashboardTimer();
|
||||
stopForegroundNotification();
|
||||
this.setPhase("disconnected");
|
||||
@@ -777,8 +879,16 @@ class DashboardController {
|
||||
const communicator = this.communicator;
|
||||
this.communicator = null;
|
||||
this.evenHubSessionSuspended = false;
|
||||
this.evenHubResumePromise = null;
|
||||
|
||||
try {
|
||||
const leaseReleased = await communicator?.setFaceclawWakeLeaseEnabled(false).catch((error) => {
|
||||
this.appendLog(`wake takeover lease release failed: ${this.formatError(error)}`);
|
||||
return false;
|
||||
});
|
||||
if (leaseReleased === true) {
|
||||
this.faceclawWakeLeaseState = false;
|
||||
}
|
||||
const shutdownAcked = await communicator?.sendShutdown(0).catch((error) => {
|
||||
this.appendLog(`shutdown command failed: ${this.formatError(error)}`);
|
||||
return false;
|
||||
@@ -794,6 +904,8 @@ class DashboardController {
|
||||
await communicator?.close().catch(() => {});
|
||||
} finally {
|
||||
stopForegroundNotification();
|
||||
this.faceclawWakeLeaseSupported = false;
|
||||
this.faceclawWakeLeaseState = null;
|
||||
this.setPhase("disconnected");
|
||||
this.setStatus("Disconnected.");
|
||||
this.appendLog("Disconnected from the glasses.");
|
||||
@@ -927,6 +1039,23 @@ class DashboardController {
|
||||
let frameOwned = false;
|
||||
try {
|
||||
const inputEvent = rawInputEventToInputEvent(event);
|
||||
const wakewordShouldWake =
|
||||
event.kind === "even-ai" &&
|
||||
event.eventType === EvenAIStatus.EVEN_AI_WAKE_UP &&
|
||||
wakeWordActionSetting.get() !== "off";
|
||||
const displayShouldWake = event.kind === "display-wake";
|
||||
let shellPreWoke = false;
|
||||
if (wakewordShouldWake || displayShouldWake) {
|
||||
if (!shell.isScreenOn()) {
|
||||
shellPreWoke = shell.wake("sidebar");
|
||||
}
|
||||
if (shellPreWoke || this.evenHubSessionSuspended || this.evenHubResumePromise) {
|
||||
const ready = await this.ensureEvenHubSessionActive();
|
||||
if (!ready) {
|
||||
this.appendLog(`EvenHub wake barrier timed out for ${event.kind}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
frameTimings.spanStart(frameId, "handle-input");
|
||||
let outcome: ShellInputOutcome;
|
||||
try {
|
||||
@@ -936,6 +1065,9 @@ class DashboardController {
|
||||
} finally {
|
||||
frameTimings.spanEnd(frameId, "handle-input");
|
||||
}
|
||||
if (shellPreWoke && !outcome.shell) {
|
||||
outcome = { ...outcome, shell: true };
|
||||
}
|
||||
|
||||
if (event.kind === "sys-event") {
|
||||
this.lastSys = `${sourceName(event.eventSource)}/${eventName(event.eventType)}`;
|
||||
@@ -1269,7 +1401,12 @@ class DashboardController {
|
||||
const normalized = keyword.trim();
|
||||
if (normalized.length === 0) return;
|
||||
this.appendLog(`wake-word detected: ${normalized}`);
|
||||
if (shell.wake("sidebar")) {
|
||||
const woke = shell.wake("sidebar");
|
||||
if (woke) {
|
||||
const ready = await this.ensureEvenHubSessionActive();
|
||||
if (!ready) {
|
||||
this.appendLog("EvenHub wake barrier timed out for phone wakeword");
|
||||
}
|
||||
this.requestShellRender();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -495,6 +495,26 @@ export class FaceclawCommunicatorBridge {
|
||||
return this.enqueueJavaCall(() => Boolean(this.communicator.resumeEvenHubSession()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Own CFW's fail-open idle-wake policy while the experimental screen-off
|
||||
* suspension mode is enabled. Returns after both arm writes complete.
|
||||
*/
|
||||
async setFaceclawWakeLeaseEnabled(enabled: boolean): Promise<boolean> {
|
||||
return this.enqueueJavaCall(() =>
|
||||
Boolean(this.communicator.setFaceclawWakeLeaseEnabled(enabled)),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve only once the recreated layout, image warmup, and retained frame
|
||||
* are visible. CFW's deferred-dashboard READY is emitted from this barrier.
|
||||
*/
|
||||
async awaitEvenHubSessionReady(timeoutMs: number): Promise<boolean> {
|
||||
return this.enqueueJavaCall(() =>
|
||||
Boolean(this.communicator.awaitEvenHubSessionReady(Math.round(nonNegativeNumber(timeoutMs)))),
|
||||
);
|
||||
}
|
||||
|
||||
/** Play a CFW mode-5 kind-4 tone sequence (complete wire payload). */
|
||||
async playBuzzerSequence(payload: Uint8Array): Promise<void> {
|
||||
const snapshot = new Uint8Array(payload);
|
||||
|
||||
Reference in new issue
Block a user