forked from Blendman974/faceclaw
Merge remote-tracking branch 'origin/main' into g2-case-battery
# Conflicts: # native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionCore.kt
This commit is contained in:
commit
046454e8c0
67 files changed
+11373
-155
No files matched your search
@@ -834,17 +834,24 @@ export const showBleBandwidthSetting = new ConfigSettingBoolean({
|
||||
"Show Bluetooth messages and bytes sent, throughput, acknowledged display fps, and bytes per frame at the bottom of the phone screen. Rates use a five-second window; bytes include control traffic and protocol framing.",
|
||||
});
|
||||
|
||||
export type RingConnectionMode = "glasses" | "direct";
|
||||
/**
|
||||
* How the phone talks to the R1. The ring has one phone role (health sync) and
|
||||
* one glasses role (gestures, battery pushes), so "health" and "direct" are
|
||||
* the two ways a phone link can be useful; see
|
||||
* GlassesSessionCore.setDirectRingRole and notes/ring-link-control.md.
|
||||
*/
|
||||
export type RingConnectionMode = "glasses" | "health" | "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"),
|
||||
values: ["glasses", "health", "direct"],
|
||||
formatValue: (value) =>
|
||||
value === "direct" ? "Direct to phone" : value === "health" ? "Via glasses + health sync" : "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.",
|
||||
"How the R1 ring reaches the phone. Only via glasses: the glasses relay the ring's gestures and the phone never connects to it. Via glasses + health sync: the same, plus the phone connects to the ring to sync health data. Direct to phone (experimental): the phone takes the ring over from the glasses and gets its gestures and battery itself; the glasses lose ring input. Health still syncs, but each sync (on opening Health, and at :01 and :31) pauses ring gestures for up to a minute while the phone briefly reconnects to the ring in its health role. Leaving Direct hands the ring back to the glasses. Takes effect on the next connection to the glasses.",
|
||||
});
|
||||
|
||||
// "whisper" (no "onboard-" prefix) is OpenAI's CLOUD realtime model
|
||||
|
||||
@@ -222,8 +222,8 @@ 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.
|
||||
// Whether and how the phone opens its own BLE link to the R1 ring.
|
||||
// Applied at connect time.
|
||||
enumSettingMenuItem(ringConnectionModeSetting),
|
||||
toggleSettingMenuItem(saveVoiceRecordingsSetting),
|
||||
toggleSettingMenuItem(firmwareDebugFlagsSetting),
|
||||
|
||||
Reference in new issue
Block a user