Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
TakayukiHoshi1984 committed Aug 9, 2016
2 parents d48c5e8 + 53e007d commit a9b677b
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 23 deletions.
35 changes: 22 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,12 @@ _*Please do not use at network that can not be trusted because there is a securi
</tr>
<tr>
<td>-</td>
<td>Android Ver4.2</td>
<td>Android Ver4.2 or later</td>
<td>Android</td>
<td>AndroidHost</td>
<td>○</td>
<td>×</td>
<td></td>
<td>Ver4.2 or later</td>
</tr>
<tr>
<td>LG</td>
Expand Down Expand Up @@ -442,7 +442,7 @@ _*Please do not use at network that can not be trusted because there is a securi
<tr>
<td>RICOH</td>
<td>THETA m15</td>
<td>Spherical Camera</td>
<td>Omnidirectional Camera</td>
<td>THETA</td>
<td>○</td>
<td>○</td>
Expand All @@ -451,7 +451,7 @@ _*Please do not use at network that can not be trusted because there is a securi
<tr>
<td>RICOH</td>
<td>THETA S</td>
<td>Spherical Camera</td>
<td>Omnidirectional Camera</td>
<td>THETA</td>
<td>○</td>
<td>○</td>
Expand All @@ -465,39 +465,48 @@ _*Please do not use at network that can not be trusted because there is a securi
<td>AllJoyn</td>
<td>○</td>
<td>○</td>
<td>No color change</td>
<td>No color change.</td>
</tr>
<tr>
<td>EchonetLite</td>
<td>LIFX</td>
<td>Color 1000</td>
<td>Light</td>
<td>AllJoyn</td>
<td>○</td>
<td>○</td>
<td></td>
</tr>
<tr>
<td>EchonetLite</td>
<td>Standard-compliant equipment in general</td>
<td>Home control</td>
<td>EchoneLite</td>
<td>○</td>
<td>×</td>
<td></td>
<td>Standard-compliant equipment in general</td>
</tr>
<tr>
<td>Linking</td>
<td></td>
<td>Tomoru</td>
<td>BLE</td>
<td>Linking</td>
<td>○</td>
<td>○</td>
<td>Now under development</td>
</tr>
<tr>
<td></td>
<td></td>
<td>UVC(USB Video Class)</td>
<td>WebCamera</td>
<td>USBCamera</td>
<td>UVC</td>
<td>○</td>
<td>×</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td>TV conference</td>
<td></td>
<td>Mobile camera</td>
<td>TV conference,Remote work support</td>
<td>WebRTC</td>
<td>○</td>
<td>×</td>
Expand Down
29 changes: 19 additions & 10 deletions readme.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Android root
<td>AndroidHost プラグイン</td>
<td>○</td>
<td>×</td>
<td></td>
<td>Ver4.2以降</td>
</tr>
<tr>
<td>LG</td>
Expand Down Expand Up @@ -479,7 +479,7 @@ Android root
<tr>
<td>RICOH</td>
<td>THETA m15</td>
<td>Spherical Camera</td>
<td>全天球カメラ</td>
<td>THETAプラグイン</td>
<td>○</td>
<td>○</td>
Expand All @@ -488,7 +488,7 @@ Android root
<tr>
<td>RICOH</td>
<td>THETA S</td>
<td>Spherical Camera</td>
<td>全天球カメラ</td>
<td>THETAプラグイン</td>
<td>○</td>
<td>○</td>
Expand All @@ -505,8 +505,17 @@ Android root
<td>White 800の色は変えられない。</td>
</tr>
<tr>
<td>EchonetLite</td>
<td>LIFX</td>
<td>Color 1000</td>
<td>ライト</td>
<td>AllJoynプラグイン</td>
<td>○</td>
<td>○</td>
<td></td>
</tr>
<tr>
<td>EchonetLite</td>
<td>規格準拠機器全般</td>
<td>家電製品制御</td>
<td>EchoneLiteプラグイン</td>
<td>○</td>
Expand All @@ -515,26 +524,26 @@ Android root
</tr>
<tr>
<td>Linking</td>
<td></td>
<td>Tomoru</td>
<td>BLE連携デバイス</td>
<td>Linkingプラグイン</td>
<td>○</td>
<td>○</td>
<td>準拠機器全般。開発中</td>
</tr>
<tr>
<td></td>
<td></td>
<td>UVC(USB Video Class)</td>
<td>Webカメラ</td>
<td>USBカメラ</td>
<td>UVCプラグイン</td>
<td>○</td>
<td>×</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td>テレビ会議</td>
<td></td>
<td>モバイルカメラ</td>
<td>テレビ会議、遠隔作業支援</td>
<td>WebRTCプラグイン</td>
<td>○</td>
<td>×</td>
Expand Down

0 comments on commit a9b677b

Please sign in to comment.