Skip to content

Commit 8b4e8be

Browse files
authored
Merge branch 'sipeed:dev' into dev
2 parents cd338a2 + a96c97a commit 8b4e8be

16 files changed

Lines changed: 40 additions & 33 deletions

File tree

docs/doc/en/mllm/vlm_internvl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Refer to the [Large Model User Guide](./basic.md) to download the model.
4646
```python
4747
from maix import nn, err, log, sys, image, display
4848

49-
model = "/root/models/InternVL2.5-1B/model.mud"
49+
model = "/root/models/InternVL2.5-1B-maixcam2/model.mud"
5050
log.set_log_level(log.LogLevel.LEVEL_ERROR, color = False)
5151
disp = display.Display()
5252

docs/doc/en/peripheral/pinmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ See the detailed [Pinmap API Docs](../../../api/maix/peripheral/pinmap.md).
140140
| ------------ | ---------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
141141
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | Refer to `MaixCAM-Pro` | 1. `UART0` is system log + default serial port<br>WiFi (SDIO1 + A26)<br>2. `A14` is system status LED; after setting to `GPIO`, it can be used as normal output<br>3. User button already has a system `key` driver; not recommended to read via `GPIO`<br>4. IO is `3.3V` — do not connect `5V` directly |
142142
| MaixCAM-Pro | ![maixcam\_pro\_io](/static/image/maixcam_pro_io.png) | 1. Refer to silkscreen, e.g. `29` = GPIO, `RX` = UART<br>2. `6pin` defaults to UART and I2C | 1. Same as `MaixCAM`<br>2. `B3` drives a lighting LED, active high |
143-
| MaixCAM2 | ![maixcam2\_io](/static/image/maixcam2_io.png) | 1. Refer to silkscreen, e.g. `A4` = GPIO, `U2R` = UART<br>2. `6pin` defaults to UART and I2C | 1. `B25` drives a lighting LED, active high<br>2. `A6` drives system status LED; can be used as GPIO output after init<br>3. IO is `3.3V` — do not connect `5V` directly |
143+
| MaixCAM2 | ![maixcam2\_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | 1. Refer to silkscreen, e.g. `A4` = GPIO, `U2R` = UART<br>2. `6pin` defaults to UART and I2C | 1. `B25` drives a lighting LED, active high<br>2. `A6` drives system status LED; can be used as GPIO output after init<br>3. IO is `3.3V` — do not connect `5V` directly |

docs/doc/en/peripheral/pwm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ First, we need to know which pins and PWM channels the device provides, as shown
3232
| ------- | ------- | --- |
3333
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | On the silkscreen, for example, `A19` is the pin name and `PWM7` is the function name |
3434
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | The first name, such as `A19`, is the pin name; the corresponding `PWM7` is the function name |
35-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | The first name, such as `B25`, is the pin name; the corresponding `PWM6` is the function name |
35+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | The first name, such as `B25`, is the pin name; the corresponding `PWM6` is the function name |
3636

3737
Note that pins may be used for other purposes by default; it’s best to avoid those pins. See the [pinmap](./pinmap.md) documentation for details.
3838

docs/doc/en/peripheral/spi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ First, we need to know which pins and SPI interfaces the device provides, as sho
7272
| ------- | ------- | --- |
7373
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | On the silkscreen, `A24` is the pin name, `SPI4_CS` is the function name |
7474
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | The first name, such as `A24`, is the pin name; `SPI4_CS` is the function name |
75-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | The first name, such as `B21`, is the pin name; `SPI2_CS1` is the function name |
75+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | The first name, such as `B21`, is the pin name; `SPI2_CS1` is the function name |
7676

7777
Note that pins may be used for other purposes by default; it’s best to avoid those pins. See the [pinmap](./pinmap.md) documentation for details.
7878

docs/doc/en/peripheral/uart.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ First, we need to know which pins and I2C interfaces are available on the device
4141
| ------------ | ---------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
4242
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | The board’s silkscreen shows the pin name (e.g., `A19`) and function name (e.g., `UART1_TX`). |
4343
| MaixCAM-Pro | ![maixcam\_pro\_io](/static/image/maixcam_pro_io.png) | The first label (e.g., `A19`) is the pin name, corresponding to the function name (e.g., `UART1_TX`). |
44-
| MaixCAM2 | ![maixcam2\_io](/static/image/maixcam2_io.png) | The first label (e.g., `A21`) is the pin name, corresponding to the function name (e.g., `UART4_TX`). |
44+
| MaixCAM2 | ![maixcam2\_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | The first label (e.g., `A21`) is the pin name, corresponding to the function name (e.g., `UART4_TX`). |
4545

4646
Note: Pins may be used for other purposes by default. It’s best to avoid these pins—see the [pinmap](./pinmap.md) documentation.
4747

@@ -305,7 +305,7 @@ print(content)
305305

306306
### Binary Communication Protocol
307307

308-
The character protocol above has a clear characteristic of using visible characters to transmit data. The advantage is simplicity and human readability. However, it uses an inconsistent number of characters and larger data volumes. For example, `$10,20*` and `$1000,2000*` have varying lengths, with `1000` using 4 characters, which means 4 bytes. We know an unsigned short integer (`uint16`) can represent values ranging from `0~65535` using only two bytes. This reduces the transmission data.
308+
The character protocol above has a clear characteristic of using visible characters to transmit data. The advantage is simplicity and human readability. However, it uses an inconsistent number of characters and larger data volumes. For example, `$10,20*` and `$1000,2000*` have varying lengths, with `1000` using 4 characters, which means 4 bytes. We know an unsigned short integer (`uint16`) can represent values ranging from `0~65535` using only two bytes. This reduces the transmission data.
309309

310310
We also know visible characters can be converted to binary via ASCII tables, such as `$1000` being `0x24 0x31 0x30 0x30 0x30` in binary, requiring 5 bytes. If we directly encode `1000` in binary as `0x03E8`, we can send `0x24 0x03 0xE8` in just 3 bytes, reducing communication overhead.
311311

docs/doc/en/vision/camera.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ MaixCAM uses M12 lens by default and supports lens replacement. Notes:
305305
4. Want a zoom lens? Buy M12 zoom lens.
306306
5. Default is manual focus. Auto-focus lenses require driver support; MaixCAM lacks AF circuit—you may need to write control program.
307307

308-
## Use USB Camera
309-
308+
## Use USB Camera (UVC)
310309
Besides built-in MIPI camera, you can use USB camera.
311310

312311
Steps:

docs/doc/zh/peripheral/gpio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ title: MaixCAM MaixPy 使用 GPIO
2323
| ------- | ------- | --- |
2424
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | 板子丝印比如`A19`是引脚名,`GPIOA19/PWM7`是功能名 |
2525
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | 第一个名如`A19`是引脚名,对应`GPIOA19/PWM7`是功能名 |
26-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | 第一个名如`A2`是引脚名,对应`GPIOA2/SPI1_CS0`是功能名,即使用`GPIO`功能只需要在`IO`名前面加一个`GPIO`即可。 |
26+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | 第一个名如`A2`是引脚名,对应`GPIOA2/SPI1_CS0`是功能名,即使用`GPIO`功能只需要在`IO`名前面加一个`GPIO`即可。 |
2727

2828
需要注意的是,引脚默认可能用做其它用途,最好避开这些引脚,请看[pinmap](./pinmap.md) 文档中的说明。
2929

docs/doc/zh/peripheral/i2c.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ update:
3333
| ------- | ------- | --- |
3434
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | 板子丝印比如`A15`是引脚名,`I2C5_SCL`是功能名 |
3535
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | 第一个名如`A15`是引脚名,对应`I2C5_SCL`是功能名 |
36-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | 第一个名如`A1`是引脚名,对应`I2C6_SCL`是功能名 |
36+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | 第一个名如`A1`是引脚名,对应`I2C6_SCL`是功能名 |
3737

3838
需要注意的是,引脚默认可能用做其它用途,最好避开这些引脚,请看[pinmap](./pinmap.md) 文档中的说明。
3939

docs/doc/zh/peripheral/pinmap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ print(func)
141141
| ------- | ------- | ---- | ------- |
142142
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | 参考 `MaixCAM-Pro` | 1. `UART0`是系统日志+默认串口<br>WiFi(SDIO1 + A26)。<br>2. `A14` 默认是系统状态灯,初始化为`GPIO`后可以当作普通输出`GPIO`使用。<br>3. user按键默认系统已经有`key`驱动用来检测按键按下,不建议用`GPIO`读取。<br>4. 再次强调 IO 是`3.3v`电平,不要直接接`5v`电压。 |
143143
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | 1. 参考外壳丝印,比如`29`就是`GPIO``RX` 就是串口;<br>2. `6pin` 默认`UART``I2C` | 1. 同 `MaixCAM`。<br>2. `B3` 接了一个照明`LED` ,高电平使能。|
144-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | 1. 参考外壳丝印, 比如`A4`就是`GPIO``U2R` 就是串口;<br>2. `6pin` 默认`UART``I2C` | 1. `B25` 接了一个照明`LED`,高电平使能。<br>2. `A6`引脚接了系统状态灯,初始化为`GPIO`后可以当作普通输出`GPIO`使用。<br>3. 再次强调 IO 是`3.3v`电平,不要直接接`5v`电压。|
144+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | 1. 参考外壳丝印, 比如`A4`就是`GPIO``U2R` 就是串口;<br>2. `6pin` 默认`UART``I2C` | 1. `B25` 接了一个照明`LED`,高电平使能。<br>2. `A6`引脚接了系统状态灯,初始化为`GPIO`后可以当作普通输出`GPIO`使用。<br>3. 再次强调 IO 是`3.3v`电平,不要直接接`5v`电压。|
145145

146146

147147

docs/doc/zh/peripheral/pwm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ update:
3232
| ------- | ------- | --- |
3333
| MaixCAM | ![](https://wiki.sipeed.com/hardware/zh/lichee/assets/RV_Nano/intro/RV_Nano_3.jpg) | 板子丝印比如`A19`是引脚名,`PWM7`是功能名 |
3434
| MaixCAM-Pro | ![maixcam_pro_io](/static/image/maixcam_pro_io.png) | 第一个名如`A19`是引脚名,对应`PWM7`是功能名 |
35-
| MaixCAM2 | ![maixcam2_io](/static/image/maixcam2_io.png) | 第一个名如`B25`是引脚名,对应`PWM6`是功能名 |
35+
| MaixCAM2 | ![maixcam2_io](https://wiki.sipeed.com/hardware/assets/maixcam/maixcam2_pins.jpg) | 第一个名如`B25`是引脚名,对应`PWM6`是功能名 |
3636

3737
需要注意的是,引脚默认可能用做其它用途,最好避开这些引脚,请看[pinmap](./pinmap.md) 文档中的说明。
3838

0 commit comments

Comments
 (0)