Skip to content

Commit

Permalink
Fixed camera name typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@jian-dong
jian-dong committed May 11, 2024
1 parent 0cfe05b commit cde2404
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ The current software license structure is as follows
| Linux | - Linux Ubuntu 16.04/18.04/20.04 (x64) | Support GCC 7.5 |
| Arm32 | - Linux Ubuntu 16.04/18.04/20.04 | Support GCC 7.5 |
| Arm64 | - Linux Ubuntu 18.04/20.04 | Support GCC 7.5 |
| MacOS | - M series chip, 11.0 and above; Intel x86 chip, 10.15 and above. | supported hardware products: Gemini 2, Gemini 2 L, Astra 2, Gemini 2 XL, Femto Mega, Gemini 300 series |
| MacOS | - M series chip, 11.0 and above; Intel x86 chip, 10.15 and above. | supported hardware products: Gemini 2, Gemini 2 L, Astra 2, Gemini 2 XL, Femto Mega, Gemini 330 series |

* Note: supported Arm platforms: jestson nano (arm64)、 AGX Orin(arm64)、Orin NX (arm64)、Orin Nano(arm64)、A311D (arm64), Raspberry Pi 4 (arm64), Raspberry Pi 3 (arm32), rk3399 (arm64), other Arm systems, may need to Cross-compile.
* Windows 11, Ubuntu 22.04 and other Linux platforms may also be supported, but have not been fully tested.
Expand Down
4 changes: 2 additions & 2 deletions README_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ Orbbec 3D 相机产品软件开发套件，全面支持 UVC，实现免驱动即
| Linux | - Linux Ubuntu 16.04/18.04/20.04 (x64) | Support GCC 7.5 |
| Arm32 | - Linux Ubuntu 16.04/18.04/20.04 | Support GCC 7.5 |
| Arm64 | - Linux Ubuntu 18.04/20.04 | Support GCC 7.5 |
| MacOS | - M series chip, 11.0 and above、intel x86 chip, 10.15 and above. | supported hardware products: Gemini 2, Gemini 2 L, Astra 2,Gemini 2 XL, Femto Mega, Gemini 300系列 |
| MacOS | - M series chip, 11.0 and above、intel x86 chip, 10.15 and above. | supported hardware products: Gemini 2, Gemini 2 L, Astra 2,Gemini 2 XL, Femto Mega, Gemini 330系列 |

* 注: 当前版本支持的Arm平台：jestson nano(arm64)、AGX Orin(arm64)、Orin NX (arm64)、Orin Nano(arm64)、A311D(arm64)、树莓派4(arm64)、树莓派3（arm32)、rk3399(arm64), 其它Arm系统，可能需要重新交叉编译。
* 注: 当前版本支持的Arm平台：jestson nano(arm64)、AGX Orin(arm64)、Orin NX (arm64)、Orin Nano(arm64)、A311D(arm64)、树莓派4(arm64)、树莓派3(arm32)、rk3399(arm64), 其它Arm系统，可能需要重新交叉编译。
* Windows 11, Ubuntu 22.04 和其他一些 Linux 平台理论上也支持，但是未经过完整测试”

## 支持产品
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial/Chinese/Code_Sample_Description/Sample_Description(C_C++).md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2517,7 +2517,7 @@ if(device->isPropertySupported(OB_PROP_DEPTH_PRECISION_LEVEL_INT, OB_PERMISSION_
changeDepthUnitFlag = changeDepthUnit(device);
}
else if(device->isPropertySupported(OB_PROP_DEPTH_UNIT_FLEXIBLE_ADJUSTMENT_FLOAT, OB_PERMISSION_READ_WRITE)) {
// for some models (Such as G300 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
// for some models (Such as Gemini 330 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
changeDepthUnitFlag = changeDepthUnitFlexible(device);
}
else {
Expand Down
20 changes: 10 additions & 10 deletions doc/tutorial/English/Code_Sample_Description/Sample_Description(C_C++).md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,11 +754,11 @@ check_error(error);
## AlignFilterViewer
Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.
Function description: Demonstrate using SDK for stream alignment demonstration, display aligned images, and exit the program with ESC_KEY key
Function description: Demonstrate using SDK for stream alignment demonstration, display aligned images, and exit the program with ESC_KEY key.
>This example is based on the C High Level API for demonstration
>This example is based on the C High Level API for demonstration.
Create Pipeline and stream Configuration
```c
Expand Down Expand Up @@ -1045,7 +1045,7 @@ check_error(error);
## Post-Processing
Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.
Function description: Demonstrate the use of post-processing operations, display post-processing images, and exit the program using the ESC_KEY key
Expand Down Expand Up @@ -1155,7 +1155,7 @@ check_error(error);

## HdrMerge

Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.

Function description: Demonstrate using HDR operation, display HDR processed images, and exit the program with ESC_KEY key

Expand Down Expand Up @@ -2464,7 +2464,7 @@ if(device->isPropertySupported(OB_PROP_DEPTH_PRECISION_LEVEL_INT, OB_PERMISSION_
changeDepthUnitFlag = changeDepthUnit(device);
}
else if(device->isPropertySupported(OB_PROP_DEPTH_UNIT_FLEXIBLE_ADJUSTMENT_FLOAT, OB_PERMISSION_READ_WRITE)) {
// for some models (Such as G300 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
// for some models (Such as Gemini 330 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
changeDepthUnitFlag = changeDepthUnitFlexible(device);
}
else {
Expand Down Expand Up @@ -2496,7 +2496,7 @@ Release resources and exit the program

## HdrMerge

Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.

Function description: Demonstrate using HDR operation, display HDR processed images, and exit the program with ESC_KEY key

Expand Down Expand Up @@ -2598,7 +2598,7 @@ if(pipe.getDevice()->isPropertySupported(OB_STRUCT_DEPTH_HDR_CONFIG, OB_PERMISSI
## DepthWorkMode
Supported devices: G2 series, G300 series cameras, Astra 2 series cameras
Supported devices: Gemini 2 series, Gemini 330 series cameras, Astra 2 series cameras
Function description: Demonstrate the operation of converting deep working mode
Expand Down Expand Up @@ -2980,7 +2980,7 @@ for(auto itr = pipelineHolderList.begin(); itr != pipelineHolderList.end(); itr+

## PostProcessing

Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.

Function description: Demonstrate post-processing operations, display post-processed images, and exit the program using the ESC_KEY key

Expand Down Expand Up @@ -3086,7 +3086,7 @@ setPropertyValue(device, propertyItem, controlVec.at(2));

## AlignFilterViewer

Supported devices: G300 series cameras, such as Gemini G335
Supported devices: Gemini 330 series cameras.

Function description: Demonstrate the synchronization and alignment of sensor data streams, display the aligned image, and exit the program using the ESC_KEY key

Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/Sample-DepthUnitControl/DepthUnitControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ bool changeDepthUnit(std::shared_ptr<ob::Device> &device) {
return true;
}

// For some models (G300 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
// For some models (Gemini 330 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
bool changeDepthUnitFlexible(std::shared_ptr<ob::Device> &device) {
auto currentValue = device->getFloatProperty(OB_PROP_DEPTH_UNIT_FLEXIBLE_ADJUSTMENT_FLOAT);
auto valueRange = device->getFloatPropertyRange(OB_PROP_DEPTH_UNIT_FLEXIBLE_ADJUSTMENT_FLOAT);
Expand Down Expand Up @@ -142,7 +142,7 @@ int main(int argc, char **argv) try {
changeDepthUnitFlag = changeDepthUnit(device);
}
else if(device->isPropertySupported(OB_PROP_DEPTH_UNIT_FLEXIBLE_ADJUSTMENT_FLOAT, OB_PERMISSION_READ_WRITE)) {
// for some models (Such as G300 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
// for some models (Such as Gemini 330 series), user can adjust the depth unit by adjusting the depth unit flexible adjustment property
changeDepthUnitFlag = changeDepthUnitFlexible(device);
}
else {
Expand Down

0 comments on commit cde2404

Please sign in to comment.