Merge branch 'main' of https://github.com/jimrandomh/faceclaw into calculator

This commit is contained in:
James Babcock committed 2026-08-29 20:13:48 -07:00
commit e1c4628566
46 files changed
+1445 -304

No files matched your search

+19 -6
View File
@@ -328,13 +328,13 @@ export const watchCanUnlockSetting = new ConfigSettingBoolean({
"Let the watch unlock the glasses' lock screen (which otherwise waits for the phone to be unlocked). Your watch is on your wrist; turn this off if you would rather it stay a phone-only unlock.",
});
export const watchWakesDisplaySetting = new ConfigSettingBoolean({
id: "watch-wakes-display",
label: "Watch input wakes display",
storageKey: "watch.wakesDisplay",
defaultValue: true,
export const watchCrownClockwiseNextSetting = new ConfigSettingBoolean({
id: "watch-crown-clockwise-next",
label: "Clockwise crown = next",
storageKey: "watch.crownClockwiseNext",
defaultValue: false,
description:
"Any gesture from the watch turns the glasses display on (the ring only wakes it with a double-tap). Off: watch input is ignored while the display is off, as ring input is.",
"Choose which crown direction moves to the next item. Off: clockwise moves to the previous item. On: clockwise moves to the next item.",
});
export const watchMirrorAssistantSetting = new ConfigSettingBoolean({
@@ -390,6 +390,19 @@ export const suspendEvenHubWhenScreenOffSetting = new ConfigSettingBoolean({
description: "Suspend the EvenHub session while the display is off. This significantly improves battery life, but increases the latency of waking the screen.",
});
export type RingConnectionMode = "glasses" | "direct";
export const ringConnectionModeSetting = new ConfigSettingEnum<RingConnectionMode>({
id: "ring-connection-mode",
label: "Ring connection",
storageKey: "developer.ringConnectionMode",
defaultValue: "glasses",
values: ["glasses", "direct"],
formatValue: (value) => (value === "direct" ? "Direct" : "Only via glasses"),
description:
"How R1 ring input reaches the phone. Only via glasses: the ring's own link to the glasses carries its gestures, and the phone never opens a Bluetooth connection to the ring. Direct: also connect to the ring from the phone (currently unreliable). Takes effect on the next connection to the glasses.",
});
export type VoiceProvider = "onboard" | "elevenlabs" | "whisper" | "soniox";
const voiceProviderLabels: Record<VoiceProvider, string> = {
+6 -2
View File
@@ -41,6 +41,7 @@ import {
mirrorTouchSetting,
openAiApiKeySetting,
previewColorSetting,
ringConnectionModeSetting,
roamApiTokenSetting,
roamGraphNameSetting,
sonioxApiKeySetting,
@@ -60,9 +61,9 @@ import {
screenTimeoutSetting,
wakeWordActionSetting,
watchCanUnlockSetting,
watchCrownClockwiseNextSetting,
watchMirrorAssistantSetting,
watchRemoteEnabledSetting,
watchWakesDisplaySetting,
} from "../dashboard-settings";
import { wearBridge } from "../../native/wear-bridge";
import { SettingsPanelLayer, type SettingsSection } from "./settings-panel";
@@ -167,7 +168,7 @@ function settingsSections(): SettingsSection[] {
// a watch running the companion app is currently reachable.
items: [
toggleSettingMenuItem(watchRemoteEnabledSetting),
toggleSettingMenuItem(watchWakesDisplaySetting),
toggleSettingMenuItem(watchCrownClockwiseNextSetting),
toggleSettingMenuItem(watchCanUnlockSetting),
toggleSettingMenuItem(watchMirrorAssistantSetting),
],
@@ -176,6 +177,9 @@ function settingsSections(): SettingsSection[] {
{
label: "Developer",
items: [
// Whether the phone opens its own BLE link to the R1 ring; the
// glasses relay ring gestures either way. Applied at connect time.
enumSettingMenuItem(ringConnectionModeSetting),
toggleSettingMenuItem(saveVoiceRecordingsSetting),
toggleSettingMenuItem(firmwareDebugFlagsSetting),
toggleSettingMenuItem(suspendEvenHubWhenScreenOffSetting),