diff --git a/docs/en/source/_static/custom.css b/docs/en/source/_static/custom.css index 6143a721..aaa2509c 100755 --- a/docs/en/source/_static/custom.css +++ b/docs/en/source/_static/custom.css @@ -574,14 +574,32 @@ .wy-nav-content .rst-content table.docutils, .wy-nav-content .rst-content table.docutils td, .wy-nav-content .rst-content table.docutils th { - border-color: #d0d7de !important; + border: 0 !important; } .wy-nav-content .rst-content table.docutils { + border: 1px solid #d0d7de !important; + border-collapse: separate !important; + border-spacing: 0 !important; border-radius: 10px !important; overflow: hidden !important; } +.wy-nav-content .rst-content table.docutils td, +.wy-nav-content .rst-content table.docutils th { + border-right: 1px solid #d0d7de !important; + border-bottom: 1px solid #d0d7de !important; +} + +.wy-nav-content .rst-content table.docutils td:last-child, +.wy-nav-content .rst-content table.docutils th:last-child { + border-right: 0 !important; +} + +.wy-nav-content .rst-content table.docutils tr:last-child td { + border-bottom: 0 !important; +} + .wy-nav-content .rst-content thead th { background: #f6f8fa !important; } diff --git a/docs/en/source/camera_devices/1_overview/introduction.md b/docs/en/source/camera_devices/1_overview/introduction.md index ed7f3c26..bba5dc2a 100644 --- a/docs/en/source/camera_devices/1_overview/introduction.md +++ b/docs/en/source/camera_devices/1_overview/introduction.md @@ -10,16 +10,22 @@ Here is the device support list of main branch (v1.x) and v2-main branch (v2.x): - + - - + + - - + + + + + + + + @@ -28,31 +34,9 @@ Here is the device support list of main branch (v1.x) and v2-main branch (v2.x): - - - - - - - - - - - - - - - - - - - - - - @@ -87,6 +71,17 @@ Here is the device support list of main branch (v1.x) and v2-main branch (v2.x): + + + + + + + + + + + @@ -101,7 +96,7 @@ Here is the device support list of main branch (v1.x) and v2-main branch (v2.x): - + @@ -146,8 +141,13 @@ Here is the device support list of main branch (v1.x) and v2-main branch (v2.x): - - + + + + + + + @@ -183,26 +183,157 @@ For optimal performance, we strongly recommend updating to the latest firmware v To learn how to obtain and upgrade the latest firmware, [please click here](../3_quickstarts/orbbecviewer.md). -| **Products List** | **Recommended FW Version** | Launch File | -| ----------------------- | -------------------------------------------------------------------------------------------- | --------------------------- | -| Gemini 305 | [1.0.30](https://doc.orbbec.com/documentation/Gemini%20305%20Documentation/Firmware%20Release%20of%20Gemini%20305) | gemini305.launch.py | -| Gemini 305g | [1.0.30](https://doc.orbbec.com/documentation/Gemini%20305%20Documentation/Firmware%20Release%20of%20Gemini%20305) | gemini305_g.launch.py | -| Astra Mini Pro | [2.0.03](https://github.com/orbbec/OrbbecFirmware/releases/tag/Astra-Mini-Pro) | astra.launch.py | -| Astra Mini S Pro | [2.0.03](https://github.com/orbbec/OrbbecFirmware/releases/tag/Astra-Mini-S-Pro) | astra.launch.py | -| Gemini 435Le | [1.3.6](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemin435Le-Firmware) | gemini435_le.launch.py | -| Gemini 330 series | [1.6.00](https://orbbec-debian-repos-aws.s3.amazonaws.com/product/Gemini330_Release_1.6.00.zip) | gemini_330_series.launch.py | -| Gemini 215 | [1.0.9](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini215-Firmware) | gemini210.launch.py | -| Gemini 210 | [1.0.9](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini210-Firmware) | gemini210.launch.py | -| Gemini 2 | [1.4.98](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini2-Firmware) | gemini2.launch.py | -| Gemini 2 L | [1.5.2](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini2L-Firmware) | gemini2L.launch.py | -| Femto Bolt | [1.1.3](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Bolt-Firmware) | femto_bolt.launch.py | -| Femto Mega | [1.3.1](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Mega-Firmware) | femto_mega.launch.py | -| Femto Mega I | [2.0.4](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Mega-I-Firmware) | femto_mega.launch.py | -| Astra 2 | [2.8.20](https://orbbec-debian-repos-aws.s3.amazonaws.com/product/Astra2_Release_2.8.20.zip) | astra2.launch.py | -| Gemini 345 | 1.9.03 | gemini345.launch.py | -| Gemini 345Lg | 1.9.03 | gemini345_lg.launch.py | -| Pulsar SL450 | 2.2.4.5 | lidar.launch.py | -| Pulsar ME450 | 1.0.0.6 | lidar.launch.py | +
Product Series ProductBranch mainBranch v2-mainOrbbec SDK v1.xOrbbec SDK v2.x
Gemini 305
Gemini 430Gemini 435Lenot supportedrecommended for new designs
Gemini 301 Gemini 305 not supported recommended for new designsGemini 305g not supported recommended for new designs
Gemini 340Gemini 345not supportedrecommended for new designs
Gemini 345Lgnot supportedrecommended for new designs
Gemini 435LeGemini 435Lenot supportedrecommended for new designs
Gemini 330Gemini 335Lenot supportedrecommended for new designs
Gemini 335 full maintenance recommended for new designsnot supported recommended for new designs
Gemini 335Lenot supportedrecommended for new designs
Gemini 340Gemini 345Lgnot supportedrecommended for new designs
Gemini 2 Gemini 2
Gemini 2 XL recommended for new designsto be supportednot supported
Gemini 215not supported
Astra MiniAstra Mini (S) ProAstra MiniAstra Mini Profull maintenancerecommended for new designs
Astra Mini S Pro full maintenance recommended for new designs
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Product SeriesProducts ListRecommended FW VersionLaunch File
Gemini 430Gemini 435Le1.3.6gemini435_le.launch.py
Gemini 301Gemini 3051.0.30gemini305.launch.py
Gemini 305g1.0.30gemini305_g.launch.py
Gemini 330Gemini 3351.6.00gemini_330_series.launch.py
Gemini 3361.6.00gemini_330_series.launch.py
Gemini 3301.6.00gemini_330_series.launch.py
Gemini 335L1.6.00gemini_330_series.launch.py
Gemini 336L1.6.00gemini_330_series.launch.py
Gemini 330L1.6.00gemini_330_series.launch.py
Gemini 335Lg1.6.00gemini_330_series.launch.py
Gemini 335Le1.6.00gemini_330_series.launch.py
Gemini 340Gemini 345Lg1.9.03gemini345_lg.launch.py
Gemini 2Gemini 21.4.98gemini2.launch.py
Gemini 2 L1.5.2gemini2L.launch.py
Gemini 2151.0.9gemini210.launch.py
Gemini 2101.0.9gemini210.launch.py
FemtoFemto Bolt1.1.3femto_bolt.launch.py
Femto Mega1.3.1femto_mega.launch.py
Femto Mega I2.0.4femto_mega.launch.py
AstraAstra 22.8.20astra2.launch.py
Astra MiniAstra Mini Pro2.0.03astra.launch.py
Astra Mini S Pro2.0.03astra.launch.py
LiDARPulsar ME4501.0.0.6lidar.launch.py
Pulsar SL4502.2.4.5lidar.launch.py
+ +## URDF Model Support + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Product SeriesProductURDF
Gemini 430Gemini 435Le-
Gemini 301Gemini 305-
Gemini 305g-
Gemini 330Gemini 335gemini_335_336.urdf.xacro
Gemini 336gemini_335_336.urdf.xacro
Gemini 330-
Gemini 335Lgemini_335_L_336_L.urdf.xacro
Gemini 336Lgemini_335_L_336_L.urdf.xacro
Gemini 330L-
Gemini 335Lggemini_335_Lg.urdf.xacro
Gemini 335Legemini_335_Le.urdf.xacro
Gemini 340Gemini 345Lg-
Gemini 2Gemini 2gemini_2.urdf.xacro
Gemini 2 Lgemini_2_L.urdf.xacro
Gemini 215-
Gemini 210-
FemtoFemto Boltfemto_bolt.urdf.xacro
Femto Mega-
Femto Mega I-
AstraAstra 2astra_2.urdf.xacro
Astra MiniAstra Mini Pro-
Astra Mini S Pro-
LiDARPulsar ME450-
Pulsar SL450-
All launch files are essentially similar, with the primary difference being the default values of the parameters set for different models within the same series. Differences in USB standards, such as USB 2.0 versus USB 3.0, may require adjustments to these parameters. If you encounter a startup failure, please carefully review the specification manual. Pay special attention to the resolution settings in the launch file, as well as other parameters, to ensure compatibility and optimal performance. @@ -224,7 +355,7 @@ th, td { } thead th { background-color: #1f4e78; - color: white; + color: black; text-align: center; vertical-align: middle; } @@ -240,17 +371,17 @@ thead th { - Gemini 305 + Gemini 301 Gemini 305 Orbbec Gemini 305 Datasheet - Gemini 345Lg + Gemini 340 Gemini 345Lg Orbbec Gemini 345Lg Datasheet - Gemini 435Le + Gemini 430 Gemini 435Le Orbbec Gemini 435Le Datasheet diff --git a/docs/zh/source/_static/custom.css b/docs/zh/source/_static/custom.css index 6143a721..aaa2509c 100755 --- a/docs/zh/source/_static/custom.css +++ b/docs/zh/source/_static/custom.css @@ -574,14 +574,32 @@ .wy-nav-content .rst-content table.docutils, .wy-nav-content .rst-content table.docutils td, .wy-nav-content .rst-content table.docutils th { - border-color: #d0d7de !important; + border: 0 !important; } .wy-nav-content .rst-content table.docutils { + border: 1px solid #d0d7de !important; + border-collapse: separate !important; + border-spacing: 0 !important; border-radius: 10px !important; overflow: hidden !important; } +.wy-nav-content .rst-content table.docutils td, +.wy-nav-content .rst-content table.docutils th { + border-right: 1px solid #d0d7de !important; + border-bottom: 1px solid #d0d7de !important; +} + +.wy-nav-content .rst-content table.docutils td:last-child, +.wy-nav-content .rst-content table.docutils th:last-child { + border-right: 0 !important; +} + +.wy-nav-content .rst-content table.docutils tr:last-child td { + border-bottom: 0 !important; +} + .wy-nav-content .rst-content thead th { background: #f6f8fa !important; } diff --git a/docs/zh/source/camera_devices/1_overview/introduction.md b/docs/zh/source/camera_devices/1_overview/introduction.md index 72d4b657..6c76697d 100644 --- a/docs/zh/source/camera_devices/1_overview/introduction.md +++ b/docs/zh/source/camera_devices/1_overview/introduction.md @@ -10,16 +10,22 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 - + - - + + - - + + + + + + + + @@ -28,31 +34,9 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 - - - - - - - - - - - - - - - - - - - - - - @@ -87,6 +71,17 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 + + + + + + + + + + + @@ -101,7 +96,7 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 - + @@ -146,8 +141,13 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 - - + + + + + + + @@ -183,27 +183,157 @@ OrbbecSDK ROS2 封装为 Orbbec 相机与 ROS 2 环境提供无缝集成。它 关于如何获取与升级最新固件，[请点击这里](../3_quickstarts/orbbecviewer.md)。 -| **产品列表** | **推荐固件版本** | **启动文件** | -| ----------------------- | -------------------------------------------------------------------------------------------- | --------------------------------------------- | -| Gemini 305 | [1.0.30](https://doc.orbbec.com/documentation/Gemini%20305%20Documentation/Firmware%20Release%20of%20Gemini%20305) | gemini305.launch.py | -| Gemini 305g | [1.0.30](https://doc.orbbec.com/documentation/Gemini%20305%20Documentation/Firmware%20Release%20of%20Gemini%20305) | gemini305_g.launch.py | -| Astra Mini Pro | [2.0.03](https://github.com/orbbec/OrbbecFirmware/releases/tag/Astra-Mini-Pro) | astra.launch.py | -| Astra Mini S Pro | [2.0.03](https://github.com/orbbec/OrbbecFirmware/releases/tag/Astra-Mini-S-Pro) | astra.launch.py | -| Gemini 435Le | [1.3.6](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemin435Le-Firmware) | gemini435_le.launch.py | -| Gemini 330 series | [1.6.00](https://orbbec-debian-repos-aws.s3.amazonaws.com/product/Gemini330_Release_1.6.00.zip) | gemini_330_series.launch.py | -| Gemini 338/338L/338Le/338Lg/331L | 以发布包内推荐固件为准 | gemini_330_series.launch.py | -| Gemini 215 | [1.0.9](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini215-Firmware) | gemini210.launch.py | -| Gemini 210 | [1.0.9](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini210-Firmware) | gemini210.launch.py | -| Gemini 2 | [1.4.98](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini2-Firmware) | gemini2.launch.py | -| Gemini 2 L | [1.5.2](https://github.com/orbbec/OrbbecFirmware/releases/tag/Gemini2L-Firmware) | gemini2L.launch.py | -| Femto Bolt | [1.1.3](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Bolt-Firmware) | femto_bolt.launch.py | -| Femto Mega | [1.3.1](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Mega-Firmware) | femto_mega.launch.py | -| Femto Mega I | [2.0.4](https://github.com/orbbec/OrbbecFirmware/releases/tag/Femto-Mega-I-Firmware) | femto_mega.launch.py | -| Astra 2 | [2.8.20](https://orbbec-debian-repos-aws.s3.amazonaws.com/product/Astra2_Release_2.8.20.zip) | astra2.launch.py | -| Gemini 345 | 1.9.03 | gemini345.launch.py | -| Gemini 345Lg | 1.9.03 | gemini345_lg.launch.py | -| Pulsar SL450 | 2.2.4.5 | lidar.launch.py | -| Pulsar ME450 | 1.0.0.6 | lidar.launch.py | +
产品系列 产品main 分支v2-main 分支Orbbec SDK v1.xOrbbec SDK v2.x
Gemini 305
Gemini 430Gemini 435Lenot supportedrecommended for new designs
Gemini 301 Gemini 305 not supported recommended for new designsGemini 305g not supported recommended for new designs
Gemini 340Gemini 345not supportedrecommended for new designs
Gemini 345Lgnot supportedrecommended for new designs
Gemini 435LeGemini 435Lenot supportedrecommended for new designs
Gemini 330Gemini 335Lenot supportedrecommended for new designs
Gemini 335 full maintenance recommended for new designsnot supported recommended for new designs
Gemini 335Lenot supportedrecommended for new designs
Gemini 340Gemini 345Lgnot supportedrecommended for new designs
Gemini 2 Gemini 2
Gemini 2 XL recommended for new designsto be supportednot supported
Gemini 215not supported
Astra MiniAstra Mini (S) ProAstra MiniAstra Mini Profull maintenancerecommended for new designs
Astra Mini S Pro full maintenance recommended for new designs
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
产品系列产品列表推荐固件版本启动文件
Gemini 430Gemini 435Le1.3.6gemini435_le.launch.py
Gemini 301Gemini 3051.0.30gemini305.launch.py
Gemini 305g1.0.30gemini305_g.launch.py
Gemini 330Gemini 3351.6.00gemini_330_series.launch.py
Gemini 3361.6.00gemini_330_series.launch.py
Gemini 3301.6.00gemini_330_series.launch.py
Gemini 335L1.6.00gemini_330_series.launch.py
Gemini 336L1.6.00gemini_330_series.launch.py
Gemini 330L1.6.00gemini_330_series.launch.py
Gemini 335Lg1.6.00gemini_330_series.launch.py
Gemini 335Le1.6.00gemini_330_series.launch.py
Gemini 340Gemini 345Lg1.9.03gemini345_lg.launch.py
Gemini 2Gemini 21.4.98gemini2.launch.py
Gemini 2 L1.5.2gemini2L.launch.py
Gemini 2151.0.9gemini210.launch.py
Gemini 2101.0.9gemini210.launch.py
FemtoFemto Bolt1.1.3femto_bolt.launch.py
Femto Mega1.3.1femto_mega.launch.py
Femto Mega I2.0.4femto_mega.launch.py
AstraAstra 22.8.20astra2.launch.py
Astra MiniAstra Mini Pro2.0.03astra.launch.py
Astra Mini S Pro2.0.03astra.launch.py
LiDARPulsar ME4501.0.0.6lidar.launch.py
Pulsar SL4502.2.4.5lidar.launch.py
+ +## URDF模型支持情况 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
产品系列产品URDF
Gemini 430Gemini 435Le-
Gemini 301Gemini 305-
Gemini 305g-
Gemini 330Gemini 335gemini_335_336.urdf.xacro
Gemini 336gemini_335_336.urdf.xacro
Gemini 330-
Gemini 335Lgemini_335_L_336_L.urdf.xacro
Gemini 336Lgemini_335_L_336_L.urdf.xacro
Gemini 330L-
Gemini 335Lggemini_335_Lg.urdf.xacro
Gemini 335Legemini_335_Le.urdf.xacro
Gemini 340Gemini 345Lg-
Gemini 2Gemini 2gemini_2.urdf.xacro
Gemini 2 Lgemini_2_L.urdf.xacro
Gemini 215-
Gemini 210-
FemtoFemto Boltfemto_bolt.urdf.xacro
Femto Mega-
Femto Mega I-
AstraAstra 2astra_2.urdf.xacro
Astra MiniAstra Mini Pro-
Astra Mini S Pro-
LiDARPulsar ME450-
Pulsar SL450-
所有启动文件本质上是类似的，主要区别在于同系列不同型号设置的参数默认值。USB 标准差异（如 USB 2.0 与 USB 3.0）可能需要调整这些参数。如果遇到启动失败，请仔细查看规格说明书，特别关注启动文件中的分辨率设置以及其他参数，以确保兼容与最佳性能。 @@ -224,7 +354,7 @@ th, td { } thead th { background-color: #1f4e78; - color: white; + color: black; text-align: center; vertical-align: middle; } @@ -240,17 +370,17 @@ thead th { - Gemini 305 + Gemini 301 Gemini 305 Orbbec Gemini 305 规格书 - Gemini 345Lg + Gemini 340 Gemini 345Lg Orbbec Gemini 345Lg 规格书 - Gemini 435Le + Gemini 430 Gemini 435Le Orbbec Gemini 435Le 规格书