Compare commits

..
Author SHA1 Message Date
Uriel eb073bc095 fix reviews 2025-08-25 21:31:28 -04:00
Uriel 436ce4e679 Merge branch 'main' into hide-new-resets 2025-08-25 21:24:26 -04:00
Uriel b016ecfb4f Show new mounting resets if they have related body part assigned 2025-07-26 12:41:15 -04:00
112 changed files with 1278 additions and 2100 deletions

No files matched your search

+16 -16
View File
@@ -2,23 +2,23 @@
* @Eirenliel
# Make everyone be able to approve SolarXR submodule changes
/solarxr-protocol @ButterscotchV @Erimelowo @loucass003
/solarxr-protocol @ButterscotchV @Erimelowo @ImUrX @loucass003
# Make Loucass the owner of all GUI stuff
/gui/ @loucass003
/pnpm-lock.yaml @loucass003
/pnpm-workspace.yaml @loucass003
# Make Loucas and Uriel the owners of all GUI stuff
/gui/ @ImUrX @loucass003
/pnpm-lock.yaml @ImUrX @loucass003
/pnpm-workspace.yaml @ImUrX @loucass003
# loucass003 and Erimel responsible for i18n
/gui/public/i18n/ @loucass003 @Erimelowo
/gui/src/i18n/ @loucass003 @Erimelowo
/l10n.toml @loucass003 @Erimelowo
# Uriel and Erimel responsible for i18n
/gui/public/i18n/ @ImUrX @Erimelowo
/gui/src/i18n/ @ImUrX @Erimelowo
/l10n.toml @ImUrX @Erimelowo
/gui/src/components/settings/ @Erimelowo @loucass003
/gui/src/components/settings/ @Erimelowo @ImUrX @loucass003
# Rust part of the GUI
/gui/src-tauri/ @loucass003
/Cargo.lock @loucass003
/gui/src-tauri/ @ImUrX
/Cargo.lock @ImUrX
# Some server code~
/server/ @ButterscotchV @Eirenliel @Erimelowo
@@ -32,7 +32,7 @@
/server/src/main/java/dev/slimevr/filtering/ @Erimelowo
# Linux files
*.nix @loucass003
/flake.lock @loucass003
/dev.slimevr.SlimeVR.metainfo.xml @loucass003
/.envrc @loucass003
*.nix @ImUrX
/flake.lock @ImUrX
/dev.slimevr.SlimeVR.metainfo.xml @ImUrX
/.envrc @ImUrX
+2 -2
View File
@@ -27,7 +27,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -85,7 +85,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-node@v5
- uses: actions/setup-node@v4
with:
node-version: '22.x'
+7 -7
View File
@@ -27,7 +27,7 @@ jobs:
run: git fetch --tags origin --recurse-submodules=no --force
- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
@@ -56,7 +56,7 @@ jobs:
run: git fetch --tags origin --recurse-submodules=no --force
- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
@@ -95,7 +95,7 @@ jobs:
run: git fetch --tags origin --recurse-submodules=no --force
- name: Set up JDK 17
uses: actions/setup-java@v5
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
@@ -105,7 +105,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -190,7 +190,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -266,7 +266,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
@@ -351,7 +351,7 @@ jobs:
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
+1 -1
View File
@@ -17,6 +17,6 @@ jobs:
pull-requests: write
steps:
- uses: actions/labeler@v6
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
-2
View File
@@ -26,7 +26,6 @@
"@tweenjs/tween.js": "^25.0.0",
"@twemoji/svg": "^15.0.0",
"browser-fs-access": "^0.35.0",
"chart.js": "^4.5.0",
"classnames": "^2.5.1",
"flatbuffers": "22.10.26",
"intl-pluralrules": "^2.0.1",
@@ -34,7 +33,6 @@
"jotai": "^2.12.2",
"prompts": "^2.4.2",
"react": "^18.3.1",
"react-chartjs-2": "^5.3.0",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-helmet": "^6.1.0",
+2 -22
View File
@@ -497,6 +497,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = يمكن أن ي
settings-general-fk_settings-leg_tweak-toe_snap-description = الانجذاب إلى أصابع القدم يحاول تخمين دوران قدميك إذا لم تكن أجهزة تعقب القدم قيد الاستخدام.
settings-general-fk_settings-leg_tweak-foot_plant-description = تثبيت اصبع القدم يحاول تخمين دوران قدميك إذا لم تكن أجهزة تعقب القدم قيد الاستخدام.
settings-general-fk_settings-leg_fk = تعقب الساق
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = تمكين إعادة ضبط تركيب القدمين عن طريق المشي على رؤوس الأصابع.
settings-general-fk_settings-leg_fk-reset_mounting_feet = إعادة تعيين تركيب القدمين
settings-general-fk_settings-enforce_joint_constraints = حدود الهيكل العظمي
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = فرض القيود
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = منع المفاصل من الدوران إلى ما بعد الحد الأقصى
@@ -635,14 +637,6 @@ settings-general-interface-discord_presence-message =
[many] كثيرة
*[other] أخرى
}
settings-interface-behavior-error_tracking = جمع الأخطاء عبر Sentry.io
settings-interface-behavior-error_tracking-description_v2 =
<h1>هل توافق على جمع بيانات الخطأ مجهولة المصدر؟</h1>
<b>نحن لا نجمع معلومات شخصية</b> مثل عنوان IP الخاص بك أو بيانات الاعتماد اللاسلكية. يقدر SlimeVR خصوصيتك!
لتوفير أفضل تجربة للمستخدم، نقوم بجمع تقارير الأخطاء ومقاييس الأداء ومعلومات نظام التشغيل مجهولة المصدر. يساعدنا هذا في اكتشاف الأخطاء والمشكلات المتعلقة ب SlimeVR. يتم جمع هذه المقاييس عبر Sentry.io.
settings-interface-behavior-error_tracking-label = إرسال الأخطاء إلى المطورين
## Serial settings
@@ -665,8 +659,6 @@ settings-serial-get_infos = احصل على معلومات
settings-serial-serial_select = اختر منفذ تسلسلي
settings-serial-auto_dropdown_item = تلقائي
settings-serial-get_wifi_scan = احصل على فحص WiFi
settings-serial-file_type = نص عادي
settings-serial-save_logs = حفظ في ملف
## OSC router settings
@@ -696,21 +688,9 @@ settings-osc-router-network-address-placeholder = عنوان آي بي في 4
## OSC VRChat settings
settings-osc-vrchat = أجهزة تعقب "في ار تشات أوه أس سي"
# This cares about multilines
settings-osc-vrchat-description-v1 =
تغيير الإعدادات الخاصة بمعيار أجهزة تعقب OSC المستخدم لإرسال
بيانات التعقب إلى التطبيقات التي لا تحتوي على SteamVR (مثل Quest المستقل).
تأكد من تمكين OSC في VRChat عبر قائمة الإجراءات ضمن OSC > ممكن.
settings-osc-vrchat-enable = تمكين
settings-osc-vrchat-enable-description = بتبديل إرسال واستقبال البيانات.
settings-osc-vrchat-enable-label = تمكين
settings-osc-vrchat-oscqueryEnabled = تمكين OSCQuery
settings-osc-vrchat-oscqueryEnabled-description =
يكتشف OSCQuery تلقائيا مثيلات VRChat قيد التشغيل ويرسل البيانات إليها.
يمكنه أيضا الإعلان عن نفسه لهم من أجل تلقي بيانات HMD ووحدة التحكم.
للسماح بتلقي بيانات HMD ووحدة التحكم من VRChat ، انتقل إلى إعدادات القائمة الرئيسية
ضمن "التتبع و IK (الحركة العكسية)" وتمكين "السماح بإرسال بيانات OSC لتتبع الرأس والمعصم".
settings-osc-vrchat-oscqueryEnabled-label = تمكين OSCQuery
settings-osc-vrchat-network = منافذ الشبكة
settings-osc-vrchat-network-port_in =
.label = منفذ الدخول
-5
View File
@@ -390,10 +390,6 @@ tracker-settings-update-blocked = Update not available. No other releases availa
tracker-settings-update-available = { $versionName } is now available
tracker-settings-update = Update now
tracker-settings-update-title = Firmware version
tracker-settings-graph-acceleration-title = Tracker Acceleration
tracker-settings-graph-position-title = Tracker Position
tracker-settings-graph-show-title = Show Tracker Graph
tracker-settings-graph-hide-title = Hide Tracker Graph
## Tracker part card info
tracker-part_card-no_name = No name
@@ -1129,7 +1125,6 @@ onboarding-automatic_mounting-preparation-v2-step-2 = 3. Hold the position until
onboarding-automatic_mounting-put_trackers_on-title = Put on your trackers
onboarding-automatic_mounting-put_trackers_on-description = To calibrate mounting orientations, we're gonna use the trackers you just assigned. Put on all your trackers, you can see which are which in the figure to the right.
onboarding-automatic_mounting-put_trackers_on-next = I have all my trackers on
onboarding-automatic_mounting-return-home = Done
## Tracker manual proportions setupa
onboarding-manual_proportions-back = Go Back to Reset tutorial
+5 -2
View File
@@ -7,8 +7,8 @@
## Websocket (server) status
websocket-connecting = Cargando...
websocket-connection_lost = ¡El servidor falló!
websocket-connecting = Conectando al servidor
websocket-connection_lost = Conexión al servidor perdida. Intentando reconectar...
websocket-connection_lost-desc = Parece que el servidor de SlimeVR ha dejado de funcionar. Revise los registros y reinicie el programa.
websocket-timedout = No se ha podido conectar al servidor.
websocket-timedout-desc = Parece que el servidor de SlimeVR ha dejado de funcionar o se agotó el tiempo de espera de la conexión. Revise los registros y reinicie el programa
@@ -609,6 +609,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = El clip del suel
settings-general-fk_settings-leg_tweak-toe_snap-description = El encajado de dedos intenta adivinar la rotación de los pies si sus respectivos trackers no están en uso.
settings-general-fk_settings-leg_tweak-foot_plant-description = El plantado del pie rota los pies para que sean paralelos con el suelo al entrar en contacto.
settings-general-fk_settings-leg_fk = Tracking de piernas
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = Activar reinicio de montura para el pie mediante el pararse de puntillas.
settings-general-fk_settings-leg_fk-reset_mounting_feet = Reinicio de montura de pies
settings-general-fk_settings-enforce_joint_constraints = Límites esqueléticos
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = Imponer restricciones
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = Evita que las articulaciones giren más allá de su límite
@@ -1016,6 +1018,7 @@ onboarding-connect_tracker-next = He conectado todos mis sensores
onboarding-calibration_tutorial = Tutorial de calibración de IMU
onboarding-calibration_tutorial-subtitle = ¡Esto te ayudara a reducir la desviación del tracker!
onboarding-calibration_tutorial-description = Cada vez que enciendes tus trackers, van a necesitar descansar un ratito en una superficie plana para calibrarse. Tratemos de hacer lo mismo presionando el botón «{ onboarding-calibration_tutorial-calibrate }», <b>¡No los muevas!</b>
onboarding-calibration_tutorial-calibrate = Puse los sensores en una mesa.
onboarding-calibration_tutorial-status-waiting = Esperando por ti
onboarding-calibration_tutorial-status-calibrating = Calibrando
+2 -4
View File
@@ -244,8 +244,6 @@ reset-reset_all_warning_default-v2 =
Êtes-vous sûr de vouloir faire cela ?
reset-full = Réinitialisation complète
reset-mounting = Réinitialiser l'alignement
reset-mounting-feet = Réinitialiser l'alignement des pieds
reset-mounting-fingers = Réinitialiser l'alignement des doigts
reset-yaw = Réinitialisation horizontale
## Serial detection stuff
@@ -613,8 +611,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = Le limitage au s
settings-general-fk_settings-leg_tweak-toe_snap-description = La correction des orteils estime l'orientation de vos pieds si vous ne portez pas de capteurs sur ses derniers.
settings-general-fk_settings-leg_tweak-foot_plant-description = La correction des pieds oriente vos pieds pour qu'ils soient parallèles au sol lorsqu'ils le touche.
settings-general-fk_settings-leg_fk = Capture des jambes
settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = Forcer la réinitialisation de l'alignement des pieds pendant la réinitialisation d'alignement générale.
settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = Forcer la réinitialisation de l'alignement des pieds
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = Activer la réinitialisation de l'alignement des pieds en allant sur la pointe des pieds.
settings-general-fk_settings-leg_fk-reset_mounting_feet = Réinitialisation de l'alignement des pieds
settings-general-fk_settings-enforce_joint_constraints = Limites squelettiques
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = Appliquer les contraintes
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = Empêche les articulations de tourner au-delà de leur limite
+2 -2
View File
@@ -243,8 +243,6 @@ reset-reset_all_warning_default-v2 =
Czy na pewno chcesz to zrobić?
reset-full = Pełny Reset
reset-mounting = Zresetuj położenie
reset-mounting-feet = Zresetuj mocowanie stóp
reset-mounting-fingers = Zresetuj mocowanie palców
reset-yaw = Reset odchylenia
## Serial detection stuff
@@ -612,6 +610,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = Floor-clip może
settings-general-fk_settings-leg_tweak-toe_snap-description = Toe-snap próbuje odgadnąć obrót twoich stóp, jeśli trackery stóp nie są używane.
settings-general-fk_settings-leg_tweak-foot_plant-description = Foot-plant obraca stopy, aby były równoległe do podłoża podczas kontaktu.
settings-general-fk_settings-leg_fk = Śledzenie nóg
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = Włącz resetowanie montażu stóp, chodząc na palcach.
settings-general-fk_settings-leg_fk-reset_mounting_feet = Reset mocowania stóp
settings-general-fk_settings-enforce_joint_constraints = Limity szkieletowe
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = Wymuszanie ograniczeń
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = Zapobiega obracaniu się stawów poza ich limit
+24 -119
View File
@@ -89,7 +89,7 @@ body_part-RIGHT_LITTLE_DISTAL = ปลายนิ้วก้อยขวา
board_type-UNKNOWN = ไม่ทราบ
board_type-NODEMCU = NodeMCU
board_type-CUSTOM = บอร์ดสั่งทำ
board_type-CUSTOM = บอร์ดคัสตอม
board_type-WROOM32 = WROOM32
board_type-WEMOSD1MINI = Wemos D1 Mini
board_type-TTGO_TBASE = TTGO T-Base
@@ -187,7 +187,7 @@ skeleton_bone-SKELETON_OFFSET-desc =
ปรับค่านี้เพื่อเลื่อนตำแหน่งแทร็กเกอร์ทั้งหมดไปด้านหน้าหรือด้านหลัง
เพื่อช่วยในการปรับเทียบสำหรับเกมหรือแอปพลิเคชันบางตัว
ที่อาจต้องการให้แทร็กเกอร์อยู่ด้านหน้ามากกว่าปกติ
skeleton_bone-SHOULDERS_DISTANCE = ระยะความกว้างไหล่
skeleton_bone-SHOULDERS_DISTANCE = ระยะไหล่
skeleton_bone-SHOULDERS_DISTANCE-desc =
นี่คือระยะทางในแนวตั้งจากฐานคอถึงไหล่ของคุณ
ปรับโดยเริ่มจากตั้งความยาวแขนส่วนบนเป็น 0 และปรับค่านี้จนกว่าแทร็กเกอร์ข้อศอกเสมือน
@@ -243,9 +243,7 @@ reset-reset_all_warning_default-v2 =
คุณต้องการดำเนินการต่อหรือไม่?
reset-full = รีเซ็ตแทร็กเกอร์ทั้งหมด
reset-mounting = รีเซ็ตการติดตั้ง
reset-mounting-feet = รีเซ็ตทิศทางติดตั้งเท้า
reset-mounting-fingers = รีเซ็ตการติดตั้งนิ้วมือ
reset-yaw = รีเซ็ตแกนหมุน
reset-yaw = รีเซ็ตแกนแนวตั้ง
## Serial detection stuff
@@ -262,26 +260,25 @@ serial_detection-close = ปิด
navbar-home = หน้าหลัก
navbar-body_proportions = สัดส่วนร่างกาย
navbar-trackers_assign = กำหนดแทร็กเกอร์
navbar-mounting = ปรับเทียบทิศทางการติดตั้ง
navbar-mounting = ปรับเทียบการติดตั้ง
navbar-onboarding = ตัวช่วยการตั้งค่า
navbar-settings = ตั้งค่า
## Biovision hierarchy recording
bvh-start_recording = บันทึก BVH
bvh-recording = กำลังบันทึก...
bvh-save_title = บันทึก การบันทึก BVH
bvh-start_recording = อัด BVH
bvh-recording = กำลังอัดบันทึก
## Tracking pause
tracking-unpaused = หยุดการติดตามชั่วคราว
tracking-paused = ยกเลิกหยุดการติดตาม
tracking-paused = ยกเลิกการหยุดการติดตาม
## Widget: Overlay settings
widget-overlay = โอเวอร์เลย์
widget-overlay-is_visible_label = แสดงโอเวอร์เลย์ ใน SteamVR
widget-overlay-is_mirrored_label = สะท้อนการแสดงโอเวอร์เลย์
widget-overlay-is_mirrored_label = แสดงโอเวอร์เลย์เป็นกระจก
## Widget: Drift compensation
@@ -289,7 +286,7 @@ widget-drift_compensation-clear = ล้างการชดเชยค่า
## Widget: Clear Reset Mounting
widget-clear_mounting = ล้างค้าการติดตั้ง
widget-clear_mounting = คืนค่าการติดตั้ง
## Widget: Developer settings
@@ -324,9 +321,9 @@ tracker-status-none = ไม่มีสถานะ
tracker-status-busy = ไม่ว่าง
tracker-status-error = มีปัญหา
tracker-status-disconnected = ขาดการเชื่อมต่อ
tracker-status-occluded = ติดขัด
tracker-status-occluded = มีการติดขัด
tracker-status-ok = OK
tracker-status-timed_out = หมดเวลาเชื่อมต่อ
tracker-status-timed_out = หมดเวลาการเชื่อมต่อ
## Tracker status columns
@@ -353,7 +350,7 @@ tracker-rotation-back = หลัง
tracker-rotation-back_left = หลังซ้าย
tracker-rotation-back_right = หลังขวา
tracker-rotation-custom = กำหนดเอง
tracker-rotation-overriden = (ถูกแทนที่ด้วยการรีเซ็ตการติดตั้ง)
tracker-rotation-overriden = (ถูกแทนที่ด้วยการ รีเซ็ตการติดตั้ง)
## Tracker information
@@ -406,8 +403,7 @@ tracker-settings-forget-description = ลบตัวแทร็กเกอร
tracker-settings-forget-label = ลืมแทร็กเกอร์นี้
tracker-settings-update-unavailable = ไม่สามารถอัพเดทได้ (DIY)
tracker-settings-update-low-battery = ไม่สามารถอัพเดทได้ แบตเตอรรี่ต่ำกว่า 50%
tracker-settings-update-up_to_date = อัพเดทล่าสุดแล้ว
tracker-settings-update-blocked = ไม่สามารถอัพเดทได้ ไม่มีเวอร์ชั่นอื่นที่พร้อมอัพเดท
tracker-settings-update-up_to_date = อัพเดทล่าสุด
tracker-settings-update-available = { $versionName } พร้อมใช้งานแล้ว
tracker-settings-update = อัพเดตเดี๋ยวนี้
tracker-settings-update-title = เวอร์ชั่นเฟิร์มแวร์
@@ -475,7 +471,7 @@ mounting_selection_menu-close = ปิด
## Sidebar settings
settings-sidebar-title = การตั้งค่า
settings-sidebar-general = การตั้งค่าทั่วไป
settings-sidebar-general = ทั่วไป
settings-sidebar-tracker_mechanics = การทำงานแทร็กเกอร์
settings-sidebar-stay_aligned = Stay Aligned
settings-sidebar-fk_settings = ตั้งค่าการจับตำแหน่ง
@@ -564,9 +560,9 @@ settings-general-tracker_mechanics-drift_compensation-amount-label = เปอ
settings-general-tracker_mechanics-drift_compensation-max_resets-label = ใช้ค่าจากการรีเซ็ต X ครั้ง
settings-general-tracker_mechanics-save_mounting_reset = บันทึกค่าการปรับเทียบตำแหน่งแบบอัตโนมัติ
settings-general-tracker_mechanics-save_mounting_reset-description =
บันทึกการปรับเทียบการติดตั้งแทร็กเกอร์ระหว่างการรีสตาร์ท มีประโยชน์กับ
ผู้ที่แทร็กเกอร์ไม่เคลื่อนในการใช้แต่ละครั้ง <b>ไม่แนะนำสำหรับผู้ใช้ทั่วไป!</b>
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = บันทึกการรีเซ็ตการติดตั้ง
บันทึกการปรับเทียบตำแหน่งแทร็กเกอร์ระหว่างการรีสตาร์ท มีประโยชน์กับ
ผู้ที่สวมชุดที่แทร็กเกอร์ไม่เคลื่อนในการใช้แต่ละครั้ง <b>ไม่แนะนำสำหรับผู้ใช้ทั่วไป!</b>
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = บันทึกการรีเซ็ตตำแหน่ง
settings-general-tracker_mechanics-use_mag_on_all_trackers = ใช้ตัววัดสนามแม่เหล็กบนแทร็กเกอร์ที่ IMU รองรับ
settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
ใช้ตัววัดสนามแม่เหล็กกับแทร็กเกอร์ทุกตัวที่เฟิร์มแวร์รองรับ ลดค่าดริฟท์ในพื้นที่เล่นที่สนามแม่เหล็กเสถียร์
@@ -577,7 +573,6 @@ settings-stay_aligned-description = Stay Aligned ลดอัตตาค่า
settings-stay_aligned-setup-label = ตั้งค่า Stay Aligned
settings-stay_aligned-setup-description = คุณต้องทำการ "ตั้งค่า Stay Aligned" ถึงจะเปิดใช้งาน Stay Aligned ได้
settings-stay_aligned-warnings-drift_compensation = ⚠ กรุณาปิดใช้งาน การชดเชยค่าดริฟท์!! เพราะมันจะขัดกับการตั้งค่า Stay Aligned
settings-stay_aligned-enabled-label = ปรับแทร็กเกอร์ของคุณ
settings-stay_aligned-hide_yaw_correction-label = ซ่อนการปรับแต่ง(เพื่อเปรียบเทียบกับไม่ได้เปิดใช้ Stay Aligned)
settings-stay_aligned-general-label = การตั้งค่าทั่วไป
settings-stay_aligned-relaxed_poses-label = ท่าผ่อนคลาย
@@ -614,28 +609,21 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = เปิดก
settings-general-fk_settings-leg_tweak-toe_snap-description = เปิดเดาการหมุนของเท้าเพื่อคาดเดาการหมุนของเท้าในกรณีที่คุณไม่ได้ใส่แทร็กเกอร์ที่เท้า
settings-general-fk_settings-leg_tweak-foot_plant-description = เปิดปรับสมดุลเท้าเพื่อให้เท้าคุณอยู่ในระนาบเดียวกับพื้นเมื่อเท้าอยู่บนพื้น
settings-general-fk_settings-leg_fk = การจับตำแหน่งขา
settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = บังคับใช้การรีเซ็ตการติดตั้งของแทร็กเกอร์เท้าเมื่อทำการรีเซ็ตการติดตั้ง
settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = บังคับใช้รีเซ็ตตำแหน่งที่เท้า
settings-general-fk_settings-enforce_joint_constraints = จำกัดองศากระดูก
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = จำกัดองศาที่จะหมุนได้
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = เปิดให้รีเซ็ตตำแหน่งแทร็กเกอร์เท้าเมื่อเขย่งได้
settings-general-fk_settings-leg_fk-reset_mounting_feet = รีเซ็ตตำแหน่งแทร็กเกอร์เท้า
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = ป้องกันไม่ให้ข้อต่อหมุนเกินขีดจำกัด
settings-general-fk_settings-enforce_joint_constraints-correct_constraints = แก้ไขด้วยข้อจำกัด
settings-general-fk_settings-enforce_joint_constraints-correct_constraints-description = แก้การหมุนของข้อต่อเมื่อหมุนเกินขีดจำกัด
settings-general-fk_settings-arm_fk = การจับตำแหน่งแขน
settings-general-fk_settings-arm_fk-description = บังคับให้ใช้การจับตำแหน่งแขนจากแว่น VR แม้ว่าจะมีตำแหน่งแขนอยู่แล้ว
settings-general-fk_settings-arm_fk-force_arms = บังคับใช้ตำแหน่งแขนจากแว่น
settings-general-fk_settings-reset_settings = ตั้งค่าการรีเซ็ต
settings-general-fk_settings-reset_settings-reset_hmd_pitch-description = รีเซ็ตแกนตั้งของแว่น(HMD) เมื่อใช้การรีเซ็ตแทร็กเกอร์ทั้งหมด เหมาะกับผู้ที่ใส่แว่นบนหน้าผากสำหรับ Vtubing หรือ mocap ไม่ควรใช้สำหรับเล่น VR
settings-general-fk_settings-reset_settings-reset_hmd_pitch = รีเซ็ตแกนตั้งแว่น HMD
settings-general-fk_settings-arm_fk-reset_mode-description = เปลี่ยนท่าทางการไว้แขนเมื่อทำการรีเซ็ตการติดตั้งแทร็กเกอร์
settings-general-fk_settings-arm_fk-reset_mode-description = เปลี่ยนท่าทางการไว้แขนในการรีเซ็ตตำแหน่งแทร็กเกอร์
settings-general-fk_settings-arm_fk-back = หลัง
settings-general-fk_settings-arm_fk-back-description = เป็นท่าเริ่มต้น โดยแขนส่วนบนไปด้านหลัง และแขนส่วนล่างไปด้านหน้า
settings-general-fk_settings-arm_fk-tpose_up = ที-โพส (ขึ้น)
settings-general-fk_settings-arm_fk-tpose_up-description = ให้แขนอยู๋ข้างลำตัวเมื่อทำการรีเซ็ตทั้งหมด และอยู่ในมุม 90 องศา เมื่อทำการรีเซ็ตการติดตั้ง
settings-general-fk_settings-arm_fk-tpose_down = ที-โพส (ล่าง)
settings-general-fk_settings-arm_fk-tpose_down-description = ให้แขนอยู๋ในมุม 90 องศาข้างลำตัวเมื่อทำการรีเซ็ตทั้งหมด และอยู่แนบลำตัวเมื่อทำการรีเซ็ตการติดตั้ง
settings-general-fk_settings-arm_fk-forward = ไปข้างหน้า
settings-general-fk_settings-arm_fk-forward-description = ให้ยกแขนคุณ 90 องศาในด้านหน้า เหมาะสำหรับผู้ที่ Vtubing
settings-general-fk_settings-skeleton_settings-toggles = ตั้งค่าโครงกระดูก
settings-general-fk_settings-skeleton_settings-description = ตั้งค่าให้แสดงหรือไม่แสดงโครงกระดูก เราแนะนำเปิดไว้
settings-general-fk_settings-skeleton_settings-extended_spine_model = โมเดลกระดูกสันหลังขั้นสูง
@@ -657,7 +645,7 @@ settings-general-fk_settings-self_localization-description = โหมด Mocap
settings-general-gesture_control = ควบคุมผ่านท่าทาง
settings-general-gesture_control-subtitle = การรีเซ็ตตามการแตะ
settings-general-gesture_control-description = ใช้งานการแตะเพื่อรีเซ็ตแทร็กเกอร์ โดยให้แทร็กเกอร์ที่อยู่บนสุดบนตัวในการรีเซ็ตแกนหมุน แทร็กเกอร์ที่อยู่บนสุดของเท้าซ้ายจะใช้เพื่อรีเซ็ทแทร็กเกอร์ทั้งหมด และแทร็กเกอร์ที่อยู่บนสุดของขาขวาจะใช้เพื่อรีเซ็ตตำแหน่งแทร็กเกอร์ โดยการแตะจะต้องทำในระยะเวลา 0.3 วินาทีเพื่อให้โปรแกรมรับทราบ
settings-general-gesture_control-description = ใช้การแตะเพื่อรีเซ็ตแทร์กเกอร์โดย แทร็กเกอร์ที่อยู่บนสุดบนตัวจะใช้เพื่อรีเซ็ตแกนตั้ง แทร็กเกอร์ที่อยู่บนสุดของเท้าซ้ายจะใช้เพื่อรีเซ็ทแทร็กเกอร์ทั้งหมด และแทร็กเกอร์ที่อยู่บนสุดของขาขวาจะใช้เพื่อรีเซ็ตตำแหน่งแทร็กเกอร์ โดยการแตะจะต้องทำในระยะเวลา 0.3 วินาทีเพื่อให้โปรแกรมรับทราบ
# This is a unit: 3 taps, 2 taps, 1 tap
# $amount (Number) - Amount of taps (touches to the tracker's case)
settings-general-gesture_control-taps = แตะ{ $amount }ครั้ง
@@ -741,9 +729,6 @@ settings-interface-behavior-error_tracking-description_v2 =
เพื่อมอบประสบการณ์การใช้งานที่ดีที่สุด เรานั้นเก็บรายงานข้อผิดพลาดแบบไม่ระบุตัวตน เมตริกประสิทธิภาพ และข้อมูลระบบปฏิบัติการเพื่อให้เราตรวจพบข้อบกพร่องและปัญหาใน SlimeVR โดยข้อมูลเหล่านี้ถูกเก็บผ่าน Sentry.io
settings-interface-behavior-error_tracking-label = อนุญาติการส่งข้อมูลให้นักพัฒนา
settings-interface-behavior-bvh_directory = ตำแหน่งที่คุณจะบันทึกค่า BVH
settings-interface-behavior-bvh_directory-description = เลือกตำแหน่งที่คุณต้องการบันทึกค่า BVH แทนที่จะต้องกำหนดเองทุกครั้งเมื่อบันทึก
settings-interface-behavior-bvh_directory-label = เปิดโฟลเดอร์ไปยังไฟล์ BVH
## Serial settings
@@ -1007,7 +992,6 @@ onboarding-connect_tracker-next = ฉันเชื่อมต่อแทร
onboarding-calibration_tutorial = บทเรียนการปรับเทียบ IMU
onboarding-calibration_tutorial-subtitle = นี่จะเป็นการช่วยลดค่าดริฟท์ของแทร็กเกอร์
onboarding-calibration_tutorial-description-v1 = หลังจากเปิดแทร็กเกอร์ของคุณแล้ว วางมันลงบนพื้นที่เรียบสักครู่ แล้วให้แทร็กเกอร์ปรับเทียบตัวเอง การปรับเทียบสามารถทำได้ตลอดเวลาหลังจากเปิดแทร็กเกอร์ขึ้นมา — หน้านี้เป็นเพียงแค่ให้คำแนะนำเท่านั้น หากจะเริ่มต้น คลิกที่ปุ่ม "{ onboarding-calibration_tutorial-calibrate }" แล้ว <b>อย่าขยับแทร็กเกอร์ของคุณ!</b>
onboarding-calibration_tutorial-calibrate = ฉันได้วางแทร็กเกอร์ไว้บนโต๊ะแล้ว
onboarding-calibration_tutorial-status-waiting = เรารอคุณอยู่
onboarding-calibration_tutorial-status-calibrating = กำลังปรับเทียบ
@@ -1090,38 +1074,6 @@ onboarding-assign_trackers-warning-LEFT_LOWER_LEG =
[2] ข้อเท้าซ้าย ถูกกำหนดแล้ว แต่คุณต้องกำหนด ต้นขาซ้าย ด้วย
*[unknown] ข้อเท้าซ้าย ถูกกำหนดแล้ว แต่คุณต้องกำหนด ??? ???? ของร่างกายด้วย
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-RIGHT_LOWER_LEG =
{ $unassigned ->
[0] ข้อเท้าขวา ถูกกำหนดแล้ว แต่คุณต้องกำหนด ต้นขาขวา และอย่างใดอย่างหนึ่งระหว่าง ส่วนอก สะโพก หรือ เอว ด้วย
[1] ข้อเท้าขวา ถูกกำหนดแล้ว แต่คุณต้องกำหนด อย่างใดอย่างหนึ่งระหว่าง ส่วนอก สะโพก หรือ เอว ด้วย
[2] ข้อเท้าขวา ถูกกำหนดแล้ว แต่คุณต้องกำหนด ต้นขาขวา ด้วย
*[unknown] ข้อเท้าขวา ถูกกำหนดแล้ว แต่คุณต้องกำหนด ??? ของร่างกายด้วย
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-LEFT_UPPER_LEG =
{ $unassigned ->
[0] ต้นขาซ้าย ถูกกำหนดแล้ว แต่คุณต้องกำหนด อย่างใดอย่างหนึ่งระหว่าง ส่วนอก สะโพก หรือ เอว ด้วย
*[unknown] ต้าขาซ้าย ถูกกำหนดแล้ว แแต่คุณต้องกำหนด ??? ??? ของร่างกายด้วย
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-RIGHT_UPPER_LEG =
{ $unassigned ->
[0] ต้นขาขวา ถูกกำหนดแล้ว แต่คุณต้องกำหนด อย่างใดอย่างหนึ่งระหว่าง ส่วนอก สะโพก หรือ เอว ด้วย
*[unknown] ต้าขาขวา ถูกกำหนดแล้ว แแต่คุณต้องกำหนด ??? ??? ของร่างกายด้วย
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-HIP =
{ $unassigned ->
[0] สะโพก ถูกกำหนดแล้ว แต่คุณต้องกำหนด ส่วนอกด้วย
*[unknown] สะโพก ถูกกำหนดแล้ว แต่คุณต้องกำหนด ??? ??? ของร่างกาย ด้วย
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-WAIST =
{ $unassigned ->
[0] เอว ถูกกำหนดแล้ว แต่คุณต้องกำหนด ส่วนอกด้วย
*[unknown] เอว ถูกกำหนดแล้ว แต่คุณต้องกำหนด ??? ??? ของร่างกาย ด้วย
}
## Tracker mounting method choose
@@ -1148,15 +1100,12 @@ onboarding-choose_mounting-manual_modal-cancel = ยกเลิก
onboarding-manual_mounting-back = กลับไปยังเข้าสู่ VR
onboarding-manual_mounting = ปรับเทียบตำแหน่งแบบกำหนดเอง
onboarding-manual_mounting-description = คลิกบนแทร็กเกอร์ทุกตัว และดูทิศทางของแทร็กเกอร์ที่ถูกติดตั้ง
onboarding-manual_mounting-auto_mounting = ปรับเทียบตำแหน่งแบบอัตโนมัติ
onboarding-manual_mounting-next = ขั้นตอนถัดไป
## Tracker automatic mounting setup
onboarding-automatic_mounting-back = กลับไปยังเข้าสู่ VR
onboarding-automatic_mounting-title = ปรับเทียบตำแหน่งแทร็กเกอร์
onboarding-automatic_mounting-description = เพื่อให้ SlimeVR ทำงานได้ เราจะต้องทำการตั้งค่าการติดตั้งของแทร็กเกอร์ของคุณให้ตรงกับการติดตั้งบนร่างกายจริง
onboarding-automatic_mounting-manual_mounting = ปรับเทียบตำแหน่งแบบกำหนดเอง
onboarding-automatic_mounting-next = ขั้นตอนถัดไป
onboarding-automatic_mounting-prev_step = ขั้นตอนก่อนหน้า
@@ -1164,7 +1113,6 @@ onboarding-automatic_mounting-done-title = ตำแหน่งแทร็ก
onboarding-automatic_mounting-done-description = ปรับเทียบตำแหน่งแทร็กเกอร์ของคุณสำเร็จแล้ว!
onboarding-automatic_mounting-done-restart = ลองอีกครั้ง
onboarding-automatic_mounting-mounting_reset-title = รีเซ็ตตำแหน่งแทร็กเกอร์
onboarding-automatic_mounting-mounting_reset-step-0 = 1. ก้มตัวลงอยู่ในท่าที่ "กำลังเล่นสกี" โดยให้ขางอ ลำตัวด้านบนเอียงไปด้านหน้า และงอแขนของคุณ
onboarding-automatic_mounting-mounting_reset-step-1 = 2. กดไปที่ปุ่ม "รีเซ็ตำตำแหน่งแทร็กเกอร์" แล้วรอประมาณ 3 วินาที ก่อนที่ตำแหน่งของแทร็กเกอร์จะถูกรีเซ็ต
onboarding-automatic_mounting-preparation-title = จัดเตรียมพร้อม
onboarding-automatic_mounting-preparation-v2-step-0 = 1. กดที่ปุ่ม "รีเซ็ตทั้งหมด"
@@ -1193,7 +1141,7 @@ onboarding-manual_proportions-estimated_height = ความสูงของ
onboarding-automatic_proportions-back = กลับไปยังการปรับสัดส่วนด้วยตัวเอง
onboarding-automatic_proportions-title = วัดสัดส่วนร่างกายของคุณ
onboarding-automatic_proportions-description = เพื่อให้ SlimeVR แทร็กเกอร์ทำงานได้ เราจะต้องรู้ความยาวของกระดูกของคุณ การปรับเทียบอย่างไวนี้จะวัดค่ามันให้คุณ
onboarding-automatic_proportions-description = เพื่อให้ SlimeVR แทร็กเกอร์ทำงานได้ เราจะต้องรู้ความยาวของกระดูกของคุณ การ Calibration อย่างไวนี้จะวัดค่ามันให้คุณ
onboarding-automatic_proportions-manual = ปรับสัดส่วนด้วยตัวเอง
onboarding-automatic_proportions-prev_step = ขั้นตอนก่อนหน้า
onboarding-automatic_proportions-put_trackers_on-title = ใส่แทร็กเกอร์ของคุณ
@@ -1202,10 +1150,10 @@ onboarding-automatic_proportions-put_trackers_on-next = ฉันใส่แท
onboarding-automatic_proportions-requirements-title = สิ่งที่ต้องการ
# Each line of text is a different list item
onboarding-automatic_proportions-requirements-descriptionv2 =
คุณมีแทร็กเกอร์พอที่จะจับการเคลื่อนไหวเท้าของคุณ (โดยทั่วไป 5 ตัว)
คุณมีแทร็คเกอร์ พอที่จะจับการเคลื่อนไหวเท้าของคุณ (โดยทั่วไป 5 ตัว)
คุณกำลังใส่แว่น และแทร็กเกอร์อยู่
แทร็กเกอร์ของคุณได้เชื่อมต่อเข้ากับ SlimeVR Server และทำงานเป็นปรกติ (เช่น ไม่มีการกระตุก หลุดการเชื่อมต่อ หรืออื่นๆ)
แว่นของคุณได้ส่งข้อมูลตำแหน่งของคุณเข้ากับ SlimeVR server (ปรกติแล้วหมายถึงว่า SlimeVR ทำงานอยู่ และเชื่อมต่อเข้ากับ SlimeVR ด้วย ไดร์เวอร์ของ SteamVR ผ่าน SlimeVR
แว่นของคุณได้ส่งข้อมูลตำแหน่งของคุณเข้ากับ SlimeVR server (ปรกติแล้วหมายถึงว่า SlimeVR ทำงานอยู่ และเชื่อมต่อเข้ากับ SlimeVR ด้วย SlimeVR's SteamVR driver)
แทร็กเกอร์ของคุณนั้นทำงานปรกติ และแสดงการเคลื่อนไหวของคุณถูกต้อง (ตัวอย่างเช่น คุณได้ทำการ Full reset และตัวแทร็กเกอร์ขยับไปในทิศทางที่ถูกเมื่อขยับตัว ก้มลง นั่งลง หรือขยับขา เป็นต้น)
onboarding-automatic_proportions-requirements-next = ฉันได้อ่านสิ่งที่ต้องการแล้ว
onboarding-automatic_proportions-check_height-title-v3 = วัดความสูงของแว่นของคุณ
@@ -1318,12 +1266,9 @@ onboarding-stay_aligned-relaxed_poses-sitting-title = ท่าผ่อนค
onboarding-stay_aligned-relaxed_poses-sitting-step-0 = 1. นั่งในท่าที่สบายๆ
onboarding-stay_aligned-relaxed_poses-sitting-step-1-v2 = 2. กดไปที่ "บันทึกท่าโพส"
onboarding-stay_aligned-relaxed_poses-flat-title = ท่าผ่อนคลายในขณะที่นั่งบนพื้น
onboarding-stay_aligned-relaxed_poses-flat-step-0 = 1. นั่งลงบนพื้นและยื่นขาไปทางด้านหน้า ไม่ต้องเกร็งนะ
onboarding-stay_aligned-relaxed_poses-flat-step-1-v2 = 2. กดไปที่ "บันทึกท่าโพส"
onboarding-stay_aligned-relaxed_poses-skip_step = ข้าม
onboarding-stay_aligned-done-title = เปิดใช้งาน Stay Aligned แล้ว!
onboarding-stay_aligned-done-description = การตั้งค่า Stay Aligned ของคุณสำเร็จแล้ว!
onboarding-stay_aligned-done-description-2 = การตั้งค่าเสร็จสิ้นแล้ว คุณสามารถจะเริ่มต้นการตั้งค่าใหม่หากคุณต้องการจะปรับค่าของท่าโพสคุณ
onboarding-stay_aligned-previous_step = ก่อนหน้า
onboarding-stay_aligned-next_step = ต่อไป
onboarding-stay_aligned-restart = เริ่มใหม่
@@ -1331,7 +1276,6 @@ onboarding-stay_aligned-done = เสร็จแล้ว
## Home
home-no_trackers = ไม่พบแทร็กเกอร์หรือยังไม่ได้ถูกกำหนด
## Trackers Still On notification
@@ -1340,19 +1284,10 @@ trackers_still_on-modal-description =
มีแทร็กเกอร์เปิดค้างไว้อยู่
คุณแน่ใจที่จะปิด SlimeVR?
trackers_still_on-modal-confirm = ออกจาก SlimeVR
trackers_still_on-modal-cancel = ใจเย็นๆก่อน....
## Status system
status_system-StatusTrackerReset = เราแนะนำให้คุณทำการรีเซ็ตทั้งหมดเพราะว่าแทร็กเกอร์หนึ่งตัวหรือมากกว่านั้นยังไม่ได้ถูกปรับ
status_system-StatusSteamVRDisconnected =
{ $type ->
[steamvr_feeder] ขณะนี้ยังไม่มีการเชื่อมต่อกับแอป SlimeVR Feeder
*[steamvr] ขณะนี้ยังไม่มีการเชื่อมต่อกับ SteamVR ผ่านไดรเวอร์ SlimeVR
}
status_system-StatusTrackerError = แทร็กเกอร์ { $trackerName } เกิดข้อผิดพลาด
status_system-StatusUnassignedHMD = แว่น VR ของคุณควรจะถูกกำหนดเป็นแทร็กเกอร์ส่วนหัว
status_system-StatusPublicNetwork = โปรไฟล์เครือข่ายของคุณตอนนี้ถูกตั้งค่าเป็นสาธารณะ ({ $adapters }) ซึ่งไม่แนะนำสำหรับการทำงานของ SlimeVR <PublicFixLink>ดูวิธีการแก้ไขให้เหมาะสมที่นี่</PublicFixLink>
## Firmware tool globals
@@ -1364,16 +1299,7 @@ firmware_tool-loading = กำลังโหลด...
## Firmware tool Steps
firmware_tool = เครื่องมือเฟิร์มแวร์ DIY
firmware_tool-description = ให้คุณตั้งค่าและแฟลชเฟิร์มแวร์แทร็กเกอร์ DIY ของคุณ
firmware_tool-not_available = ไอ่หย๊า เครื่องมือเฟิร์มแวร์ยังไม่พร้อมใช้งานในขณะนี้ โปรดกลับมาใหม่ทีหลัง!
firmware_tool-not_compatible = Firmware นี้เข้ากันไม่ได้กับเซิร์ฟเวอร์เวอร์ชั่นนี้ โปรดอัปเดตเซิร์ฟเวอร์ของคุณ!
firmware_tool-board_step = เลือกบอร์ดของคุณ
firmware_tool-board_step-description = เลือกบอร์ดหนึ่งตัวที่แสดงอยู่ด้านล่าง
firmware_tool-board_pins_step = ตรวจสอบ Pin ของคุณ
firmware_tool-board_pins_step-description =
โปรดตรวจสอบว่า Pin ที่คุณเลือกนั้นถูกต้อง
ค่าเริ่มต้นมักจะถูกแล้วหากคุณทำตามเอกสารประกอบของ SlimeVR
firmware_tool-board_pins_step-enable_led = เปิดใช้งาน LED
firmware_tool-board_pins_step-led_pin =
.label = พิน LED
@@ -1389,16 +1315,6 @@ firmware_tool-board_pins_step-battery_sensor_pin =
firmware_tool-board_pins_step-battery_resistor =
.label = ตัวต้านทานของแบตเตอรี่ (โอห์ม)
.placeholder = ใส่ค่าต้านทานของตัวต้านทานแบตเตอรี่
firmware_tool-board_pins_step-battery_shield_resistor-0 =
.label = ค่าความต้านทาน R1 ของ Battery Shield (โอห์ม)
.placeholder = กรุณากรอกค่าความต้านทาน R1 ของ Battery Shield
firmware_tool-board_pins_step-battery_shield_resistor-1 =
.label = ค่าความต้านทาน R1 ของ Battery Shield (โอห์ม)
.placeholder = กรุณากรอกค่าความต้านทาน R1 ของ Battery Shield
firmware_tool-add_imus_step = เลือก IMU ที่คุณใช้
firmware_tool-add_imus_step-description =
กรุณาใส่ชนิดและจำนวนของ IMU ที่แทร็กเกอร์ของคุณใช้
ค่าเริ่มต้นมักจะถูกแล้วหากคุณทำตามเอกสารประกอบของ SlimeVR
firmware_tool-add_imus_step-imu_type-label = ประเภท IMU
firmware_tool-add_imus_step-imu_type-placeholder = เลือกประเภทของ IMU
firmware_tool-add_imus_step-imu_rotation =
@@ -1542,25 +1458,14 @@ vrc_config-mute-btn = ปิดคำเตือน
vrc_config-unmute-btn = เลิกแจ้งเตือน
vrc_config-legacy_mode = การตั้งศูนย์แบบเก่า
vrc_config-disable_shoulder_tracking = ปิดใช้งานการจับตำแหน่งไหล
vrc_config-shoulder_width_compensation = การชดเชยความกว้างของไหล่
vrc_config-spine_mode = โหมดกระดูกสันหลัง FBT
vrc_config-tracker_model = โมเดลตัวติดตาม FBT
vrc_config-avatar_measurement_type = การวัดของอวาตาร์
vrc_config-calibration_range = ช่วงการตั้งศูนย์
vrc_config-calibration_visuals = แสดงภาพการตั้งศูนย์
vrc_config-user_height = ความสูงจริงของผู้ใช้
vrc_config-spine_mode-UNKNOWN = ไม่ทราบ
vrc_config-spine_mode-LOCK_BOTH = ล็อคทั้งคู่
vrc_config-spine_mode-LOCK_HEAD = ล็อคศีรษะ
vrc_config-spine_mode-LOCK_HIP = ล็อคสะโพก
vrc_config-tracker_model-UNKNOWN = ไม่ทราบ
vrc_config-tracker_model-AXIS = แกนหมุน
vrc_config-tracker_model-BOX = กล่อง
vrc_config-tracker_model-SPHERE = ทรงกลม
vrc_config-tracker_model-SYSTEM = ระบบ
vrc_config-avatar_measurement_type-UNKNOWN = ไม่ทราบ
vrc_config-avatar_measurement_type-HEIGHT = ความสูง:
vrc_config-avatar_measurement_type-ARM_SPAN = ช่วงแขน
## Error collection consent modal
+2 -2
View File
@@ -602,8 +602,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = 地板限制可
settings-general-fk_settings-leg_tweak-toe_snap-description = 脚趾着地可以在没有脚部追踪器的情况下尝试猜测脚部的俯仰。
settings-general-fk_settings-leg_tweak-foot_plant-description = 脚掌着地会在脚与地面接触时保持脚掌与地板平行。
settings-general-fk_settings-leg_fk = 腿部追踪
settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = 在进行普通佩戴重置时强制进行脚部佩戴重置。
settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = 强制脚部佩戴重置
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = 开启脚部佩戴重置。(佩戴重置时需要踮起脚尖)
settings-general-fk_settings-leg_fk-reset_mounting_feet = 脚部佩戴重置
settings-general-fk_settings-enforce_joint_constraints = 骨骼限制
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = 强制约束
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = 避免关节旋转超过人体骨骼角度限制
+5 -12
View File
@@ -239,8 +239,6 @@ reset-reset_all_warning_default-v2 =
確定要繼續嗎?
reset-full = 完整重置
reset-mounting = 配戴重置
reset-mounting-feet = 重置腳部配戴
reset-mounting-fingers = 重置手指配戴
reset-yaw = 左右偏擺重置
## Serial detection stuff
@@ -266,7 +264,6 @@ navbar-settings = 詳細設定
bvh-start_recording = 錄製 BVH 檔案
bvh-recording = 錄製中…
bvh-save_title = 儲存 BVH 紀錄
## Tracking pause
@@ -404,7 +401,6 @@ tracker-settings-forget-label = 忘記追蹤器
tracker-settings-update-unavailable = 無法更新 (DIY)
tracker-settings-update-low-battery = 無法更新,電池電量低於 50%
tracker-settings-update-up_to_date = 已為最新版本
tracker-settings-update-blocked = 無法更新,沒有其他可用版本。
tracker-settings-update-available = 版本 { $versionName } 可供更新
tracker-settings-update = 立即更新
tracker-settings-update-title = 韌體版本
@@ -608,8 +604,8 @@ settings-general-fk_settings-leg_tweak-floor_clip-description = 地板限制功
settings-general-fk_settings-leg_tweak-toe_snap-description = 腳趾跟地功能在沒有腳部的追蹤器時,會嘗試猜測腳掌的旋轉角度。
settings-general-fk_settings-leg_tweak-foot_plant-description = 腳底貼地功能會在腳底與地面接觸時,將腳部旋轉成與地板平行。
settings-general-fk_settings-leg_fk = 腿部追蹤
settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1 = 使用普通的重置配戴時,一併重置腳部配戴。
settings-general-fk_settings-leg_fk-reset_mounting_feet-v1 = 強制重置腳部配戴
settings-general-fk_settings-leg_fk-reset_mounting_feet-description = 開啟腳部配戴重置,進行配戴重置時需要踮起腳尖。
settings-general-fk_settings-leg_fk-reset_mounting_feet = 腳部配戴重置
settings-general-fk_settings-enforce_joint_constraints = 骨架限制
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints = 約束關節旋轉
settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description = 避免關節旋轉超出極限
@@ -738,9 +734,6 @@ settings-interface-behavior-error_tracking-description_v2 =
為了提供最佳的使用者體驗,我們會蒐集匿名化的錯誤報告、性能指標和作業系統資訊,這會對我們檢測 SlimeVR 的錯誤和問題有所幫助。我們會透過 Sentry.io 來蒐集這些指標。
settings-interface-behavior-error_tracking-label = 向開發者傳送錯誤資訊
settings-interface-behavior-bvh_directory = BVH 紀錄儲存目錄
settings-interface-behavior-bvh_directory-description = 選擇儲存 BVH 紀錄文件的目錄,如此每次錄製 BVH 時不需要選擇儲存位置。
settings-interface-behavior-bvh_directory-label = 存放 BVH 紀錄的目錄
## Serial settings
@@ -886,8 +879,8 @@ settings-utils-advanced-reset_warning-cancel = 取消
settings-utils-advanced-open_data-v1 = 設定資料夾
settings-utils-advanced-open_data-description-v1 = 在檔案管理器中開啟 SlimeVR 的設定資料夾,該資料夾包含程式的設定。
settings-utils-advanced-open_data-label = 打開資料夾
settings-utils-advanced-open_logs = 紀錄檔資料夾
settings-utils-advanced-open_logs-description = 在檔案管理器中開啟 SlimeVR 的紀錄檔資料夾,該資料夾包含程式的紀錄檔。
settings-utils-advanced-open_logs = 記錄檔資料夾
settings-utils-advanced-open_logs-description = 在檔案管理器中開啟 SlimeVR 的記錄檔資料夾,該資料夾包含程式的記錄檔。
settings-utils-advanced-open_logs-label = 打開資料夾
## Setup/onboarding menu
@@ -1007,7 +1000,7 @@ onboarding-connect_tracker-next = 所有的追蹤器都連接好了
onboarding-calibration_tutorial = IMU 校正教學
onboarding-calibration_tutorial-subtitle = 進行這項操作可以有效減少追蹤器發生飄移的機會
onboarding-calibration_tutorial-description-v1 = 開啟追蹤器開關後,將其放置在穩定的平面上一段時間以便進行校正。本頁僅提供操作教學——追蹤器電源開啟後即可隨時進行校正,無須回到本頁進行。首先請點選「{ onboarding-calibration_tutorial-calibrate }」按鈕,然後<b>不要移動追蹤器!</b>
onboarding-calibration_tutorial-description = 每次在打開追蹤器的開關時,需要將追蹤器平置一下來進行自動校正。你也可以透過按下「{ onboarding-calibration_tutorial-calibrate }」按鈕來進行手動校正,<b>校正過程中請勿移動追蹤器</b>。
onboarding-calibration_tutorial-calibrate = 追蹤器已經放置在桌上了
onboarding-calibration_tutorial-status-waiting = 正在等待你完成動作
onboarding-calibration_tutorial-status-calibrating = 校正中
@@ -65,10 +65,6 @@ work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
</provides>
<releases>
<release version="0.16.2" date="2025-08-01"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.2</url></release>
<release version="0.16.1" date="2025-07-27"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1</url></release>
<release version="0.16.1~rc.2" type="development" date="2025-07-17"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1-rc.2</url></release>
<release version="0.16.1~rc.1" type="development" date="2025-07-04"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.1-rc.1</url></release>
<release version="0.16.0" date="2025-07-01"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0</url></release>
<release version="0.16.0~rc.2" type="development" date="2025-06-20"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0-rc.2</url></release>
<release version="0.16.0~rc.1" type="development" date="2025-05-27"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.16.0-rc.1</url></release>
-25
View File
@@ -61,16 +61,6 @@ import { FirmwareUpdate } from './components/firmware-update/FirmwareUpdate';
import { ConnectionLost } from './components/onboarding/pages/ConnectionLost';
import { VRCWarningsPage } from './components/vrc/VRCWarningsPage';
import { StayAlignedSetup } from './components/onboarding/pages/stay-aligned/StayAlignedSetup';
import {
Chart as ChartJS,
Title,
Tooltip,
Legend,
CategoryScale,
LinearScale,
PointElement,
LineElement,
} from 'chart.js';
export const GH_REPO = 'SlimeVR/SlimeVR-Server';
export const VersionContext = createContext('');
@@ -83,16 +73,6 @@ function Layout() {
const { isMobile } = useBreakpoint('mobile');
useDiscordPresence();
ChartJS.register(
Title,
Tooltip,
Legend,
CategoryScale,
LinearScale,
PointElement,
LineElement
);
return (
<>
<SerialDetectionModal></SerialDetectionModal>
@@ -226,11 +206,6 @@ export default function App() {
}, []);
useEffect(() => {
// don't show update stuff when on android
if (window.__ANDROID__?.isThere()) {
setUpdateFound('');
return;
}
async function fetchReleases() {
const releases = await fetch(
`https://api.github.com/repos/${GH_REPO}/releases`
+24 -12
View File
@@ -12,7 +12,11 @@ import { parseStatusToLocale, useStatusContext } from '@/hooks/status-system';
import { ClearMountingButton } from './ClearMountingButton';
import { ToggleableSkeletonVisualizerWidget } from './widgets/SkeletonVisualizerWidget';
import { useAtomValue } from 'jotai';
import { flatTrackersAtom } from '@/store/app-store';
import {
feetAssignedTrackers,
fingerAssignedTrackers,
flatTrackersAtom,
} from '@/store/app-store';
import { A } from './commons/A';
function UnprioritizedStatuses() {
@@ -48,6 +52,8 @@ function UnprioritizedStatuses() {
export function WidgetsComponent() {
const { config } = useConfig();
const hasFeetTrackers = useAtomValue(feetAssignedTrackers);
const hasFingerTrackers = useAtomValue(fingerAssignedTrackers);
return (
<>
@@ -55,18 +61,24 @@ export function WidgetsComponent() {
<ResetButton type={ResetType.Yaw} size="big"></ResetButton>
<ResetButton type={ResetType.Full} size="big"></ResetButton>
<ResetButton type={ResetType.Mounting} size="big"></ResetButton>
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="feet"
></ResetButton>
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="fingers"
></ResetButton>
{hasFeetTrackers && (
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="feet"
></ResetButton>
)}
{hasFingerTrackers && (
<ResetButton
type={ResetType.Mounting}
size="big"
bodyPartsToReset="fingers"
></ResetButton>
)}
<ClearMountingButton></ClearMountingButton>
{!window.__ANDROID__?.isThere() && <BVHButton></BVHButton>}
{(typeof __ANDROID__ === 'undefined' || !__ANDROID__?.isThere()) && (
<BVHButton></BVHButton>
)}
<TrackingPauseButton></TrackingPauseButton>
</div>
<div className="w-full">
+1 -1
View File
@@ -28,7 +28,7 @@ export function ArrowLink({
};
return classNames(
variantsMap[variant],
'flex gap-2 hover:fill-background-10 fill-background-30 text-background-10'
'flex gap-2 hover:fill-background-10 hover:text-background-10 fill-background-30 text-background-30'
);
}, [variant]);
+1 -1
View File
@@ -53,7 +53,7 @@ export function CheckBox({
className={classNames(
{
'rounded-lg': outlined,
'text-background-10': !outlined || disabled,
'text-background-30': !outlined || disabled,
'bg-background-60': outlined && color === 'primary',
'bg-background-70': outlined && color === 'secondary',
'bg-background-50': outlined && color === 'tertiary',
+2 -12
View File
@@ -12,8 +12,6 @@ import { FileIcon } from './icon/FileIcon';
import { UploadFileIcon } from './icon/UploadFileIcon';
import { Typography } from './Typography';
import { CloseIcon } from './icon/CloseIcon';
import { FolderIcon } from './icon/FolderIcon';
import { UploadFolderIcon } from './icon/UploadFolderIcon';
interface InputProps {
variant?: 'primary' | 'secondary';
@@ -24,11 +22,9 @@ interface InputProps {
export const FileInputContentBlank = ({
isDragging,
label,
directory = false,
}: {
isDragging: boolean;
label: string;
directory?: boolean;
}) => {
return (
<div
@@ -40,11 +36,7 @@ export const FileInputContentBlank = ({
)}
>
<span className="flex items-center space-x-2 pointer-events-none">
{directory ? (
<UploadFolderIcon isDragging={isDragging} />
) : (
<UploadFileIcon isDragging={isDragging} />
)}
<UploadFileIcon isDragging={isDragging} />
<div>
<Localized
id={label}
@@ -65,12 +57,10 @@ export const FileInputContentBlank = ({
export const FileInputContentFile = ({
importedFileName,
directory = false,
onClearPicker,
}: {
importedFileName: string;
onClearPicker: () => any;
directory?: boolean;
}) => {
return (
<div
@@ -82,7 +72,7 @@ export const FileInputContentFile = ({
>
<div className="flex items-center space-x-2">
<div className="flex items-center space-x-2 px-4">
{directory ? <FolderIcon /> : <FileIcon />}
<FileIcon />
<span>{importedFileName}</span>
</div>
<span className="flex-grow"></span>
+3 -3
View File
@@ -47,19 +47,19 @@ export const InputInside = forwardRef<
const classes = useMemo(() => {
const variantsMap = {
primary: classNames({
'placeholder:text-background-10 placeholder:italic bg-background-60 border-background-60':
'placeholder:text-background-30 bg-background-60 border-background-60':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
}),
secondary: classNames({
'placeholder:text-background-10 placeholder:italic bg-background-50 border-background-50':
'placeholder:text-background-30 bg-background-50 border-background-50':
!disabled,
'text-background-40 placeholder:text-background-40 border-background-70 bg-background-70':
disabled,
}),
tertiary: classNames({
'placeholder:text-background-10 placeholder:italic bg-background-40 border-background-40':
'placeholder:text-background-30 bg-background-40 border-background-40':
!disabled,
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
disabled,
+3 -1
View File
@@ -51,7 +51,9 @@ export function Radio({
<div className="flex flex-col gap-2 pointer-events-none">
{children ? children : <Typography bold>{label}</Typography>}
{description && (
<Typography variant="standard">{description}</Typography>
<Typography variant="standard" color="secondary">
{description}
</Typography>
)}
</div>
</label>
@@ -24,11 +24,10 @@ export function InnerTauriFileInput({
<div ref={ref} onClick={async () => onChange(await open({ directory }))}>
{value !== null
? FileInputContentFile({
directory,
importedFileName: value,
onClearPicker: () => onChange(null),
})
: FileInputContentBlank({ isDragging: false, label, directory })}
: FileInputContentBlank({ isDragging: false, label })}
</div>
);
}
@@ -1,12 +0,0 @@
export function FolderIcon({ width = 24 }: { width?: number }) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
width={width}
>
<path d="M19.5 21a3 3 0 0 0 3-3v-4.5a3 3 0 0 0-3-3h-15a3 3 0 0 0-3 3V18a3 3 0 0 0 3 3h15ZM1.5 10.146V6a3 3 0 0 1 3-3h5.379a2.25 2.25 0 0 1 1.59.659l2.122 2.121c.14.141.331.22.53.22H19.5a3 3 0 0 1 3 3v1.146A4.483 4.483 0 0 0 19.5 9h-15a4.483 4.483 0 0 0-3 1.146Z" />
</svg>
);
}
@@ -1,25 +0,0 @@
import classNames from 'classnames';
export function UploadFolderIcon({
width = 24,
isDragging = false,
}: {
width?: number;
isDragging?: boolean;
}) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 5.5499997 4.7600007"
width={width}
fill="currentColor"
className={classNames('transition-transform', isDragging && 'scale-150')}
>
<path
fill-rule="evenodd"
d="m 4.76,4.76 c 0.44,0 0.79,-0.36 0.79,-0.79 v -2.39 c 0,-0.44 -0.36,-0.79 -0.79,-0.79 H 3.34 c -0.05,0 -0.1,-0.02 -0.14,-0.06 L 2.64,0.17 C 2.53,0.06 2.38,0 2.22,0 H 0.79 C 0.35,0 0,0.36 0,0.79 V 3.97 C 0,4.41 0.36,4.76 0.79,4.76 Z M 2.58,3.71 c 0,0.26 0.4,0.26 0.4,0 V 2.6 L 3.44,3.06 C 3.63,3.23 3.89,2.97 3.72,2.78 L 2.93,1.99 c -0.08,-0.08 -0.2,-0.08 -0.28,0 L 1.86,2.78 C 1.65,2.97 1.95,3.26 2.14,3.06 L 2.6,2.6 Z"
clip-rule="evenodd"
/>
</svg>
);
}
@@ -240,7 +240,7 @@ export function AddImusStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-add_imus_step-description')}
</Typography>
</div>
@@ -297,7 +297,7 @@ export function AddImusStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -53,7 +53,7 @@ export function BoardPinsStep({
<>
<div className="flex flex-col w-full justify-between text-background-10">
<div className="flex flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-board_pins_step-description')}
</Typography>
</div>
@@ -172,7 +172,7 @@ export function BoardPinsStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -68,7 +68,7 @@ export function BuildStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-build_step-description')}
</Typography>
</div>
@@ -82,7 +82,7 @@ export function BuildStep({
: SlimeState.SAD
}
></LoaderIcon>
<Typography variant="section-title">
<Typography variant="section-title" color="secondary">
{l10n.getString('firmware_tool-build-' + buildStatus.status)}
</Typography>
</div>
@@ -91,7 +91,7 @@ export function BuildStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -85,7 +85,9 @@ function FirmwareToolContent() {
.getString('firmware_tool-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
@@ -22,7 +22,7 @@ export function FlashBtnStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-flashbtn_step-description')}
</Typography>
{defaultConfig?.boardConfig.type ===
@@ -160,7 +160,7 @@ function SerialDevicesList({
</Localized>
{Object.keys(devices).length === 0 ? (
<Localized id="firmware_tool-flash_method_serial-no_devices">
<Typography variant="standard"></Typography>
<Typography variant="standard" color="secondary"></Typography>
</Localized>
) : (
<Dropdown
@@ -274,7 +274,7 @@ function OTADevicesList({
</Localized>
{devices.length === 0 && (
<Localized id="firmware_tool-flash_method_ota-no_devices">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
)}
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
@@ -347,7 +347,7 @@ export function FlashingMethodStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-flash_method_step-description')}
</Typography>
</div>
@@ -416,7 +416,7 @@ export function FlashingMethodStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -164,7 +164,7 @@ export function FlashingStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-flashing_step-description')}
</Typography>
</div>
@@ -27,7 +27,7 @@ export function SelectBoardStep({
<>
<div className="flex flex-col w-full">
<div className="flex flex-grow flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-board_step-description')}
</Typography>
</div>
@@ -91,7 +91,7 @@ export function SelectBoardStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -40,7 +40,7 @@ export function SelectFirmwareStep({
<>
<div className="flex flex-col w-full">
<div className="flex justify-between items-center mobile:flex-col gap-4">
<Typography>
<Typography color="secondary">
{l10n.getString('firmware_tool-select_firmware_step-description')}
</Typography>
<div>
@@ -109,7 +109,7 @@ export function SelectFirmwareStep({
<div className="flex justify-center flex-col items-center gap-3 h-44">
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
<Localized id="firmware_tool-loading">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
)}
@@ -320,7 +320,7 @@ export function FirmwareUpdate() {
<Typography variant="section-title"></Typography>
</Localized>
<Localized id="firmware_update-devices-description">
<Typography variant="standard"></Typography>
<Typography variant="standard" color="secondary"></Typography>
</Localized>
<div className="flex flex-col gap-4 overflow-y-auto xs:max-h-[530px]">
{devices.length === 0 &&
+3 -37
View File
@@ -1,7 +1,6 @@
import { useLocalization } from '@fluent/react';
import { useEffect, useMemo, useRef, useState } from 'react';
import {
BodyPart,
ResetRequestT,
ResetType,
RpcMessage,
@@ -25,6 +24,7 @@ import { useStatusContext } from '@/hooks/status-system';
import classNames from 'classnames';
import { FootIcon } from '@/components/commons/icon/FootIcon';
import { FingersIcon } from '@/components/commons/icon/FingersIcon';
import { FEET_BODY_PARTS, FINGER_BODY_PARTS } from '@/store/app-store';
export function ResetButton({
type,
@@ -55,40 +55,6 @@ export function ResetButton({
[statuses]
);
const feetBodyParts = [BodyPart.LEFT_FOOT, BodyPart.RIGHT_FOOT];
const fingerBodyParts = [
BodyPart.LEFT_THUMB_METACARPAL,
BodyPart.LEFT_THUMB_PROXIMAL,
BodyPart.LEFT_THUMB_DISTAL,
BodyPart.LEFT_INDEX_PROXIMAL,
BodyPart.LEFT_INDEX_INTERMEDIATE,
BodyPart.LEFT_INDEX_DISTAL,
BodyPart.LEFT_MIDDLE_PROXIMAL,
BodyPart.LEFT_MIDDLE_INTERMEDIATE,
BodyPart.LEFT_MIDDLE_DISTAL,
BodyPart.LEFT_RING_PROXIMAL,
BodyPart.LEFT_RING_INTERMEDIATE,
BodyPart.LEFT_RING_DISTAL,
BodyPart.LEFT_LITTLE_PROXIMAL,
BodyPart.LEFT_LITTLE_INTERMEDIATE,
BodyPart.LEFT_LITTLE_DISTAL,
BodyPart.RIGHT_THUMB_METACARPAL,
BodyPart.RIGHT_THUMB_PROXIMAL,
BodyPart.RIGHT_THUMB_DISTAL,
BodyPart.RIGHT_INDEX_PROXIMAL,
BodyPart.RIGHT_INDEX_INTERMEDIATE,
BodyPart.RIGHT_INDEX_DISTAL,
BodyPart.RIGHT_MIDDLE_PROXIMAL,
BodyPart.RIGHT_MIDDLE_INTERMEDIATE,
BodyPart.RIGHT_MIDDLE_DISTAL,
BodyPart.RIGHT_RING_PROXIMAL,
BodyPart.RIGHT_RING_INTERMEDIATE,
BodyPart.RIGHT_RING_DISTAL,
BodyPart.RIGHT_LITTLE_PROXIMAL,
BodyPart.RIGHT_LITTLE_INTERMEDIATE,
BodyPart.RIGHT_LITTLE_DISTAL,
];
const reset = () => {
const req = new ResetRequestT();
req.resetType = type;
@@ -98,10 +64,10 @@ export function ResetButton({
req.bodyParts = [];
break;
case 'feet':
req.bodyParts = feetBodyParts;
req.bodyParts = FEET_BODY_PARTS;
break;
case 'fingers':
req.bodyParts = fingerBodyParts;
req.bodyParts = [...FINGER_BODY_PARTS.values()];
break;
}
sendRPCPacket(RpcMessage.ResetRequest, req);
@@ -28,8 +28,8 @@ export function SkipSetupButton({
<button
type="button"
className={classNames(
'text-background-10 hover:text-background-20',
'stroke-background-10 hover:stroke-background-20',
'text-background-40 hover:text-background-30',
'stroke-background-40 hover:stroke-background-30',
'absolute xs:-top-10 xs:right-4 mobile:top-0 mobile:right-0'
)}
onClick={onClick}
@@ -132,7 +132,9 @@ export function CalibrationTutorialPage() {
id="onboarding-calibration_tutorial-description-v1"
elems={{ b: <b></b> }}
>
<Typography>Description on calibration of IMU</Typography>
<Typography color="secondary">
Description on calibration of IMU
</Typography>
</Localized>
<div>
<div className="xs:hidden flex flex-row justify-center">
@@ -221,10 +221,10 @@ export function ConnectTrackersPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-connect_tracker-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-connect_tracker-description-p0-v1')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-connect_tracker-description-p1-v1')}
</Typography>
<div className="flex flex-col gap-2 py-5">
@@ -281,7 +281,7 @@ export function ConnectTrackersPage() {
{l10n.getString('onboarding-connect_tracker-usb')}
</Typography>
<div className="flex fill-background-10 gap-1">
<Typography>
<Typography color="secondary">
{l10n.getString(statusLabelMap[provisioningStatus])}
</Typography>
</div>
@@ -319,7 +319,7 @@ export function ConnectTrackersPage() {
</div>
</div>
<div style={{ gridArea: 't' }} className="flex items-center px-5">
<Typography bold>
<Typography color="secondary" bold>
{l10n.getString('onboarding-connect_tracker-connected_trackers', {
amount: connectedIMUTrackers.length,
})}
+1 -1
View File
@@ -20,7 +20,7 @@ export function DonePage() {
{l10n.getString('onboarding-done-title')}
</Typography>
<div className="flex flex-col items-center">
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-done-description')}
</Typography>
</div>
@@ -22,7 +22,7 @@ export function EnterVRPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-enter_vr-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-enter_vr-description')}
</Typography>
</div>
@@ -125,7 +125,7 @@ export function ResetTutorialPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-reset_tutorial')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-reset_tutorial-explanation')}
</Typography>
<div className="flex">
@@ -165,7 +165,7 @@ export function ResetTutorialPage() {
curIndex >= order.length && 'hidden'
)}
>
<Typography whitespace="whitespace-pre-line">
<Typography whitespace="whitespace-pre-line" color="secondary">
{l10n.getString(`onboarding-reset_tutorial-${curIndex}`, {
taps: tapSettings[curIndex],
})}
@@ -184,7 +184,7 @@ export function ResetTutorialPage() {
curIndex >= order.length && 'hidden'
)}
>
<Typography whitespace="whitespace-pre-line">
<Typography whitespace="whitespace-pre-line" color="secondary">
{l10n.getString(`onboarding-reset_tutorial-${curIndex}`, {
taps: tapSettings[curIndex],
})}
@@ -35,7 +35,9 @@ export function WifiCredsPage() {
.getString('onboarding-wifi_creds-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
{!state.alonePage && (
@@ -32,7 +32,7 @@ export function AutomaticProportionsPage() {
{l10n.getString('onboarding-automatic_proportions-title')}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-description'
)}
@@ -52,7 +52,7 @@ export function ScaledProportionsPage() {
{l10n.getString('onboarding-scaled_proportions-title')}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-scaled_proportions-description')}
</Typography>
</div>
@@ -72,7 +72,7 @@ export function CheckFloorHeightStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-check_floor_height-description'
)}
@@ -81,7 +81,7 @@ export function CheckFloorHeightStep({
id="onboarding-automatic_proportions-check_floor_height-calculation_warning-v2"
elems={{ u: <span className="underline"></span> }}
>
<Typography bold>
<Typography color="secondary" bold>
Press the button to get your height!
</Typography>
</Localized>
@@ -60,7 +60,7 @@ export function CheckHeightStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-check_height-description-v2'
)}
@@ -69,7 +69,7 @@ export function CheckHeightStep({
id="onboarding-automatic_proportions-check_height-calculation_warning-v3"
elems={{ u: <span className="underline"></span> }}
>
<Typography bold>
<Typography color="secondary" bold>
Press the button to get your height!
</Typography>
</Localized>
@@ -12,7 +12,7 @@ export function DoneStep({ variant }: { variant: 'onboarding' | 'alone' }) {
<Typography variant="section-title">
{l10n.getString('onboarding-automatic_proportions-done-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-automatic_proportions-done-description')}
</Typography>
</div>
@@ -26,13 +26,13 @@ export function PreparationStep({
</Typography>
<div>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
</div>
@@ -28,7 +28,7 @@ export function PutTrackersOnStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-put_trackers_on-description'
)}
@@ -97,7 +97,7 @@ export function Recording({
'onboarding-automatic_proportions-recording-description-p0'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-recording-description-p1'
)}
@@ -110,7 +110,7 @@ export function Recording({
.split('\n')
.map((line, i) => (
<li key={i}>
<Typography>{line}</Typography>
<Typography color="secondary">{line}</Typography>
</li>
))}
</>
@@ -137,7 +137,7 @@ export function Recording({
)
.otherwise(() => undefined)}
></ProgressBar>
<Typography>
<Typography color="secondary">
{match([hasCalibration, hasRecording])
.returnType<ReactNode>()
.with([ProcessStatus.PENDING, ProcessStatus.FULFILLED], () =>
@@ -31,7 +31,7 @@ export function RequirementsStep({
.split('\n')
.map((line, i) => (
<li key={i}>
<Typography>{line}</Typography>
<Typography color="secondary">{line}</Typography>
</li>
))}
</>
@@ -63,7 +63,7 @@ export function StartRecording({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-start_recording-description'
)}
@@ -76,7 +76,7 @@ export function StartRecording({
.split('\n')
.map((line, i) => (
<li key={i}>
<Typography>{line}</Typography>
<Typography color="secondary">{line}</Typography>
</li>
))}
</>
@@ -42,7 +42,7 @@ export function VerifyResultsStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_proportions-verify_results-description'
)}
@@ -65,7 +65,7 @@ export function VerifyResultsStep({
>
{bodyParts?.map(({ bone, label, value }) => (
<div className="flex justify-between" key={bone}>
<Typography>{label}</Typography>
<Typography color="secondary">{label}</Typography>
<Typography bold sentryMask>
{(value * 100).toFixed(2)} CM
</Typography>
@@ -12,7 +12,7 @@ export function DoneStep({ variant }: { variant: 'onboarding' | 'alone' }) {
<Typography variant="section-title">
{l10n.getString('onboarding-scaled_proportions-done-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-scaled_proportions-done-description')}
</Typography>
</div>
@@ -90,7 +90,7 @@ export function ManualHeightStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-scaled_proportions-manual_height-description-v2'
)}
@@ -26,7 +26,7 @@ export function ResetProportionsStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-scaled_proportions-reset_proportion-description'
)}
@@ -33,7 +33,7 @@ export function AutomaticMountingPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-automatic_mounting-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-automatic_mounting-description')}
</Typography>
</div>
@@ -99,7 +99,7 @@ export function ManualMountingPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-manual_mounting')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-manual_mounting-description')}
</Typography>
<TipBox>{l10n.getString('tips-find_tracker')}</TipBox>
@@ -17,12 +17,16 @@ export function MountingChoose() {
return (
<>
<div className="flex flex-col gap-5 h-full items-center w-full xs:justify-center relative overflow-y-auto px-4 pb-4">
<div className="flex flex-col gap-8 justify-center">
<div className="flex flex-col gap-4 justify-center">
<div className="xs:w-10/12 xs:max-w-[666px]">
<Typography variant="main-title">
{l10n.getString('onboarding-choose_mounting')}
</Typography>
<Typography variant="standard" whitespace="whitespace-pre-line">
<Typography
variant="standard"
color="secondary"
whitespace="whitespace-pre-line"
>
{l10n.getString('onboarding-choose_mounting-description')}
</Typography>
</div>
@@ -33,19 +37,12 @@ export function MountingChoose() {
>
<div
className={classNames(
'rounded-lg p-4 flex relative',
'rounded-lg p-4 flex',
!state.alonePage && 'bg-background-70',
state.alonePage && 'bg-background-60'
)}
>
<div className="bg-accent-background-30 absolute -left-4 -top-5 p-1.5 rounded-lg">
<Typography variant="vr-accessible" italic>
{l10n.getString(
'onboarding-choose_mounting-auto_mounting-label-v2'
)}
</Typography>
</div>
<div className="flex flex-col gap-4 ">
<div className="flex flex-col gap-4">
<div className="flex flex-grow flex-col gap-4 max-w-sm">
<div>
<Typography variant="main-title" bold>
@@ -53,9 +50,14 @@ export function MountingChoose() {
'onboarding-choose_mounting-auto_mounting'
)}
</Typography>
<Typography variant="vr-accessible" italic>
{l10n.getString(
'onboarding-choose_mounting-auto_mounting-label-v2'
)}
</Typography>
</div>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-choose_mounting-auto_mounting-description'
)}
@@ -96,9 +98,14 @@ export function MountingChoose() {
'onboarding-choose_mounting-manual_mounting'
)}
</Typography>
<Typography variant="vr-accessible" italic>
{l10n.getString(
'onboarding-choose_mounting-manual_mounting-label-v2'
)}
</Typography>
</div>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-choose_mounting-manual_mounting-description'
)}
@@ -20,7 +20,7 @@ export function DoneStep({
<Typography variant="section-title">
{l10n.getString('onboarding-automatic_mounting-done-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-automatic_mounting-done-description')}
</Typography>
</div>
@@ -38,11 +38,6 @@ export function DoneStep({
{l10n.getString('onboarding-automatic_mounting-next')}
</Button>
)}
{variant === 'alone' && (
<Button className="flex gap-3" variant="primary" to="/">
{l10n.getString('onboarding-automatic_mounting-return-home')}
</Button>
)}
</div>
<SkeletonVisualizerWidget />
@@ -27,12 +27,12 @@ export function MountingResetStep({
)}
</Typography>
<div className="flex flex-col gap-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_mounting-mounting_reset-step-0'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_mounting-mounting_reset-step-1'
)}
@@ -26,13 +26,13 @@ export function PreparationStep({
</Typography>
<div>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
</div>
@@ -28,7 +28,7 @@ export function PutTrackersOnStep({
)}
</Typography>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'onboarding-automatic_mounting-put_trackers_on-description'
)}
@@ -136,7 +136,7 @@ export function StayAlignedSetup() {
<Typography variant="main-title">
{l10n.getString('onboarding-stay_aligned-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-stay_aligned-description')}
</Typography>
</div>
@@ -11,7 +11,7 @@ export function DoneStep({ goTo }: VerticalStepComponentProps) {
<Typography variant="main-title"></Typography>
</Localized>
<Localized id="onboarding-stay_aligned-done-description-2">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
<div className="flex gap-3 justify-between">
@@ -16,13 +16,13 @@ export function PreparationStep({
<div className="flex flex-col flex-grow justify-between py-2 gap-2">
<div className="flex flex-col gap-1">
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
<Localized id="onboarding-stay_aligned-preparation-tip">
@@ -19,7 +19,7 @@ export function PutTrackersOnStep({ nextStep }: VerticalStepComponentProps) {
<div className="flex flex-grow flex-col gap-4">
<div>
<Localized id="onboarding-stay_aligned-put_trackers_on-description">
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
<div className="flex">
@@ -30,7 +30,9 @@ function PosePage({
<div className="flex flex-col py-2">
<div className="flex flex-col gap-2">
{descriptionKeys.map((descriptionKey) => (
<Typography>{l10n.getString(descriptionKey)}</Typography>
<Typography color="secondary">
{l10n.getString(descriptionKey)}
</Typography>
))}
</div>
<div className="flex pt-1 items-center fill-background-50 justify-center px-12">
@@ -11,16 +11,16 @@ export function VerifyMountingStep({
<div className="flex flex-grow flex-col gap-4 py-2">
<div className="flex flex-col gap-2">
<Localized id="onboarding-stay_aligned-verify_mounting-step-0">
<Typography />
<Typography color="secondary" />
</Localized>
<Localized id="onboarding-stay_aligned-verify_mounting-step-1">
<Typography />
<Typography color="secondary" />
</Localized>
<Localized id="onboarding-stay_aligned-verify_mounting-step-2">
<Typography />
<Typography color="secondary" />
</Localized>
<Localized id="onboarding-stay_aligned-verify_mounting-step-3">
<Typography />
<Typography color="secondary" />
</Localized>
</div>
<div className="flex gap-3 justify-between">
@@ -43,7 +43,7 @@ const ItemContent = ({
mode,
})}
</Typography>
<Typography variant="standard">
<Typography variant="standard" color="secondary">
{l10n.getString('onboarding-assign_trackers-option-description', {
mode,
})}
@@ -284,11 +284,11 @@ export function TrackersAssignPage() {
<Typography variant="main-title">
{l10n.getString('onboarding-assign_trackers-title')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-assign_trackers-description')}
</Typography>
<div className="flex gap-1">
<Typography>
<Typography color="secondary">
{l10n.getString('onboarding-assign_trackers-assigned', {
assigned: assignedTrackers.length,
trackers: trackers.length,
@@ -63,11 +63,11 @@ export function AdvancedSettings() {
<div className="grid gap-4">
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-gui')}
</Typography>
<div className="flex flex-col">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-gui-description'
)}
@@ -95,11 +95,11 @@ export function AdvancedSettings() {
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-server')}
</Typography>
<div className="flex flex-col">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-server-description'
)}
@@ -132,11 +132,11 @@ export function AdvancedSettings() {
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-all')}
</Typography>
<div className="flex flex-col">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-all-description'
)}
@@ -168,11 +168,11 @@ export function AdvancedSettings() {
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-utils-advanced-open_data-v1')}
</Typography>
<div className="flex flex-col">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-open_data-description-v1'
)}
@@ -188,11 +188,11 @@ export function AdvancedSettings() {
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-utils-advanced-open_logs')}
</Typography>
<div className="flex flex-col">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-open_logs-description'
)}
@@ -459,7 +459,7 @@ export function GeneralSettings() {
<Typography variant="main-title">
{l10n.getString('settings-general-steamvr')}
</Typography>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-steamvr-subtitle')}
</Typography>
<div className="flex flex-col py-2">
@@ -467,11 +467,13 @@ export function GeneralSettings() {
.getString('settings-general-steamvr-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<div className="flex flex-col pt-4"></div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-steamvr-trackers-tracker_toggling'
)}
@@ -483,7 +485,9 @@ export function GeneralSettings() {
)
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<CheckBox
@@ -604,7 +608,7 @@ export function GeneralSettings() {
<Typography variant="main-title">
{l10n.getString('settings-general-tracker_mechanics')}
</Typography>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-tracker_mechanics-filtering')}
</Typography>
<div className="flex flex-col pt-2 pb-4">
@@ -614,7 +618,9 @@ export function GeneralSettings() {
)
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<Typography>
@@ -684,7 +690,7 @@ export function GeneralSettings() {
/>
</div>
<div className="flex flex-col pt-5 pb-3">
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-tracker_mechanics-save_mounting_reset'
)}
@@ -693,7 +699,7 @@ export function GeneralSettings() {
id="settings-general-tracker_mechanics-save_mounting_reset-description"
elems={{ b: <b></b> }}
>
<Typography></Typography>
<Typography color="secondary"></Typography>
</Localized>
</div>
<CheckBox
@@ -719,19 +725,19 @@ export function GeneralSettings() {
<Typography variant="main-title">
{l10n.getString('settings-general-fk_settings')}
</Typography>
<div className="flex flex-col pt-2 pb-4 gap-2">
<Typography variant="section-title">
<div className="flex flex-col pt-2 pb-4">
<Typography bold>
{l10n.getString(
'settings-general-fk_settings-leg_tweak-skating_correction'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-leg_tweak-skating_correction-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-1 gap-2 pb-4">
<div className="grid sm:grid-cols-1 gap-3 pb-4">
<CheckBox
variant="toggle"
outlined
@@ -755,18 +761,18 @@ export function GeneralSettings() {
</div>
<div className="flex flex-col pt-2 pb-2">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-fk_settings-leg_fk')}
</Typography>
</div>
<div className="grid sm:grid-cols-1 gap-3 pb-3">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-leg_tweak-floor_clip-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-1 gap-2 pb-3">
<div className="grid sm:grid-cols-1 gap-3 pb-3">
<CheckBox
variant="toggle"
outlined
@@ -778,7 +784,7 @@ export function GeneralSettings() {
/>
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-leg_tweak-foot_plant-description'
)}
@@ -796,7 +802,7 @@ export function GeneralSettings() {
/>
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-leg_tweak-toe_snap-description'
)}
@@ -815,10 +821,10 @@ export function GeneralSettings() {
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-fk_settings-arm_fk')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-arm_fk-description'
)}
@@ -837,114 +843,110 @@ export function GeneralSettings() {
</div>
<div className="flex flex-col pt-2">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-fk_settings-reset_settings')}
</Typography>
</div>
<div className="flex flex-col pt-2 pb-3">
<div className="grid grid-cols-2 gap-2">
<div className="flex flex-col gap-2">
<Typography>
{l10n.getString(
'settings-general-fk_settings-reset_settings-reset_hmd_pitch-description'
)}
</Typography>
<CheckBox
variant="toggle"
outlined
control={control}
name="resetsSettings.resetHmdPitch"
label={l10n.getString(
'settings-general-fk_settings-reset_settings-reset_hmd_pitch'
)}
/>
</div>
<div className="flex flex-col gap-2 justify-end">
<Typography>
{l10n.getString(
'settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1'
)}
</Typography>
<CheckBox
variant="toggle"
outlined
control={control}
name="resetsSettings.resetMountingFeet"
label={l10n.getString(
'settings-general-fk_settings-leg_fk-reset_mounting_feet-v1'
)}
/>
</div>
</div>
</div>
<div>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-arm_fk-reset_mode-description'
'settings-general-fk_settings-reset_settings-reset_hmd_pitch-description'
)}
</Typography>
<div className="grid md:grid-cols-2 flex-col gap-3 pt-2 pb-3">
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-back'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-back-description'
)}
value={'0'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-forward'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-forward-description'
)}
value={'1'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_up'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_up-description'
)}
value={'2'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_down'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_down-description'
)}
value={'3'}
></Radio>
</div>
</div>
<div className="grid sm:grid-cols-1 gap-3 pb-3">
<CheckBox
variant="toggle"
outlined
control={control}
name="resetsSettings.resetHmdPitch"
label={l10n.getString(
'settings-general-fk_settings-reset_settings-reset_hmd_pitch'
)}
/>
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-1 gap-3 pb-3">
<CheckBox
variant="toggle"
outlined
control={control}
name="resetsSettings.resetMountingFeet"
label={l10n.getString(
'settings-general-fk_settings-leg_fk-reset_mounting_feet-v1'
)}
/>
</div>
<div className="flex flex-col pt-2 pb-1">
<Typography variant="section-title">
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-arm_fk-reset_mode-description'
)}
</Typography>
<div className="grid md:grid-cols-2 flex-col gap-3 pt-2 pb-3">
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-back'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-back-description'
)}
value={'0'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-forward'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-forward-description'
)}
value={'1'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_up'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_up-description'
)}
value={'2'}
></Radio>
<Radio
control={control}
name="resetsSettings.armsMountingResetMode"
label={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_down'
)}
description={l10n.getString(
'settings-general-fk_settings-arm_fk-tpose_down-description'
)}
value={'3'}
></Radio>
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography bold>
{l10n.getString(
'settings-general-fk_settings-enforce_joint_constraints'
)}
</Typography>
<div className="pt-2">
<Typography>
{l10n.getString(
'settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description'
)}
</Typography>
</div>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-1 pb-3">
<CheckBox
@@ -961,12 +963,12 @@ export function GeneralSettings() {
{config?.debug && (
<>
<div className="flex flex-col pt-2 pb-3">
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-fk_settings-skeleton_settings-toggles'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-skeleton_settings-description'
)}
@@ -1001,14 +1003,14 @@ export function GeneralSettings() {
)}
/>
</div>
<div className="flex flex-col">
<div className="flex flex-col pt-2 pb-3 gap-2">
<Typography variant="section-title">
<div className="flex flex-col pt-2 pb-3">
<div className="flex flex-col pt-2 pb-3">
<Typography bold>
{l10n.getString(
'settings-general-fk_settings-skeleton_settings-ratios'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-skeleton_settings-ratios-description'
)}
@@ -1110,12 +1112,12 @@ export function GeneralSettings() {
</div>
<div className="flex flex-col pt-2 pb-3">
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-fk_settings-self_localization-title'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-fk_settings-self_localization-description'
)}
@@ -1145,12 +1147,11 @@ export function GeneralSettings() {
<Typography variant="main-title">
{l10n.getString('settings-general-gesture_control')}
</Typography>
<div className="flex flex-col pt-2 pb-4 gap-2">
<Typography variant="section-title">
{l10n.getString('settings-general-gesture_control-subtitle')}
</Typography>
<Typography>
<Typography bold>
{l10n.getString('settings-general-gesture_control-subtitle')}
</Typography>
<div className="flex flex-col pt-2 pb-4">
<Typography color="secondary">
{l10n.getString('settings-general-gesture_control-description')}
</Typography>
</div>
@@ -1266,12 +1267,12 @@ export function GeneralSettings() {
/>
</div>
<div className="grid sm:grid-cols-1 gap-2 pt-2">
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-gesture_control-numberTrackersOverThreshold'
)}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-gesture_control-numberTrackersOverThreshold-description'
)}
@@ -130,14 +130,11 @@ export function InterfaceSettings() {
{l10n.getString('settings-interface-notifications')}
</Typography>
<div className="pt-2">
<Typography variant="section-title">
{l10n.getString('settings-general-interface-serial_detection')}
</Typography>
</div>
<Typography bold>
{l10n.getString('settings-general-interface-serial_detection')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-serial_detection-description'
)}
@@ -155,11 +152,11 @@ export function InterfaceSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-interface-feedback_sound')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-feedback_sound-description'
)}
@@ -190,13 +187,13 @@ export function InterfaceSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-interface-connected_trackers_warning'
)}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-connected_trackers_warning-description'
)}
@@ -224,134 +221,130 @@ export function InterfaceSettings() {
<Typography variant="main-title">
{l10n.getString('settings-interface-behavior')}
</Typography>
<div className="pt-2">
{isTrayAvailable && (
<>
<Typography variant="section-title">
{l10n.getString('settings-general-interface-use_tray')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
{l10n.getString(
'settings-general-interface-use_tray-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.useTray"
label={l10n.getString(
'settings-general-interface-use_tray-label'
)}
/>
</div>
</>
)}
<Typography variant="section-title">
{l10n.getString('settings-general-interface-discord_presence')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
{l10n.getString(
'settings-general-interface-discord_presence-description'
)}
{isTrayAvailable && (
<>
<Typography bold>
{l10n.getString('settings-general-interface-use_tray')}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.discordPresence"
label={l10n.getString(
'settings-general-interface-discord_presence-label'
)}
/>
</div>
<Typography variant="section-title">
{l10n.getString('settings-general-interface-dev_mode')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
{l10n.getString(
'settings-general-interface-dev_mode-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.devmode"
label={l10n.getString(
'settings-general-interface-dev_mode-label'
)}
/>
</div>
<Typography variant="section-title">
{l10n.getString('settings-interface-behavior-error_tracking')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Localized
id={
'settings-interface-behavior-error_tracking-description_v2'
}
elems={{
b: <b></b>,
}}
>
<Typography whitespace="whitespace-pre-line"></Typography>
</Localized>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.errorTracking"
label={l10n.getString(
'settings-interface-behavior-error_tracking-label'
)}
/>
</div>
{isTauri() && (
<>
<Typography variant="section-title">
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-interface-behavior-bvh_directory'
'settings-general-interface-use_tray-description'
)}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Localized
id={
'settings-interface-behavior-bvh_directory-description'
}
>
<Typography></Typography>
</Localized>
</div>
<div className="grid gap-3 pb-5">
<TauriFileInput
name="behavior.bvhDirectory"
rules={{
required: false,
}}
control={control}
label="settings-interface-behavior-bvh_directory-label"
directory
/>
</div>
</>
)}
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.useTray"
label={l10n.getString(
'settings-general-interface-use_tray-label'
)}
/>
</div>
</>
)}
<Typography bold>
{l10n.getString('settings-general-interface-discord_presence')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-discord_presence-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.discordPresence"
label={l10n.getString(
'settings-general-interface-discord_presence-label'
)}
/>
</div>
<Typography bold>
{l10n.getString('settings-general-interface-dev_mode')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-dev_mode-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.devmode"
label={l10n.getString(
'settings-general-interface-dev_mode-label'
)}
/>
</div>
<Typography bold>
{l10n.getString('settings-interface-behavior-error_tracking')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Localized
id={'settings-interface-behavior-error_tracking-description_v2'}
elems={{
b: <b></b>,
}}
>
<Typography
color="secondary"
whitespace="whitespace-pre-line"
></Typography>
</Localized>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="behavior.errorTracking"
label={l10n.getString(
'settings-interface-behavior-error_tracking-label'
)}
/>
</div>
{isTauri() && (
<>
<Typography bold>
{l10n.getString('settings-interface-behavior-bvh_directory')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Localized
id={'settings-interface-behavior-bvh_directory-description'}
>
<Typography color="secondary"></Typography>
</Localized>
</div>
<div className="grid gap-3 pb-5">
<TauriFileInput
name="behavior.bvhDirectory"
rules={{
required: false,
}}
control={control}
label="settings-interface-behavior-bvh_directory-label"
directory
/>
</div>
</>
)}
</>
</SettingsPagePaneLayout>
@@ -363,13 +356,11 @@ export function InterfaceSettings() {
<Typography variant="main-title">
{l10n.getString('settings-interface-appearance')}
</Typography>
<div className="pt-2">
<Typography variant="section-title">
{l10n.getString('settings-interface-appearance-decorations')}
</Typography>
</div>
<Typography bold>
{l10n.getString('settings-interface-appearance-decorations')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-interface-appearance-decorations-description'
)}
@@ -388,7 +379,7 @@ export function InterfaceSettings() {
</div>
<div className="pb-4">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-interface-theme')}
</Typography>
<div className="flex flex-wrap gap-3 pt-2">
@@ -449,13 +440,13 @@ export function InterfaceSettings() {
</div>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-interface-show-navbar-onboarding'
)}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-show-navbar-onboarding-description'
)}
@@ -473,11 +464,11 @@ export function InterfaceSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-interface-appearance-font')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-interface-appearance-font-description'
)}
@@ -522,11 +513,11 @@ export function InterfaceSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-interface-appearance-font_size')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-interface-appearance-font_size-description'
)}
@@ -550,11 +541,11 @@ export function InterfaceSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-general-interface-lang')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-general-interface-lang-description')}
</Typography>
</div>
@@ -95,7 +95,7 @@ export function MagnetometerToggleSetting({
return settingType === 'general' ? (
<>
<div className="flex flex-col pt-5 pb-3" id={id}>
<Typography variant="section-title">
<Typography bold>
{l10n.getString(
'settings-general-tracker_mechanics-use_mag_on_all_trackers'
)}
@@ -104,7 +104,10 @@ export function MagnetometerToggleSetting({
id="settings-general-tracker_mechanics-use_mag_on_all_trackers-description"
elems={{ b: <b></b> }}
>
<Typography whitespace="whitespace-pre-line"></Typography>
<Typography
color="secondary"
whitespace="whitespace-pre-line"
></Typography>
</Localized>
</div>
<CheckBox
@@ -136,7 +139,10 @@ export function MagnetometerToggleSetting({
),
}}
>
<Typography whitespace="whitespace-pre-line"></Typography>
<Typography
color="secondary"
whitespace="whitespace-pre-line"
></Typography>
</Localized>
<div className="flex">
<CheckBox
@@ -110,15 +110,17 @@ export function OSCRouterSettings() {
.getString('settings-osc-router-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-router-enable')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-router-enable-description')}
</Typography>
</div>
@@ -131,7 +133,7 @@ export function OSCRouterSettings() {
label={l10n.getString('settings-osc-router-enable-label')}
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-router-network')}
</Typography>
<div className="flex flex-col pb-2">
@@ -140,7 +142,9 @@ export function OSCRouterSettings() {
.getString('settings-osc-router-network-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
@@ -172,11 +176,11 @@ export function OSCRouterSettings() {
></Input>
</Localized>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-router-network-address')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-osc-router-network-address-description'
)}
+3 -1
View File
@@ -240,7 +240,9 @@ export function Serial() {
.getString('settings-serial-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
@@ -137,15 +137,17 @@ export function VMCSettings() {
.getString('settings-osc-vmc-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-enable')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vmc-enable-description')}
</Typography>
</div>
@@ -158,7 +160,7 @@ export function VMCSettings() {
label={l10n.getString('settings-osc-vmc-enable-label')}
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-network')}
</Typography>
<div className="flex flex-col pb-2">
@@ -167,7 +169,9 @@ export function VMCSettings() {
.getString('settings-osc-vmc-network-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
@@ -199,11 +203,11 @@ export function VMCSettings() {
></Input>
</Localized>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-network-address')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vmc-network-address-description')}
</Typography>
</div>
@@ -223,11 +227,11 @@ export function VMCSettings() {
label=""
></Input>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-vrm')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vmc-vrm-description')}
</Typography>
</div>
@@ -250,11 +254,11 @@ export function VMCSettings() {
></FileInput>
{/* For some reason, linux (GNOME) is detecting the VRM file is a VRML */}
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-anchor_hip')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vmc-anchor_hip-description')}
</Typography>
</div>
@@ -267,11 +271,11 @@ export function VMCSettings() {
label={l10n.getString('settings-osc-vmc-anchor_hip-label')}
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vmc-mirror_tracking')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vmc-mirror_tracking-description')}
</Typography>
</div>
@@ -140,15 +140,17 @@ export function VRCOSCSettings() {
.getString('settings-osc-vrchat-description-v1')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vrchat-enable')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vrchat-enable-description')}
</Typography>
</div>
@@ -162,16 +164,18 @@ export function VRCOSCSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vrchat-oscqueryEnabled')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n
.getString('settings-osc-vrchat-oscqueryEnabled-description')
.split('\n')
.map((line, i) => (
<Typography key={i}>{line}</Typography>
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</Typography>
</div>
@@ -187,11 +191,11 @@ export function VRCOSCSettings() {
/>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vrchat-network')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-osc-vrchat-network-description-v1')}
</Typography>
</div>
@@ -223,11 +227,11 @@ export function VRCOSCSettings() {
></Input>
</Localized>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vrchat-network-address')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-osc-vrchat-network-address-description-v1'
)}
@@ -249,11 +253,11 @@ export function VRCOSCSettings() {
label=""
></Input>
</div>
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-osc-vrchat-network-trackers')}
</Typography>
<div className="flex flex-col pb-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-osc-vrchat-network-trackers-description'
)}
@@ -40,7 +40,9 @@ function StaAlignedPoseModal({
</div>
<div className="flex flex-col gap-1">
{descriptionKeys.map((descriptionKey) => (
<Typography>{l10n.getString(descriptionKey)}</Typography>
<Typography color="secondary">
{l10n.getString(descriptionKey)}
</Typography>
))}
</div>
<div className="flex pt-1 items-center fill-background-50 justify-center px-12">
@@ -182,10 +182,10 @@ export function StayAlignedSettings({
{l10n.getString('settings-stay_aligned')}
</Typography>
<div className="mt-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-stay_aligned-description')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('settings-stay_aligned-setup-description')}
</Typography>
<div className="flex mt-2">
@@ -199,7 +199,7 @@ export function StayAlignedSettings({
</div>
</div>
<div className="mt-6">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-stay_aligned-general-label')}
</Typography>
<div className="grid sm:grid-cols-2 gap-3 mt-2">
@@ -224,11 +224,11 @@ export function StayAlignedSettings({
</div>
</div>
<div className="mt-6">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-stay_aligned-relaxed_poses-label')}
</Typography>
<div className="mt-2">
<Typography>
<Typography color="secondary">
{l10n.getString(
'settings-stay_aligned-relaxed_poses-description'
)}
@@ -305,11 +305,11 @@ export function StayAlignedSettings({
</div>
</div>
<div className="mt-6">
<Typography variant="section-title">
<Typography bold>
{l10n.getString('settings-stay_aligned-debug-label')}
</Typography>
<div className="mt-2">
<Typography>
<Typography color="secondary">
{l10n.getString('settings-stay_aligned-debug-description')}
</Typography>
</div>
@@ -49,7 +49,7 @@ export function SingleTrackerBodyAssignmentMenu({
<Typography variant="mobile-title" bold>
{l10n.getString('body_assignment_menu')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('body_assignment_menu-description')}
</Typography>
<div className="flex">
@@ -7,7 +7,7 @@ export function TrackerBattery({
value,
voltage,
disabled,
textColor = 'primary',
textColor = 'secondary',
}: {
/**
* a [0, 1] value range is expected
-177
View File
@@ -1,177 +0,0 @@
import { useLocalization } from '@fluent/react';
import { useEffect, useState } from 'react';
import { Line } from 'react-chartjs-2';
import { TrackerDataT } from 'solarxr-protocol';
import { Button } from '@/components/commons/Button';
import { useConfig } from '@/hooks/config';
export function TrackerGraph({ tracker }: { tracker: TrackerDataT }) {
const { l10n } = useLocalization();
const { config } = useConfig();
type AxisData = {
x: number;
y: number;
time: number;
};
type ChartData = {
x: AxisData[];
y: AxisData[];
z: AxisData[];
};
const [chartData, setChartData] = useState<ChartData>({
x: [],
y: [],
z: [],
});
const [showTrackerGraph, setShowTrackerGraph] = useState(false);
const secondDuration = 60;
useEffect(() => {
if (!showTrackerGraph) {
return;
}
const newValue = tracker.info?.isImu
? tracker.linearAcceleration
: tracker.position;
if (!newValue) {
return;
}
const currentTime = new Date().getTime() / 1000;
const startTime = currentTime - secondDuration;
const updateData = (data: AxisData[], newSample: number) => {
const remapped = data
.filter((value) => value.time >= startTime)
.map((value) => ({ ...value, x: value.time - startTime }));
remapped.push({
time: currentTime,
x: secondDuration,
y: newSample,
});
return remapped;
};
const newData = {
x: updateData(chartData.x, newValue.x),
y: updateData(chartData.y, newValue.y),
z: updateData(chartData.z, newValue.z),
};
setChartData(newData);
}, [tracker]);
useEffect(() => {
if (!showTrackerGraph) {
setChartData({ x: [], y: [], z: [] });
}
}, [showTrackerGraph]);
return (
<>
<Button
variant="tertiary"
className="self-start"
onClick={() => setShowTrackerGraph(!showTrackerGraph)}
>
{l10n.getString(
showTrackerGraph
? 'tracker-settings-graph-hide-title'
: 'tracker-settings-graph-show-title'
)}
</Button>
{showTrackerGraph && (
<div className="h-96">
<Line
options={{
responsive: true,
animation: false,
font: {
family: config?.fonts.map((font) => `"${font}"`).join(','),
size: config?.textSize,
},
plugins: {
title: {
display: true,
text: l10n.getString(
tracker?.info?.isImu
? 'tracker-settings-graph-acceleration-title'
: 'tracker-settings-graph-position-title'
),
color: 'white',
},
tooltip: {
mode: 'index',
intersect: false,
animation: false,
callbacks: {
title: () => '',
},
},
legend: {
labels: {
color: 'white',
},
},
},
scales: {
x: {
type: 'linear',
min: 0,
max: secondDuration,
ticks: {
color: 'white',
},
},
y: {
min: -4,
max: 4,
ticks: {
color: 'white',
},
},
},
elements: {
point: {
radius: 0,
},
},
parsing: false,
normalized: true,
maintainAspectRatio: false,
}}
data={{
labels: ['X', 'Y', 'Z'],
datasets: [
{
label: 'X',
data: chartData.x,
borderColor: 'rgb(200, 50, 50)',
backgroundColor: 'rgb(200, 100, 100)',
},
{
label: 'Y',
data: chartData.y,
borderColor: 'rgb(50, 200, 50)',
backgroundColor: 'rgb(100, 200, 100)',
},
{
label: 'Z',
data: chartData.z,
borderColor: 'rgb(50, 50, 200)',
backgroundColor: 'rgb(100, 100, 200)',
},
],
}}
id="tracker-graph"
/>
</div>
)}
</>
);
}
@@ -99,7 +99,7 @@ export function TrackerPartCard({
<WarningIcon></WarningIcon>
</div>
)}
<Typography variant="section-title">
<Typography color="secondary">
{l10n.getString('body_part-' + BodyPart[role])}
</Typography>
{td?.map(({ tracker }, index) => (
@@ -110,7 +110,7 @@ export function TrackerPartCard({
/>
))}
{!td && (
<Typography color="text-background-30">
<Typography>
{l10n.getString('tracker-part_card-unassigned')}
</Typography>
)}
+20 -18
View File
@@ -40,7 +40,6 @@ import semver from 'semver';
import { useSetAtom } from 'jotai';
import { ignoredTrackersAtom } from '@/store/app-store';
import { checkForUpdate } from '@/hooks/firmware-update';
import { TrackerGraph } from './TrackerGraph';
const rotationsLabels: [Quaternion, string][] = [
[rotationToQuatMap.BACK, 'tracker-rotation-back'],
@@ -212,10 +211,10 @@ export function TrackerSettingsPage() {
</Typography>
</Localized>
<div className="flex gap-2">
<Typography>
<Typography color="secondary">
v{tracker?.device?.hardwareInfo?.firmwareVersion}
</Typography>
<Typography>-</Typography>
<Typography color="secondary">-</Typography>
{updateUnavailable && (
<Localized id="tracker-settings-update-unavailable">
<Typography>Cannot be updated (DIY)</Typography>
@@ -273,7 +272,7 @@ export function TrackerSettingsPage() {
<div className="flex flex-col bg-background-70 p-3 rounded-lg gap-2 overflow-x-auto">
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-manufacturer')}
</Typography>
<Typography>
@@ -281,13 +280,13 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-display_name')}
</Typography>
<Typography>{tracker?.tracker.info?.displayName}</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-custom_name')}
</Typography>
<Typography sentry-mask>
@@ -295,7 +294,9 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>{l10n.getString('tracker-infos-url')}</Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-url')}
</Typography>
<Typography>
udp://
{IPv4.fromNumber(
@@ -304,7 +305,7 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-hardware_identifier')}
</Typography>
<Typography>
@@ -312,7 +313,7 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-data_support')}
</Typography>
<Typography>
@@ -322,7 +323,9 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>{l10n.getString('tracker-infos-imu')}</Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-imu')}
</Typography>
<Typography>
{tracker?.tracker.info?.imuType
? ImuType[tracker?.tracker.info?.imuType]
@@ -330,13 +333,13 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-board_type')}
</Typography>
<Typography>{boardType}</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-magnetometer')}
</Typography>
<Typography>
@@ -349,7 +352,7 @@ export function TrackerSettingsPage() {
</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-network_version')}
</Typography>
<Typography>
@@ -374,7 +377,7 @@ export function TrackerSettingsPage() {
<Typography variant="section-title">
{l10n.getString('tracker-settings-assignment_section')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'tracker-settings-assignment_section-description'
)}
@@ -416,7 +419,7 @@ export function TrackerSettingsPage() {
<Typography variant="section-title">
{l10n.getString('tracker-settings-mounting_section')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString(
'tracker-settings-mounting_section-description'
)}
@@ -465,7 +468,7 @@ export function TrackerSettingsPage() {
<Typography variant="section-title">
{l10n.getString('tracker-settings-name_section')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-settings-name_section-description')}
</Typography>
<Input
@@ -485,7 +488,7 @@ export function TrackerSettingsPage() {
<Typography variant="section-title">
{l10n.getString('tracker-settings-forget')}
</Typography>
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-settings-forget-description')}
</Typography>
<Button
@@ -506,7 +509,6 @@ export function TrackerSettingsPage() {
</Button>
</div>
)}
{tracker && <TrackerGraph tracker={tracker.tracker} />}
</div>
</div>
</form>
+1 -1
View File
@@ -35,7 +35,7 @@ export function TrackerStatus({ status }: { status: number }) {
<div className="flex flex-col justify-center">
<div className={classNames('w-2 h-2 rounded-full', statusClass)}></div>
</div>
<Typography whitespace="whitespace-nowrap">
<Typography color="secondary" whitespace="whitespace-nowrap">
{l10n.getString(statusLabel)}
</Typography>
</div>
+4 -4
View File
@@ -130,7 +130,7 @@ export function VRCWarningsPage() {
<Typography variant="main-title" />
</Localized>
<Localized id={'vrc_config-page-desc'}>
<Typography variant="standard" />
<Typography variant="standard" color="secondary" />
</Localized>
</div>
<div className="w-full mt-4 gap-2 flex flex-col">
@@ -142,7 +142,7 @@ export function VRCWarningsPage() {
<Typography variant="section-title" />
</Localized>
<Localized id="vrc_config-page-big_menu-desc">
<Typography />
<Typography color="secondary" />
</Localized>
<Table>
<SettingRow
@@ -248,7 +248,7 @@ export function VRCWarningsPage() {
<Typography variant="section-title" />
</Localized>
<Localized id="vrc_config-page-wrist_menu-desc">
<Typography />
<Typography color="secondary" />
</Localized>
<Table>
<SettingRow
@@ -304,7 +304,7 @@ export function VRCWarningsPage() {
a: <A href="https://docs.slimevr.dev/tools/vrchat-config.html"></A>,
}}
>
<Typography />
<Typography color="secondary" />
</Localized>
</div>
</div>
@@ -75,7 +75,9 @@ export function DeveloperModeWidget() {
return (
<form className="bg-background-60 flex flex-col w-full rounded-md px-2">
<div className="mt-2 px-1">
<Typography>{l10n.getString('widget-developer_mode')}</Typography>
<Typography color="secondary">
{l10n.getString('widget-developer_mode')}
</Typography>
</div>
{Object.entries(toggles).map(makeToggle)}
</form>
@@ -128,7 +128,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
{tracker.position && (
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-position')}
</Typography>
<Typography>{formatVector3(tracker.position, 2)}</Typography>
@@ -136,14 +136,14 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
)}
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-rotation_raw')}
</Typography>
<Typography>{formatVector3(rotationRaw, 2)}</Typography>
</div>
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-rotation_preview')}
</Typography>
<Typography>{formatVector3(rotationIdent, 2)}</Typography>
@@ -151,7 +151,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
{tracker.linearAcceleration && (
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-acceleration')}
</Typography>
<Typography>
@@ -162,7 +162,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
{tracker.rawMagneticVector && (
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('tracker-infos-magnetometer')}
</Typography>
<Typography>{formatVector3(tracker.rawMagneticVector, 1)}</Typography>
@@ -171,7 +171,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
{!!tracker.stayAligned && (
<div className="flex justify-between">
<Typography>
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-stay_aligned')}
</Typography>
<StayAlignedInfo color="primary" tracker={tracker} />
+3 -1
View File
@@ -68,7 +68,9 @@ export function OverlayWidget() {
return !loading ? (
<form className="bg-background-60 flex flex-col w-full rounded-md px-2">
<div className="mt-2 px-1">
<Typography>{l10n.getString('widget-overlay')}</Typography>
<Typography color="secondary">
{l10n.getString('widget-overlay')}
</Typography>
</div>
<CheckBox
control={control}
+5 -9
View File
@@ -27,14 +27,6 @@ const hash = (str: string) => {
const firstAsset = (assets: any[], name: string) =>
assets.find((asset: any) => asset.name === name && asset.browser_download_url);
const todaysRange = (deployData: [number, Date][]): number => {
let maxRange = 0;
for (const [range, date] of deployData) {
if (Date.now() >= date.getTime()) maxRange = range;
}
return maxRange;
};
const checkUserCanUpdate = async (url: string, fwVersion: string) => {
if (!url) return true;
const deployDataJson = JSON.parse(
@@ -65,7 +57,11 @@ const checkUserCanUpdate = async (url: string, fwVersion: string) => {
)
return false; // Dates in the wrong order / cancel
const todayUpdateRange = todaysRange(deployData);
const todayUpdateRange = deployData.find(([, date], index) => {
if (index === 0 && Date.now() < date.getTime()) return true;
return Date.now() >= date.getTime();
})?.[0];
if (!todayUpdateRange) return false;
const uniqueUserKey = `${await hostname()}-${await locale()}-${platform()}-${version()}`;
+46
View File
@@ -95,3 +95,49 @@ export const trackerFromIdAtom = ({
(a) => a,
isEqual
);
export const FEET_BODY_PARTS = [BodyPart.LEFT_FOOT, BodyPart.RIGHT_FOOT];
export const FINGER_BODY_PARTS = new Set([
BodyPart.LEFT_THUMB_METACARPAL,
BodyPart.LEFT_THUMB_PROXIMAL,
BodyPart.LEFT_THUMB_DISTAL,
BodyPart.LEFT_INDEX_PROXIMAL,
BodyPart.LEFT_INDEX_INTERMEDIATE,
BodyPart.LEFT_INDEX_DISTAL,
BodyPart.LEFT_MIDDLE_PROXIMAL,
BodyPart.LEFT_MIDDLE_INTERMEDIATE,
BodyPart.LEFT_MIDDLE_DISTAL,
BodyPart.LEFT_RING_PROXIMAL,
BodyPart.LEFT_RING_INTERMEDIATE,
BodyPart.LEFT_RING_DISTAL,
BodyPart.LEFT_LITTLE_PROXIMAL,
BodyPart.LEFT_LITTLE_INTERMEDIATE,
BodyPart.LEFT_LITTLE_DISTAL,
BodyPart.RIGHT_THUMB_METACARPAL,
BodyPart.RIGHT_THUMB_PROXIMAL,
BodyPart.RIGHT_THUMB_DISTAL,
BodyPart.RIGHT_INDEX_PROXIMAL,
BodyPart.RIGHT_INDEX_INTERMEDIATE,
BodyPart.RIGHT_INDEX_DISTAL,
BodyPart.RIGHT_MIDDLE_PROXIMAL,
BodyPart.RIGHT_MIDDLE_INTERMEDIATE,
BodyPart.RIGHT_MIDDLE_DISTAL,
BodyPart.RIGHT_RING_PROXIMAL,
BodyPart.RIGHT_RING_INTERMEDIATE,
BodyPart.RIGHT_RING_DISTAL,
BodyPart.RIGHT_LITTLE_PROXIMAL,
BodyPart.RIGHT_LITTLE_INTERMEDIATE,
BodyPart.RIGHT_LITTLE_DISTAL,
]);
export const fingerAssignedTrackers = atom((get) =>
get(assignedTrackersAtom).some(
(t) => t.tracker.info?.bodyPart && FINGER_BODY_PARTS.has(t.tracker.info.bodyPart)
)
);
export const feetAssignedTrackers = atom((get) =>
get(assignedTrackersAtom).some(
(t) => t.tracker.info?.bodyPart && FEET_BODY_PARTS.includes(t.tracker.info.bodyPart)
)
);
+5 -5
View File
@@ -4,14 +4,14 @@
declare const __COMMIT_HASH__: string;
declare const __VERSION_TAG__: string;
declare const __GIT_CLEAN__: boolean;
declare const __ANDROID__:
| {
isThere: () => boolean;
}
| undefined;
interface Window {
readonly isTauri: boolean;
readonly __ANDROID__:
| {
isThere: () => boolean;
}
| undefined;
}
declare module 'tailwind-gradient-mask-image';
-31
View File
@@ -83,9 +83,6 @@ importers:
browser-fs-access:
specifier: ^0.35.0
version: 0.35.0
chart.js:
specifier: ^4.5.0
version: 4.5.0
classnames:
specifier: ^2.5.1
version: 2.5.1
@@ -107,9 +104,6 @@ importers:
react:
specifier: ^18.3.1
version: 18.3.1
react-chartjs-2:
specifier: ^5.3.0
version: 5.3.0([email protected])([email protected])
react-dom:
specifier: ^18.3.1
version: 18.3.1([email protected])
@@ -726,9 +720,6 @@ packages:
'@jridgewell/[email protected]':
resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
'@kurkle/[email protected]':
resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==}
'@mediapipe/[email protected]':
resolution: {integrity: sha512-Rp7ll8BHrKB3wXaRFKhrltwZl1CiXGdibPxuWXvqGnKTnv8fqa/nvftYNuSbf+pbJWKYCXdBtYTITdAUTGGh0Q==}
@@ -1789,10 +1780,6 @@ packages:
[email protected]:
resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
[email protected]:
resolution: {integrity: sha512-aYeC/jDgSEx8SHWZvANYMioYMZ2KX02W6f6uVfyteuCGcadDLcYVHdfdygsTQkQ4TKn5lghoojAsPj5pu0SnvQ==}
engines: {pnpm: '>=8'}
[email protected]:
resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
engines: {node: '>= 8.10.0'}
@@ -2483,7 +2470,6 @@ packages:
[email protected]:
resolution: {integrity: sha512-Gwj/A2htjvLEcY07PKDItv0WCPEs3dV2vWeZ+9TVBSKSTuWEZ4oXaMD0ZAOsajwx2orahQWN4HI0MfRyWSZsbg==}
engines: {node: '>=14.0.0'}
deprecated: please use built-in fetch in nodejs
peerDependencies:
got: ^12.0.0
@@ -3556,12 +3542,6 @@ packages:
resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
engines: {node: '>=10'}
[email protected]:
resolution: {integrity: sha512-UfZZFnDsERI3c3CZGxzvNJd02SHjaSJ8kgW1djn65H1KK8rehwTjyrRKOG3VTMG8wtHZ5rgAO5oTHtHi9GCCmw==}
peerDependencies:
chart.js: ^4.1.1
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
[email protected]:
resolution: {integrity: sha512-1uWd07EME6XZvMfapwZmc7NgCZqDemcvicRi3wMJzXsQLvZ3L7fTHVyPy1bZdnWXM4iPjYuNE+uJ41MLKeTtnA==}
peerDependencies:
@@ -4979,8 +4959,6 @@ snapshots:
'@jridgewell/resolve-uri': 3.1.2
'@jridgewell/sourcemap-codec': 1.4.15
'@kurkle/[email protected]': {}
'@mediapipe/[email protected]': {}
'@mgit-at/[email protected]':
@@ -6094,10 +6072,6 @@ snapshots:
[email protected]: {}
[email protected]:
dependencies:
'@kurkle/color': 0.3.4
[email protected]:
dependencies:
anymatch: 3.1.3
@@ -8185,11 +8159,6 @@ snapshots:
[email protected]: {}
[email protected]([email protected])([email protected]):
dependencies:
chart.js: 4.5.0
react: 18.3.1
[email protected]([email protected]):
dependencies:
prop-types: 15.8.1
@@ -2,8 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-feature android:name="android.hardware.usb.host" android:required="false" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
@@ -28,11 +26,7 @@
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter" />
</activity>
<service
@@ -8,8 +8,6 @@ import androidx.appcompat.app.AppCompatActivity
import dev.slimevr.Keybinding
import dev.slimevr.VRServer
import dev.slimevr.android.serial.AndroidSerialHandler
import dev.slimevr.android.tracking.trackers.hid.AndroidHIDManager
import dev.slimevr.tracking.trackers.Tracker
import io.eiren.util.logging.LogManager
import io.ktor.http.CacheControl
import io.ktor.http.CacheControl.Visibility
@@ -62,15 +60,6 @@ fun main(activity: AppCompatActivity) {
},
)
vrServer.start()
// Start service for USB HID trackers
val androidHidManager = AndroidHIDManager(
"Sensors HID service",
{ tracker: Tracker -> vrServer.registerTracker(tracker) },
activity,
)
androidHidManager.start()
Keybinding(vrServer)
vrServer.join()
LogManager.closeLogger()
@@ -1,13 +1,10 @@
package dev.slimevr.android.serial
import android.app.PendingIntent
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.hardware.usb.UsbManager
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import com.hoho.android.usbserial.driver.UsbSerialDriver
import com.hoho.android.usbserial.driver.UsbSerialPort
import com.hoho.android.usbserial.driver.UsbSerialProber
@@ -18,8 +15,10 @@ import io.eiren.util.logging.LogManager
import java.io.IOException
import java.nio.ByteBuffer
import java.nio.charset.StandardCharsets
import java.util.*
import java.util.concurrent.CopyOnWriteArrayList
import java.util.stream.Stream
import kotlin.concurrent.timerTask
import kotlin.streams.asSequence
import kotlin.streams.asStream
import dev.slimevr.serial.SerialPort as SlimeSerialPort
@@ -44,11 +43,12 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
private var usbIoManager: SerialInputOutputManager? = null
private val listeners: MutableList<SerialListener> = CopyOnWriteArrayList()
private val getDevicesTimer = Timer("GetDevicesTimer")
private var watchingNewDevices = false
private var lastKnownPorts = setOf<SerialPortWrapper>()
private val manager = activity.getSystemService(Context.USB_SERVICE) as UsbManager
private var currentPort: SerialPortWrapper? = null
private var requestingPermission: String = ""
private var readBuffer: StringBuilder = StringBuilder(1024)
override val isConnected: Boolean
get() = currentPort?.port?.isOpen ?: false
@@ -60,70 +60,37 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
.filter { isKnownBoard(it) }
.asStream()
val usbReceiver: BroadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
when (intent.action) {
UsbManager.ACTION_USB_DEVICE_ATTACHED, UsbManager.ACTION_USB_DEVICE_DETACHED -> {
// Use device from `UsbManager.EXTRA_DEVICE` if this is a problem
detectNewPorts()
}
ACTION_USB_PERMISSION -> {
// TODO: We can probably receive this event in the server to avoid
// polling, but for now we can just ignore it. (Note: This event is
// not currently registered, so it will never fire.)
}
}
}
}
init {
val intentFilter = IntentFilter(UsbManager.ACTION_USB_DEVICE_ATTACHED)
intentFilter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED)
// Listen for USB device attach/detach
ContextCompat.registerReceiver(
activity,
usbReceiver,
intentFilter,
ContextCompat.RECEIVER_NOT_EXPORTED,
)
// Detect initial serial ports
detectNewPorts()
startWatchingNewDevices()
}
private fun getPorts(): List<UsbSerialDriver> = UsbSerialProber.getDefaultProber().findAllDrivers(manager)
private fun onNewDevice(port: SerialPortWrapper) {
// If we missed clearing this on disconnect/close, clear it on discovery
if (requestingPermission == port.portLocation) {
requestingPermission = ""
}
private fun startWatchingNewDevices() {
if (watchingNewDevices) return
watchingNewDevices = true
getDevicesTimer.scheduleAtFixedRate(
timerTask {
try {
detectNewPorts()
} catch (t: Throwable) {
LogManager.severe(
"[SerialHandler] Error while watching for new devices, cancelling the \"getDevicesTimer\".",
t,
)
getDevicesTimer.cancel()
}
},
0,
3000,
)
}
LogManager.info("[SerialHandler] Device added: ${port.descriptivePortName}")
private fun onNewDevice(port: SerialPortWrapper) {
listeners.forEach { it.onNewSerialDevice(port) }
}
private fun onDeviceDel(port: SerialPortWrapper) {
// Remove permission request on disconnect so reconnecting re-requests
if (requestingPermission == port.portLocation) {
requestingPermission = ""
}
// If we're currently using this port, close it
currentPort?.portLocation.let { currentPortLocation ->
if (currentPortLocation == port.portLocation) {
closeSerial()
}
}
// If this port is still open for whatever reason, close it
if (port.port.isOpen) {
port.port.close()
}
LogManager.info("[SerialHandler] Device removed: ${port.descriptivePortName}")
listeners.forEach { it.onSerialDeviceDeleted(port) }
}
@@ -187,11 +154,9 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
flags,
)
if (requestingPermission != newPort.portLocation) {
LogManager.info("[SerialHandler] Requesting permission for ${newPort.portLocation}")
println("Requesting permission for ${newPort.portLocation}")
manager.requestPermission(newPort.port.device, usbPermissionIntent)
requestingPermission = newPort.portLocation
} else {
LogManager.info("[SerialHandler] Already requested permission for ${newPort.portLocation}, skipping")
}
LogManager.warning(
"[SerialHandler] Can't open serial port ${newPort.descriptivePortName}, invalid permissions",
@@ -199,13 +164,11 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
return false
}
// If we have permission, we aren't requesting anymore
requestingPermission = ""
val connection = manager.openDevice(newPort.port.device)
if (connection == null) {
LogManager.warning(
"[SerialHandler] Can't open serial port ${newPort.descriptivePortName}, connection failed",
)
return false
}
@@ -223,7 +186,7 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
@Synchronized
private fun writeSerial(serialText: String, print: Boolean = false) {
try {
currentPort?.port?.write("${serialText}\n".toByteArray(), 0)
usbIoManager?.writeAsync("${serialText}\n".toByteArray())
if (print) {
addLog("-> $serialText\n")
}
@@ -261,8 +224,6 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
usbIoManager?.stop()
usbIoManager = null
currentPort = null
requestingPermission = ""
readBuffer.clear()
} catch (e: Exception) {
LogManager.warning(
"[SerialHandler] Error closing port ${currentPort?.descriptivePortName}",
@@ -272,7 +233,7 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
}
override fun write(buff: ByteArray) {
currentPort?.port?.write(buff, 0)
usbIoManager?.writeAsync(buff)
}
@Synchronized
@@ -290,21 +251,14 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
override fun onNewData(data: ByteArray?) {
if (data != null) {
// Collect serial in a buffer until newline (or character limit)
// This is somewhat of a workaround for Android serial buffer being smaller
// than on desktop, so we don't read full lines and it causes parsing issues
readBuffer.append(StandardCharsets.UTF_8.decode(ByteBuffer.wrap(data)))
if (readBuffer.contains('\n') || readBuffer.length >= 1024) {
addLog(readBuffer.toString(), false)
readBuffer.clear()
}
val s = StandardCharsets.UTF_8.decode(ByteBuffer.wrap(data)).toString()
addLog(s, false)
}
}
override fun onRunError(e: java.lang.Exception?) {}
companion object {
private const val ACTION_USB_PERMISSION = "dev.slimevr.USB_PERMISSION"
private val ACTION_USB_PERMISSION = "dev.slimevr.USB_PERMISSION"
}
}
@@ -1,93 +0,0 @@
package dev.slimevr.android.tracking.trackers.hid
import android.hardware.usb.UsbConstants
import android.hardware.usb.UsbDevice
import android.hardware.usb.UsbDeviceConnection
import android.hardware.usb.UsbEndpoint
import android.hardware.usb.UsbInterface
import android.hardware.usb.UsbManager
import java.io.Closeable
/**
* A wrapper over Android's [UsbDevice] for HID devices.
*/
class AndroidHIDDevice(hidDevice: UsbDevice, usbManager: UsbManager) : Closeable {
val deviceName = hidDevice.deviceName
val serialNumber = hidDevice.serialNumber
val manufacturerName = hidDevice.manufacturerName
val productName = hidDevice.productName
val hidInterface: UsbInterface
val endpointIn: UsbEndpoint
val endpointOut: UsbEndpoint?
val deviceConnection: UsbDeviceConnection
init {
hidInterface = findHidInterface(hidDevice)!!
val (endpointIn, endpointOut) = findHidIO(hidInterface)
this.endpointIn = endpointIn!!
this.endpointOut = endpointOut
deviceConnection = usbManager.openDevice(hidDevice)!!
deviceConnection.claimInterface(hidInterface, true)
}
override fun close() {
deviceConnection.releaseInterface(hidInterface)
deviceConnection.close()
}
companion object {
/**
* Find the HID interface.
*
* @return
* Return the HID interface if found, otherwise null.
*/
private fun findHidInterface(usbDevice: UsbDevice): UsbInterface? {
val interfaceCount: Int = usbDevice.interfaceCount
for (interfaceIndex in 0 until interfaceCount) {
val usbInterface = usbDevice.getInterface(interfaceIndex)
if (usbInterface.interfaceClass == UsbConstants.USB_CLASS_HID) {
return usbInterface
}
}
return null
}
/**
* Find the HID endpoints.
*
* @return
* Return the HID endpoints if found, otherwise null.
*/
private fun findHidIO(usbInterface: UsbInterface): Pair<UsbEndpoint?, UsbEndpoint?> {
val endpointCount: Int = usbInterface.endpointCount
var usbEndpointIn: UsbEndpoint? = null
var usbEndpointOut: UsbEndpoint? = null
for (endpointIndex in 0 until endpointCount) {
val usbEndpoint = usbInterface.getEndpoint(endpointIndex)
if (usbEndpoint.type == UsbConstants.USB_ENDPOINT_XFER_INT) {
if (usbEndpoint.direction == UsbConstants.USB_DIR_OUT) {
usbEndpointOut = usbEndpoint
} else {
usbEndpointIn = usbEndpoint
}
}
}
return Pair(usbEndpointIn, usbEndpointOut)
}
}
}
Loaded 100 of 112 files, more files were not shown because too many files have changed in this diff. Show more