Skip to content

Commit ef028d0

Browse files
authored
Merge pull request #110 from Mr-Gao7/main
camera模块格式以及部分书写错误修正
2 parents 2938515 + bd09d40 commit ef028d0

File tree

2 files changed

+34
-31
lines changed

2 files changed

+34
-31
lines changed

en-us/api/QuecPythonClasslib.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10765,7 +10765,7 @@ if __name__ == '__main__':
1076510765

1076610766
Module function: Preview, camera, code scan
1076710767

10768-
Note: The BC25PA platform does not support this module function.
10768+
Note: At present, the following modules support the camera function: EC200U series,EC600U series,EC600N series,EC600S series,EC800N series.
1076910769

1077010770

1077110771
##### Preview
@@ -10783,15 +10783,15 @@ Before using the preview, you need to initialize LCD.
1078310783
| Parameter | Type | Description |
1078410784
| ------------- | ---- | ------------------------------------------------------------ |
1078510785
| model | int | camera model:<br />*0: gc032a spi*<br />*1: bf3901 spi* |
10786-
| cam_w | int | *camera Horizontal resolution* |
10787-
| *cam_h* | int | *camera Vertical resolution* |
10788-
| *lcd_w* | int | *LCD horizontal resolution* |
10789-
| *lcd_h* | int | *LCD vertical resolution* |
10786+
| cam_w | int | camera Horizontal resolution |
10787+
| cam_h | int | camera Vertical resolution |
10788+
| lcd_w | int | LCD horizontal resolution |
10789+
| lcd_h | int | LCD vertical resolution |
1079010790
| perview_level | int | Preview level[1,2]. Level 2 only for ASR platform. The higher the level, the smoother the image and the greater the consumption of resources. |
1079110791

1079210792
* Return Value
1079310793

10794-
* *-1*: Initialization failure.
10794+
* -1: Initialization failure.
1079510795
* If the object is returned, it means the creation is successful.
1079610796

1079710797
* Example
@@ -10851,15 +10851,15 @@ Before using code scan , you need to initialize LCD.
1085110851
| ------------- | ---- | ------------------------------------------------------------ |
1085210852
| model | int | camera model:<br />*0: gc032a spi*<br />*1: bf3901 spi* |
1085310853
| decode_level | int | code scan level[1,2],Level 2 only for ASR platform. The higher the level, the better the recognition result but the greater the resource consumption* |
10854-
| cam_w | int | *camera horizontal resolution* |
10855-
| *cam_h* | int | *camera vertical resolution* |
10854+
| cam_w | int | camera horizontal resolution |
10855+
| cam_h | int | camera vertical resolution |
1085610856
| perview_level | int | Preview level[1,2]. Level 2 only for ASR platform. The higher the level, the smoother the image and the greater the consumption of resources.<br />when it is equal to 0, there is no LCD preview function. There is no need to initialize the LCD in advance. <br/> when it is equal to 1 or 2, the LCD must be initialized first |
10857-
| *lcd_w* | int | *LCD horizontal resolution* |
10858-
| *lcd_h* | int | *LCD vertical resolution* |
10857+
| lcd_w | int | LCD horizontal resolution |
10858+
| lcd_h | int | LCD vertical resolution |
1085910859

1086010860
* Return Value
1086110861

10862-
* *-1*: Failed execution.
10862+
* -1: Failed execution.
1086310863
* If the object is returned, it means the creation is successful.
1086410864

1086510865

@@ -10988,12 +10988,12 @@ Camera function.
1098810988

1098910989
|Parameter | parameter type | parameter description|
1099010990
| ------------- | -------- | ------------------------------------------------------------ |
10991-
|Model | int | camera model: <br/> * 0: gc032a spi * <br/> * 1: bf3901 spi *|
10991+
|Model | int | camera model: <br/> *0: gc032a spi* <br/> *1: bf3901 spi* |
1099210992
| cam_ W | int | camera horizontal resolution|
10993-
| *cam_ H * | int | * camera vertical resolution *|
10993+
| cam_ H | int | camera vertical resolution |
1099410994
| perview_ Level | int | preview level [0,2]. Level 2 only for ASR platform. The higher the level, the smoother the image and the greater the resource consumption<br/> when it is equal to 0, there is no LCD preview function. There is no need to initialize the LCD in advance. <br/> when it is equal to 1 or 2, the LCD must be initialized first |
10995-
| *lcd_ W * | int | LCD horizontal resolution|
10996-
| *lcd_ H * | int | * LCD vertical resolution *|
10995+
| lcd_ W | int | LCD horizontal resolution|
10996+
| lcd_ H | int | LCD vertical resolution |
1099710997

1099810998
* Return Value
1099910999

zh-cn/api/QuecPythonClasslib.md

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11185,7 +11185,7 @@ if __name__ == '__main__':
1118511185

1118611186
模块功能:实现摄像头预览,照相机,扫码功能
1118711187

11188-
注意:BC25PA平台不支持模块功能
11188+
注意:目前以下模块支持camera功能:EC200U系列、EC600U系列、EC600N系列,EC600S系列,EC800N系列
1118911189

1119011190

1119111191

@@ -11196,22 +11196,23 @@ if __name__ == '__main__':
1119611196
###### 创建预览对象
1119711197

1119811198
> **import camera**
11199+
>
1119911200
> **preview = camera.camPreview(model,cam_w,cam_h,lcd_w,lcd_h,perview_level)**
1120011201

1120111202
* 参数
1120211203

1120311204
| 参数 | 参数类型 | 参数说明 |
1120411205
| ------------- | -------- | ------------------------------------------------------------ |
1120511206
| model | int | camera型号:<br />*0: gc032a spi*<br />*1: bf3901 spi* |
11206-
| cam_w | int | *camera水平分辨率* |
11207-
| *cam_h* | int | *camera垂直分辨率* |
11208-
| *lcd_w* | int | *LCD水平分辨率* |
11209-
| *lcd_h* | int | *LCD垂直分辨率* |
11207+
| cam_w | int | camera水平分辨率 |
11208+
| cam_h | int | camera垂直分辨率 |
11209+
| lcd_w | int | LCD水平分辨率 |
11210+
| lcd_h | int | LCD垂直分辨率 |
1121011211
| perview_level | int | 预览等级[1,2]。<br />等级2只针对ASR平台,等级越高,图像越流畅,消耗资源越大 |
1121111212

1121211213
* 返回值
1121311214

11214-
*-1*;初始化失败
11215+
-1;初始化失败
1121511216

1121611217
若返回对象,则表示创建成功
1121711218

@@ -11265,23 +11266,24 @@ if __name__ == '__main__':
1126511266
###### 创建对象
1126611267

1126711268
**import camera**
11269+
1126811270
**scan= camera.camScandecode(model,decode_level,cam_w,cam_h,perview_level,lcd_w,lcd_h)**
1126911271

1127011272
* 参数
1127111273

1127211274
| 参数 | 参数类型 | 参数说明 |
1127311275
| ------------- | -------- | ------------------------------------------------------------ |
1127411276
| model | int | camera型号:<br />*0: gc032a spi*<br />*1: bf3901 spi* |
11275-
| decode_level | int | *解码等级[1,2],<br />等级2只针对ASR平台, 等级越高,识别效果越好但资源消耗越大*. |
11276-
| cam_w | int | *camera水平分辨率* |
11277-
| *cam_h* | int | *camera垂直分辨率* |
11277+
| decode_level | int | 解码等级[1,2],<br />等级2只针对ASR平台, 等级越高,识别效果越好但资源消耗越大. |
11278+
| cam_w | int | camera水平分辨率 |
11279+
| cam_h | int | camera垂直分辨率 |
1127811280
| perview_level | int | 预览等级[0,2]。<br />等级2只针对ASR平台, 等级越高,图像越流畅,消耗资源越大<br />等于0时,无lcd预览功能,无需提前初始化LCD<br />等于12时,必须先初始化lcd |
11279-
| *lcd_w* | int | *LCD水平分辨率* |
11280-
| *lcd_h* | int | *LCD垂直分辨率* |
11281+
| lcd_w | int | LCD水平分辨率 |
11282+
| lcd_h | int | LCD垂直分辨率 |
1128111283

1128211284
* 返回值
1128311285

11284-
*-1*;失败
11286+
-1;失败
1128511287

1128611288
若返回对象,则表示创建成功
1128711289

@@ -11415,6 +11417,7 @@ Scandecode.callback(callback)
1141511417
###### 创建对象
1141611418

1141711419
**import camera**
11420+
1141811421
**cap= camera.camCapture(model,cam_w,cam_h,perview_level,lcd_w,lcd_h)**
1141911422

1142011423
* 参数
@@ -11423,10 +11426,10 @@ Scandecode.callback(callback)
1142311426
| ------------- | -------- | ------------------------------------------------------------ |
1142411427
| model | int | camera型号:<br />*0: gc032a spi*<br />*1: bf3901 spi* |
1142511428
| cam_w | int | camera水平分辨率 |
11426-
| *cam_h* | int | *camera垂直分辨率* |
11427-
| perview_level | int | 预览等级[0,2]。<br />等级2只针对ASR平台,等级越高,图像越流畅,消耗资源越大。<br />等于0时,无lcd预览功能,提前初始化LCD<br />等于12时,必须先初始化lcd |
11428-
| *lcd_w* | int | LCD水平分辨率 |
11429-
| *lcd_h* | int | *LCD垂直分辨率* |
11429+
| cam_h | int | camera垂直分辨率 |
11430+
| perview_level | int | 预览等级[0,2]。<br />等级2只针对ASR平台,等级越高,图像越流畅,消耗资源越大。<br />等于0时,无lcd预览功能,无须提前初始化LCD<br />等于12时,必须先初始化lcd |
11431+
| lcd_w | int | LCD水平分辨率 |
11432+
| lcd_h | int | LCD垂直分辨率 |
1143011433

1143111434
* 返回值
1143211435

0 commit comments

Comments
 (0)