From 28c1cc4080088f637011c6f913e9dcf2d66ac9d5 Mon Sep 17 00:00:00 2001 From: Sean <1026025056@qq.com> Date: Wed, 27 Nov 2019 20:30:02 +0800 Subject: [PATCH 1/3] fix some mistake --- docs/en/hat/hat-beetlec.md | 2 +- docs/en/hat/hat-pir.md | 2 +- docs/en/unit/relay.md | 2 +- docs/zh_CN/unit/relay.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/hat/hat-beetlec.md b/docs/en/hat/hat-beetlec.md index 14a3cd49..aadba486 100644 --- a/docs/en/hat/hat-beetlec.md +++ b/docs/en/hat/hat-beetlec.md @@ -3,7 +3,7 @@ -:memo:**[Description](#Description)**    **[EasyLoader](#EasyLoader)**    🛒**[Purchase](https://m5stack.com/products/beetlec-w-o-m5stickc)** +:memo:**[Description](#Description)**    **[EasyLoader](#EasyLoader)**    🛒**[Purchase](https://m5stack.com/products/beetlec-w-o-m5stickc)** ## Description diff --git a/docs/en/hat/hat-pir.md b/docs/en/hat/hat-pir.md index 4c7e29ee..c1d43b27 100644 --- a/docs/en/hat/hat-pir.md +++ b/docs/en/hat/hat-pir.md @@ -4,7 +4,7 @@ *** -:memo:**[Description](#Description)**      :electric_plug:**[Schematic](#Schematic))**      🛒**[Purchase](https://m5stack.com/collections/m5-unit/products/m5stickccompatible-hat-pir-sensor)**   **[EasyLoader](#EasyLoader)** +:memo:**[Description](#Description)**      :electric_plug:**[Schematic](#Schematic)**      🛒**[Purchase](https://m5stack.com/collections/m5-unit/products/m5stickccompatible-hat-pir-sensor)**   **[EasyLoader](#EasyLoader)** ## Description diff --git a/docs/en/unit/relay.md b/docs/en/unit/relay.md index 31f2157a..97facfb1 100644 --- a/docs/en/unit/relay.md +++ b/docs/en/unit/relay.md @@ -1,6 +1,6 @@ # Unit RELAY {docsify-ignore-all} - + *** diff --git a/docs/zh_CN/unit/relay.md b/docs/zh_CN/unit/relay.md index 4a17f596..f65fa13c 100644 --- a/docs/zh_CN/unit/relay.md +++ b/docs/zh_CN/unit/relay.md @@ -1,6 +1,6 @@ # Unit RELAY {docsify-ignore-all} - + *** From de7ab31f86632bf4527d011796c49d1b7344ac5f Mon Sep 17 00:00:00 2001 From: Sean <1026025056@qq.com> Date: Fri, 29 Nov 2019 18:35:26 +0800 Subject: [PATCH 2/3] change m5camera some description --- docs/en/module/proto.md | 2 +- docs/en/unit/esp32cam.md | 8 -------- docs/en/unit/m5camera.md | 2 +- docs/zh_CN/module/proto.md | 2 +- docs/zh_CN/unit/esp32cam.md | 9 --------- 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/docs/en/module/proto.md b/docs/en/module/proto.md index a4a5aa68..cf29c55d 100644 --- a/docs/en/module/proto.md +++ b/docs/en/module/proto.md @@ -29,7 +29,7 @@ | IO19(MISO) | IO26(DAC1) | | IO18(EXT\_SCK) | 3V3 | | IO3(U1\_RX) | IO1(U1\_TX) | -| IO16(U1\_RX) | IO17(U2\_TX) | +| IO16(U2\_RX) | IO17(U2\_TX) | | IO21(I2C\_SDA) | IO22(I2C\_SCL) | | IO2 | IO5 | | IO12(I2S\_SCLK) | IO13 | diff --git a/docs/en/unit/esp32cam.md b/docs/en/unit/esp32cam.md index 40667248..dfc51fe1 100644 --- a/docs/en/unit/esp32cam.md +++ b/docs/en/unit/esp32cam.md @@ -24,17 +24,9 @@ The hardware also comes with some reserved weld pad, just in case you want put t - **Digital silicon microphone (SPM1423)** - Lipo Battery power pins -**ESP32CAM** is the most popular pattern among the M5 camera series so far. If you need more storage please check M5Camera. If you need fisheye lens, please check M5CameraF. -**Note: ESP32CAM is named differently when different hardware is selected. They follow the rules below.** - -*ESP32CAM_#_#... means optional hardware name follows "ESP32CAM".* - -* If configured with MPU6050, will be named ESP32CAM_6050 -* If also configured with microphone, will be named ESP32CAM_6050_MIC -* If also configured with BME280, will be named ESP32CAM_6050_MIC_BME280 ## Product Features diff --git a/docs/en/unit/m5camera.md b/docs/en/unit/m5camera.md index e4d0877e..ca15efa6 100644 --- a/docs/en/unit/m5camera.md +++ b/docs/en/unit/m5camera.md @@ -85,7 +85,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t ## PinMap -**There are two versions of M5Camera Unit: A Model and B Model.** + **Camera Interface PinMap** diff --git a/docs/zh_CN/module/proto.md b/docs/zh_CN/module/proto.md index 3c1e01cd..3370c993 100644 --- a/docs/zh_CN/module/proto.md +++ b/docs/zh_CN/module/proto.md @@ -29,7 +29,7 @@ | IO19(MISO) | IO26(DAC1) | | IO18(EXT\_SCK) | 3V3 | | IO3(U1\_RX) | IO1(U1\_TX) | -| IO16(U1\_RX) | IO17(U2\_TX) | +| IO16(U2\_RX) | IO17(U2\_TX) | | IO21(I2C\_SDA) | IO22(I2C\_SCL) | | IO2 | IO5 | | IO12(I2S\_SCLK) | IO13 | diff --git a/docs/zh_CN/unit/esp32cam.md b/docs/zh_CN/unit/esp32cam.md index 8d706378..1868ff6d 100644 --- a/docs/zh_CN/unit/esp32cam.md +++ b/docs/zh_CN/unit/esp32cam.md @@ -23,15 +23,6 @@ - **数字硅晶麦克风 (SPM1423)** - 电池插座 -**ESP32CAM** 是M5相机系列中一款广受欢迎的模块,不管是从性能或是性价比上都有着出色的表现.M5相机系列还有一些其他的相机产品能够应对项目中的不同需求，如果你需要更多存储空间，请查看M5Camera(Link)，如果您需要鱼眼镜头，请查看M5CameraF(Link). - -**注意：选配不同硬件时，ESP32CAM 的命名不一样，遵循以下规则** - -*ESP32CAM_#_#... 即 ESP32CAM 后跟选配的硬件。* - -* 如果选配 MPU6050，则命名为 ESP32CAM_6050 -* 如果还选配了麦克风 SPQ2410，则命名为 ESP32CAM_6050_MIC -* 如果还选配了温湿度气压传感器 BME280，则命名为 ESP32CAM_6050_BME280 From ee9219180d52fd21eb2f0024d256895c274826a4 Mon Sep 17 00:00:00 2001 From: Sean <1026025056@qq.com> Date: Fri, 29 Nov 2019 20:24:54 +0800 Subject: [PATCH 3/3] delete m5camera model a info --- docs/en/unit/m5camera.md | 100 ++++++++++++++++-------------------- docs/zh_CN/unit/m5camera.md | 100 ++++++++++++++++-------------------- 2 files changed, 86 insertions(+), 114 deletions(-) diff --git a/docs/en/unit/m5camera.md b/docs/en/unit/m5camera.md index ca15efa6..35622cc0 100644 --- a/docs/en/unit/m5camera.md +++ b/docs/en/unit/m5camera.md @@ -89,41 +89,41 @@ The hardware also comes with some reserved weld pad, just in case you want put t **Camera Interface PinMap** -| *Interface* | *Camera Pin*| *M5Camera(A model)* | *M5Camera(B model)* | -| :------------------- | :--------:| :------: | :------: | -| SCCB Clock | SIOC |IO23 |IO23 | -| SCCB Data | SIOD |**IO25** |**IO22** | -| System Clock | XCLK |IO27 |IO27 | -| Vertical Sync | VSYNC |**IO22** |**IO25** | -| Horizontal Reference | HREF |IO26 |IO26 | -| Pixel Clock | PCLK |IO21 |IO21 | -| Pixel Data Bit 0 | D2 |IO32 |IO32 | -| Pixel Data Bit 1 | D3 |IO35 |IO35 | -| Pixel Data Bit 2 | D4 |IO34 |IO34 | -| Pixel Data Bit 3 | D5 |IO5 |IO5 | -| Pixel Data Bit 4 | D6 |IO39 |IO39 | -| Pixel Data Bit 5 | D7 |IO18 |IO18 | -| Pixel Data Bit 6 | D8 |IO36 |IO36 | -| Pixel Data Bit 7 | D9 |IO19 |IO19 | -| Camera Reset | RESET |IO15 |IO15 | -| Camera Power Down | PWDN | / | / | -| Power Supply 3.3V | 3V3 | 3V3 | 3V3 | -| Ground | GND | GND | GND | +| *Interface* | *Camera Pin*| *M5Camera* | +| :------------------- | :--------:| :------: | +| SCCB Clock | SIOC |IO23 | +| SCCB Data | SIOD |**IO22** | +| System Clock | XCLK |IO27 | +| Vertical Sync | VSYNC |**IO25** | +| Horizontal Reference | HREF |IO26 | +| Pixel Clock | PCLK |IO21 | +| Pixel Data Bit 0 | D2 |IO32 | +| Pixel Data Bit 1 | D3 |IO35 | +| Pixel Data Bit 2 | D4 |IO34 | +| Pixel Data Bit 3 | D5 |IO5 | +| Pixel Data Bit 4 | D6 |IO39 | +| Pixel Data Bit 5 | D7 |IO18 | +| Pixel Data Bit 6 | D8 |IO36 | +| Pixel Data Bit 7 | D9 |IO19 | +| Camera Reset | RESET |IO15 | +| Camera Power Down | PWDN | / | +| Power Supply 3.3V | 3V3 | 3V3 | +| Ground | GND | GND | **GROVE Interface** -| *Grove* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO13 | IO13 | -| SDA | **IO12** | **IO4** | -| 5V | 5V | 5V | -| GND | GND | GND | +| *Grove* | *M5Camera* | +| :-----------: | :------: | +| SCL | IO13 | +| SDA | **IO4** | +| 5V | 5V | +| GND | GND | **LED Interface** -| *LED* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| LED_Pin | IO14 | IO14 | +| *LED* |*M5Camera* | +| :-----------:| :------: | +| LED_Pin | IO14 | **The following tables are Reserved Chip Interfaces** @@ -131,27 +131,26 @@ The hardware also comes with some reserved weld pad, just in case you want put t *I2C address 0x76.* -| *BME280* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO23 | IO23 | -| SDA | IO22 | IO22 | - +| *BMP280* |*M5Camera* | +| :-----------: | :------: | +| SCL | IO23 | +| SDA | IO22 | **MPU6050 Interface** *I2C address 0x68.* -| *MPU6050* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO23 | IO23 | -| SDA | IO22 | IO22 | +| *MPU6050* | *M5Camera* | +| :-----------: | :------: | +| SCL | IO23 | +| SDA | IO22 | **MIC(SPM1423) Interface** -| *MIC(SPM1423)* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL |IO2|IO2| -| SDA |IO4|IO4| +| *MIC(SPM1423)* | *M5Camera* | +| :-----------: | :------: | +| CLK |IO4| +| DATA |IO2| @@ -174,27 +173,14 @@ The hardware also comes with some reserved weld pad, just in case you want put t ### Firmware -- **[A Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20A)** +- **[M5Camera](https://github.com/m5stack/m5stack-cam-psram/tree/master/wifi/wifi_sta/firmware/Camera%20B)** -- **[B Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20B)** ### Example -**A Model：** - - - **[Face recognition](https://github.com/m5stack/m5stack-cam-psram/tree/master/face_recognize/firmware/Camera%20A)** - - - **[Serial communication-A Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20A)** - - - **[Serial communication-M5Core](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/arduino)**（The serial communication routine is the communication between the camera and the M5Core.） - - - **[QRcode](https://github.com/m5stack/m5stack-cam-psram/tree/master/qr/firmware/Camera%20A)** - -**B Model：** - - **[Face recognition](https://github.com/m5stack/m5stack-cam-psram/tree/master/face_recognize/firmware/Camera%20B)** - - **[Serial communication-B Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20B)** + - **[Serial communication-M5Camera](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20B)** - **[Serial communication-M5Core](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/arduino)**（The serial communication routine is the communication between the camera and the M5Core.） diff --git a/docs/zh_CN/unit/m5camera.md b/docs/zh_CN/unit/m5camera.md index 9c8c52ed..6afb298e 100644 --- a/docs/zh_CN/unit/m5camera.md +++ b/docs/zh_CN/unit/m5camera.md @@ -81,41 +81,41 @@ **摄像头驱动芯片 OV2640 接口** -| *接口* | *Camera Pin*| *M5Camera(A model)* | *M5Camera(B model)* | -| :------------------- | :--------:| :------: | :------: | -| SCCB Clock | SIOC |IO23 |IO23 | -| SCCB Data | SIOD |**IO25** |**IO22** | -| System Clock | XCLK |IO27 |IO27 | -| Vertical Sync | VSYNC |**IO22** |**IO25** | -| Horizontal Reference | HREF |IO26 |IO26 | -| Pixel Clock | PCLK |IO21 |IO21 | -| Pixel Data Bit 0 | D2 |IO32 |IO32 | -| Pixel Data Bit 1 | D3 |IO35 |IO35 | -| Pixel Data Bit 2 | D4 |IO34 |IO34 | -| Pixel Data Bit 3 | D5 |IO5 |IO5 | -| Pixel Data Bit 4 | D6 |IO39 |IO39 | -| Pixel Data Bit 5 | D7 |IO18 |IO18 | -| Pixel Data Bit 6 | D8 |IO36 |IO36 | -| Pixel Data Bit 7 | D9 |IO19 |IO19 | -| Camera Reset | RESET |IO15 |IO15 | -| Camera Power Down | PWDN | / | / | -| Power Supply 3.3V | 3V3 | 3V3 | 3V3 | -| Ground | GND | GND | GND | +| *接口* | *Camera Pin* | *M5Camera* | +| :------------------- | :--------:| :------: | +| SCCB Clock | SIOC |IO23 | +| SCCB Data | SIOD |**IO22** | +| System Clock | XCLK |IO27 | +| Vertical Sync | VSYNC |**IO25** | +| Horizontal Reference | HREF |IO26 | +| Pixel Clock | PCLK |IO21 | +| Pixel Data Bit 0 | D2 |IO32 | +| Pixel Data Bit 1 | D3 |IO35 | +| Pixel Data Bit 2 | D4 |IO34 | +| Pixel Data Bit 3 | D5 |IO5 | +| Pixel Data Bit 4 | D6 |IO39 | +| Pixel Data Bit 5 | D7 |IO18 | +| Pixel Data Bit 6 | D8 |IO36 | +| Pixel Data Bit 7 | D9 |IO19 | +| Camera Reset | RESET |IO15 | +| Camera Power Down | PWDN | / | +| Power Supply 3.3V | 3V3 | 3V3 | +| Ground | GND | GND | **GROVE 接口** -| *Grove* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO13 | IO13 | -| SDA | **IO12** | **IO4** | -| 5V | 5V | 5V | -| GND | GND | GND | +| *Grove* | *M5Camera* | +| :-----------: | :------: | +| SCL | IO13 | +| SDA | **IO4** | +| 5V | 5V | +| GND | GND | **LED 接口** -| *LED* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------:| :------: | :------: | -| LED_Pin | IO14 | IO14 | +| *LED* |*M5Camera* | +| :-----------:| :------: | +| LED_Pin | IO14 | **以下为预留的IC接口** @@ -123,25 +123,25 @@ *IIC 地址是 0x76* -| *BMP280* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO23 | IO23 | -| SDA | IO22 | IO22 | +| *BMP280* |*M5Camera* | +| :-----------: | :------: | +| SCL | IO23 | +| SDA | IO22 | **MPU6050 接口** -| *MPU6050* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| SCL | IO23 | IO23 | -| SDA | IO22 | IO22 | +| *MPU6050* | *M5Camera* | +| :-----------: | :------: | +| SCL | IO23 | +| SDA | IO22 | **MIC(SPM1423) 接口** -| *MIC(SPM1423)* | *M5Camera(A model)* | *M5Camera(B model)* | -| :-----------: | :------: | :------: | -| CLK |IO4|IO4| -| DATA |IO2|IO2| +| *MIC(SPM1423)* | *M5Camera* | +| :-----------: | :------: | +| CLK |IO4| +| DATA |IO2| @@ -162,27 +162,13 @@ ### 出厂固件（WiFi传输图像） -- **[A Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/wifi/wifi_sta/firmware/Camera%20A)** - -- **[B Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/wifi/wifi_sta/firmware/Camera%20B)** +- **[M5Camera](https://github.com/m5stack/m5stack-cam-psram/tree/master/wifi/wifi_sta/firmware/Camera%20B)** ### 例程 -**A Model：** - - - **[人脸识别](https://github.com/m5stack/m5stack-cam-psram/tree/master/face_recognize/firmware/Camera%20A)** - - - **[串口通信-A Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20A)** - - - **[串口通信-M5Core](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/arduino)**（串口通信例程为，摄像头与M5Core之间通信） - - - **[QRcode识别](https://github.com/m5stack/m5stack-cam-psram/tree/master/qr/firmware/Camera%20A)** - -**B Model：** - - **[人脸识别](https://github.com/m5stack/m5stack-cam-psram/tree/master/face_recognize/firmware/Camera%20B)** - - **[串口通信-B Model](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20B)** + - **[串口通信-M5Camera](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/firmware/Camera%20B)** - **[串口通信-M5Core](https://github.com/m5stack/m5stack-cam-psram/tree/master/uart/arduino)**（串口通信例程为，摄像头与M5Core之间通信）