Merge pull request #746 from cpuwolf/ch

tracker/wii: add lang chinese && BT optimization

2 files changed, 294 insertions, 1 deletions

diff --git a/tracker-wii/lang/zh_CN.ts b/tracker-wii/lang/zh_CN.ts
new file mode 100644
index 00000000..3f3131d8
--- /dev/null
+++ b/tracker-wii/lang/zh_CN.ts
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+<context>
+    <name>PT_metadata</name>
+    <message>
+        <location filename="../../tracker-pt/ftnoir_tracker_pt.h" line="+95"/>
+        <source>PointTracker 1.1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UICPTClientControls</name>
+    <message>
+        <location filename="../../tracker-pt/FTNoIR_PT_Controls.ui" line="+23"/>
+        <source>PointTracker Settings</source>
+        <translation>PointTracker设置</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Camera</source>
+        <translation>摄像头</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Camera settings</source>
+        <translation>摄像头设置</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>°</source>
+        <translation>度</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Diagonal field of view</source>
+        <translation>对角线</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Width</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>FPS</source>
+        <translation>帧数</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Desired capture height</source>
+        <translation>期望高度</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+55"/>
+        <location line="+175"/>
+        <location line="+16"/>
+        <source> px</source>
+        <translation> 像素点</translation>
+    </message>
+    <message>
+        <location line="-233"/>
+        <source>Dynamic pose timeout</source>
+        <translation>动态姿态超时时间</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Desired capture framerate</source>
+        <translation>期望帧数</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source> Hz</source>
+        <translation> 赫兹</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Desired capture width</source>
+        <translation>期望宽度</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Height</source>
+        <translation>高度</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source> ms</source>
+        <translation> 毫秒</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Dynamic pose resolution</source>
+        <translation>动态姿态分辨率</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Device</source>
+        <translation>设备名称</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Open</source>
+        <translation>打开</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Camera settings (when available)</source>
+        <translation>摄像头设置 （连接时）</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Point extraction</source>
+        <translation>跟踪点解析</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Max size</source>
+        <translation>最大</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Threshold</source>
+        <translation>大小门限值</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Min size</source>
+        <translation>最小</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Intensity threshold for point extraction</source>
+        <translation>点密度</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Automatic threshold</source>
+        <translation>自动门限值</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Enable, slider sets point size</source>
+        <translation>激活，滑动，设置跟踪点大小</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maximum point diameter</source>
+        <translation>最大点直径</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Minimum point diameter</source>
+        <translation>最小点直径</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Model</source>
+        <translation>点模式</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Clip</source>
+        <translation>夹子式</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+154"/>
+        <location line="+129"/>
+        <source>Model Dimensions</source>
+        <translation>尺寸</translation>
+    </message>
+    <message>
+        <location line="-271"/>
+        <location line="+19"/>
+        <location line="+48"/>
+        <location line="+19"/>
+        <location line="+97"/>
+        <location line="+35"/>
+        <location line="+32"/>
+        <location line="+40"/>
+        <location line="+26"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+13"/>
+        <location line="+26"/>
+        <location line="+132"/>
+        <location line="+26"/>
+        <location line="+26"/>
+        <source> mm</source>
+        <translation> 毫米</translation>
+    </message>
+    <message>
+        <location line="-511"/>
+        <location line="+116"/>
+        <source>Side</source>
+        <translation>侧面</translation>
+    </message>
+    <message>
+        <location line="-65"/>
+        <location line="+132"/>
+        <source>Front</source>
+        <translation>正面</translation>
+    </message>
+    <message>
+        <location line="-107"/>
+        <source>Cap</source>
+        <translation>帽子式</translation>
+    </message>
+    <message>
+        <location line="+135"/>
+        <source>Custom</source>
+        <translation>自定义模式</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <location line="+169"/>
+        <location line="+106"/>
+        <source>z:</source>
+        <translation>Z:</translation>
+    </message>
+    <message>
+        <location line="-249"/>
+        <location line="+104"/>
+        <location line="+93"/>
+        <source>x:</source>
+        <translation>X:</translation>
+    </message>
+    <message>
+        <location line="-132"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Location of the two remaining model points&lt;br/&gt;with respect to the reference point in default pose&lt;/p&gt;&lt;p&gt;Use any units you want, not necessarily centimeters.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;三点中的两点位置是相对第一个点的&lt;/p&gt;&lt;p&gt;单位不一定要用厘米&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+65"/>
+        <location line="+67"/>
+        <source>y:</source>
+        <translation>Y:</translation>
+    </message>
+    <message>
+        <location line="-106"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;P&lt;/span&gt;&lt;span style=&quot; font-size:16pt; vertical-align:sub;&quot;&gt;3&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;P&lt;/span&gt;&lt;span style=&quot; font-size:16pt; vertical-align:sub;&quot;&gt;3&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;P&lt;/span&gt;&lt;span style=&quot; font-size:16pt; vertical-align:sub;&quot;&gt;2&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt;&quot;&gt;P&lt;/span&gt;&lt;span style=&quot; font-size:16pt; vertical-align:sub;&quot;&gt;2&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Model position</source>
+        <translation>姿态空间位置</translation>
+    </message>
+    <message>
+        <location line="+105"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/opentrack/opentrack/wiki/model-calibration-for-PT-and-Aruco-trackers&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Instructions on the opentrack wiki&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/opentrack/opentrack/wiki/model-calibration-for-PT-and-Aruco-trackers&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;参考opentrack维基&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Start calibration</source>
+        <translation>开始校准</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>About</source>
+        <translation>关于</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;FTNoIR PointTracker Plugin&lt;br/&gt;Version 1.1&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;by Patrick Ruoff&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://ftnoirpt.sourceforge.net/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;Manual (external)&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;FTNoIR PointTracker Plugin&lt;br/&gt;Version 1.1&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Patrick Ruoff&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://ftnoirpt.sourceforge.net/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;参考手册 (外部链接)&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Status</source>
+        <translation>状态</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Extracted Points:</source>
+        <translation>解析出的点:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Camera Info:</source>
+        <translation>设备信息：</translation>
+    </message>
+</context>
+</TS>
diff --git a/tracker-wii/wii_camera.cpp b/tracker-wii/wii_camera.cpp
index 1186afc1..d3682e6f 100644
--- a/tracker-wii/wii_camera.cpp
+++ b/tracker-wii/wii_camera.cpp
@@ -142,7 +142,7 @@ wii_camera_status WIICamera::_pair()
 		btdevparam.fReturnConnected = TRUE;
 		btdevparam.fReturnRemembered = TRUE;
 		btdevparam.fIssueInquiry = TRUE;
-		btdevparam.cTimeoutMultiplier = 2;
+		btdevparam.cTimeoutMultiplier = 1;
 		btdevparam.hRadio = hbtlist[i];
 		hbtdevfd=BluetoothFindFirstDevice(&btdevparam, &btdevinfo);
 		if (!hbtdevfd) {