From e3ba4ca5d47c34ef4330512e247553c6fc0027af Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Wed, 28 Aug 2019 20:44:04 +0800 Subject: [PATCH 1/2] change some pic display size --- docs/en/base/base15.md | 5 +++-- docs/en/base/base26.md | 11 ++++++----- docs/en/base/core_bottom.md | 4 ++++ docs/en/base/lan_base.md | 2 +- docs/en/base/m5go_bottom.md | 6 ++++-- docs/en/base/m5go_charger.md | 4 ++-- docs/en/base/m5go_rfid.md | 2 ++ docs/en/base/node_base.md | 8 +++----- docs/en/base/plc_base.md | 10 +++++++--- docs/en/unit/esp32cam.md | 8 ++++---- docs/en/unit/m5camera.md | 13 ++++++++----- docs/en/unit/m5camera_f.md | 6 +++--- docs/zh_CN/base/base15.md | 3 ++- docs/zh_CN/base/base26.md | 3 ++- docs/zh_CN/base/lan_base.md | 2 +- docs/zh_CN/base/m5go_bottom.md | 6 ++++-- docs/zh_CN/base/m5go_charger.md | 2 +- docs/zh_CN/base/m5go_rfid.md | 8 +++++--- docs/zh_CN/base/node_base.md | 8 +++----- docs/zh_CN/base/plc_base.md | 1 - docs/zh_CN/hat/hat-neoflash.md | 1 - docs/zh_CN/unit/esp32cam.md | 8 ++++---- docs/zh_CN/unit/m5camera.md | 10 +++++++--- docs/zh_CN/unit/m5camera_f.md | 12 +++++++----- 24 files changed, 83 insertions(+), 60 deletions(-) diff --git a/docs/en/base/base15.md b/docs/en/base/base15.md index df349ea1..f8bfc462 100644 --- a/docs/en/base/base15.md +++ b/docs/en/base/base15.md @@ -1,4 +1,4 @@ -# Base Base15 {docsify-ignore-all} +# Base15 {docsify-ignore-all} @@ -24,11 +24,12 @@ This base gives you an unlimited of combinations, it is powerful, flexible, and - Highly Customizable - Alternative parts - M-BUS extension +- on-board DC-DC (9 ~ 24V -> 5V) - 2 Fitting ways ## Include -- 1x PLC-Proto Broad +- 1x Base15 Broad - 1x Base15 Plastic Enclosure - 1x Slide Guide - 1x Din-Rail diff --git a/docs/en/base/base26.md b/docs/en/base/base26.md index de83445a..756b1527 100644 --- a/docs/en/base/base26.md +++ b/docs/en/base/base26.md @@ -1,4 +1,4 @@ -# Base Base26 {docsify-ignore-all} +# Base26 {docsify-ignore-all} @@ -8,8 +8,8 @@ ## Description -**Base15** Base26 is a highly customizable bottom for industrial purpose. Similar to PLC Base but higher customized level.
-Package includes protoboard which allows you to add up your own circuit design. On the board, two Grove bonding pads are reserved. Other components come with the package is an M type waterproof joint and a TTL-to_RS485 converter board. The M type waterproof joint (M12*15)can be assembled on the side and the bottom of the Base. +**Base26** is a highly customizable bottom for industrial purpose. Similar to PLC Base but higher customized level.
+Package includes protoboard which allows you to add up your own circuit design. On the board, two Grove bonding pads are reserved. Other components come with the package is an M type waterproof joint and a TTL-to-RS485 converter board. The M type waterproof joint (M12*15)can be assembled on the side and the bottom of the Base. '26' comes from the hight of the bottom which is 26 cm. and each side on the Base is movable, cuttable and can be customized into different Interface. With regards to the customization of the side, we have offered plenty of structural components alternative and it is totally opensource. You can 3D print the parts and replace the side as you like.
@@ -25,11 +25,12 @@ This base gives you an unlimited of combinations, it is powerful, flexible, and - Highly Customizable - Alternative parts - M-BUS extension +- on-board DC-DC (9 ~ 24V -> 5V) - 2 Fitting ways ## Include -- 1x PLC-Proto Broad +- 1x Base26 Broad - 1x Base15 Plastic Enclosure - 1x TTL-to-RS485 board - 1x Slide Guide @@ -38,7 +39,7 @@ This base gives you an unlimited of combinations, it is powerful, flexible, and - 1x M12*1.5 - 1x 4 Pin 3.96 Pitch Terminal - 1x hexagonal wrench -- 10x Screw (3 types: M3*22, M3*12, M2*5) +- 10x Screw (3 types: M3x22, M3x12, M2x5) - 2x M3 Nut - 1x 2.45mm pin set - 1x Sticker diff --git a/docs/en/base/core_bottom.md b/docs/en/base/core_bottom.md index 1eefefe1..c5bff94f 100644 --- a/docs/en/base/core_bottom.md +++ b/docs/en/base/core_bottom.md @@ -12,6 +12,10 @@ +## Product Features + +- Li-po battery: 150 mAh @ 3.7V + **M-Bus** M_BUS diff --git a/docs/en/base/lan_base.md b/docs/en/base/lan_base.md index d9763167..a43924f4 100644 --- a/docs/en/base/lan_base.md +++ b/docs/en/base/lan_base.md @@ -20,7 +20,7 @@ If you need to add RS485 interface, soldering the RS485 board onto the mian boar **TTL-to-RS485 adapter board and LAN base** - + **The figure below tells you how the TTL-to-RS485 adapter board connected onto LAN backplane** diff --git a/docs/en/base/m5go_bottom.md b/docs/en/base/m5go_bottom.md index a58b6860..3f879f0d 100644 --- a/docs/en/base/m5go_bottom.md +++ b/docs/en/base/m5go_bottom.md @@ -14,7 +14,7 @@ ## PinMap -**POGO Pin** +**Pogo Pin** | POGO Pin | ESP32 Chip | | :----------: |:------------: | @@ -31,6 +31,8 @@ **MIC** +Analog Microphone + | MIC Pin | ESP32 Chip | | :----------: |:------------: | | MIC Pin | GPIO34 | @@ -62,7 +64,7 @@ ## Related Link -- **[M5GO IOT Starter Kit Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-M5GO-IoT-Starter-Kit-ESP32-for-Arduino-MicroPython-Programming-Development-IR-MIC/3226069_32881911596.html?spm=2114.12010615.8148356.2.52385ab04i7vIu)** +- **[M5GO IoT Starter Kit Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-M5GO-IoT-Starter-Kit-ESP32-for-Arduino-MicroPython-Programming-Development-IR-MIC/3226069_32881911596.html?spm=2114.12010615.8148356.2.52385ab04i7vIu)** ## Schematic diff --git a/docs/en/base/m5go_charger.md b/docs/en/base/m5go_charger.md index 7f9faef6..e407b114 100644 --- a/docs/en/base/m5go_charger.md +++ b/docs/en/base/m5go_charger.md @@ -8,7 +8,7 @@ ## Description -**M5GO CHARGER** is a charger base for [M5GO Lite](https://docs.m5stack.com/#/en/core/m5go_lite) kit and [M5GO IOT Kit](https://docs.m5stack.com/#/en/core/m5go_lite) and [FIRE](https://docs.m5stack.com/#/en/core/m5go_lite). +**M5GO CHARGER** is a charger base for [M5GO Lite](https://docs.m5stack.com/#/en/core/m5go_lite) kit and [M5GO IoT Kit](https://docs.m5stack.com/#/en/core/m5go_lite) and [FIRE](https://docs.m5stack.com/#/en/core/m5go_lite). @@ -25,4 +25,4 @@ The charging indicator light will blink when base is charging, but the light wil ## Related Link -- **[M5GO IOT Starter Kit Purchase Link](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** +- **[M5GO IoT Starter Kit Purchase Link](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** diff --git a/docs/en/base/m5go_rfid.md b/docs/en/base/m5go_rfid.md index 4b4a43a0..fdc9c1b6 100644 --- a/docs/en/base/m5go_rfid.md +++ b/docs/en/base/m5go_rfid.md @@ -33,6 +33,8 @@ M5GO Base is composed of battery(330mAh), M-Bus interface, charging indicator(re **MIC** +Analog Microphone + | MIC Pin | ESP32 Chip | | :----------: |:------------: | | MIC Pin | GPIO34 | diff --git a/docs/en/base/node_base.md b/docs/en/base/node_base.md index 58cbeae4..e8c5f9d3 100644 --- a/docs/en/base/node_base.md +++ b/docs/en/base/node_base.md @@ -33,15 +33,13 @@ Internet Radio ## PinMap - - + +
ESP32GPIO0GPIO13GPIO5GPIO2 ( MOSI )GPIO34 ( MISO )GPIO21GPIO22GPIO25
Codec Chip ( WM8978 )I2S_CLK ( MCLK )I2S_WS ( LRC )I2S_BCK ( BCK )I2S_IN ( DACDAT )I2S_OUT ( ADCDAT )I2C_SDA ( SDIN )I2C_SCL ( SCLK )L_OUT1 ( LOUT1 )
ESP32GPIO0GPIO13GPIO5GPIO2GPIO34GPIO21GPIO22GPIO25
Codec ChipI2S_CLKI2S_WSI2S_BCKI2S_INI2S_OUTI2C_SDAI2C_SCLL_OUT1
- - - +
ESP32GPIO15GPIO35GPIO12GPIO21GPIO22
RGBLed(SK6812)Signal Pin
IR IR_ReceiveIR_Send
DHT12 I2C_SDAI2C_SCL
node baseRGBLed(SK6812)IR_ReceiveIR_SendDHT12_SDADHT12_SCL
## Include diff --git a/docs/en/base/plc_base.md b/docs/en/base/plc_base.md index 04705ad6..7ad73731 100644 --- a/docs/en/base/plc_base.md +++ b/docs/en/base/plc_base.md @@ -3,19 +3,18 @@ *** -:memo:**[Description](#Description)**  **      🛒**[Purchase](https://m5stack.com/collections/m5-base/products/plc-proto-industrial-board-module)**      :clapper:**[Related Video](#Related-Video)** +:memo:**[Description](#Description)**    :electric_plug:**[Schematic](#Schematic)**     🛒**[Purchase](https://m5stack.com/collections/m5-base/products/plc-proto-industrial-board-module)**      :clapper:**[Related Video](#Related-Video)** ## Description **PLC M12** is a Base specifically design for industrial application. DC Power in 9-24V. Does this PLC remind you of the 'PLC' in industrial controll short for 'Programmable Logic Controller'. This PLC base is not the typical 'PLC' used in programmable controller, but its does able to implement the most common controller in industrial field. Based on the current M5 development system, you can add as many Realys as you want, you can enable the TTL-RS485 communication, you can layout your customized circult on the protoboard. you also can make it an LoRa node by stacking a LoRa module etc. This base gives you an unlimited number of combinations, it is powerful, flexible, and covered with an industrial-grade case. If you happen to work in an industrial field, We especially recommend this PLC base to you which will surely give you the best and the fastest way to resolve your requirement. -**The current sensor (ACS712TELC-05B)** is also integrated on **the RS485 adapter board** for current monitoring. If you need to add RS485 interface, soldering the RS485 board onto the mian board pin correspondingly. -*The serial port pins on the RS485 board will be connected to the GPIO16 and GPIO17 of the LAN backplane.* +*The serial port pins on the RS485 board will be connected to the GPIO16 and GPIO17 of the PLC backplane.* ## Feature @@ -46,6 +45,11 @@ If you need to add RS485 interface, soldering the RS485 board onto the mian boar - **[Forum](http://forum.m5stack.com/)** +## Schematic + + + + ## Related Video **RS485 Communication** diff --git a/docs/en/unit/esp32cam.md b/docs/en/unit/esp32cam.md index 162cea95..7f28cd4c 100644 --- a/docs/en/unit/esp32cam.md +++ b/docs/en/unit/esp32cam.md @@ -15,7 +15,7 @@ The hardware comes preloaded software, programmed by ESP-IDF. It is an applicati what this software can do? - Power the board via USB type-C or GROVE - Use your phone to Wi-Fi scan an AP name start with 'm5stack-' and click to connect this AP. -- Open up web browser on your phone and visit 192.168.4.1 +- Open up web browser on your phone and visit 192.168.4.1 - Then here comes the picture. Video is about 5-6 frames per senconds. not super fast. The hardware also comes with some reserved weld pad, just in case you want put these chips back on board. @@ -26,7 +26,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t **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.** @@ -126,7 +126,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t **BME280 Interface** -*It's IIC address is 0x76.* +*I2C address 0x76.* | *BME280* | *ESP32Cam* | | :-----------: | :--------: | @@ -136,7 +136,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t **MPU6050 Interface** -*It's IIC address is 0x68.* +*I2C address is 0x68.* | *MPU6050* | *ESP32Cam* | | :-----------: | :--------: | diff --git a/docs/en/unit/m5camera.md b/docs/en/unit/m5camera.md index 967e33ad..506f6f50 100644 --- a/docs/en/unit/m5camera.md +++ b/docs/en/unit/m5camera.md @@ -15,7 +15,7 @@ The hardware comes preloaded software, programmed by ESP-IDF. It is an applicati what this software can do? - Power the board via USB type-C or GROVE - Use your phone to Wi-Fi scan an AP name start with 'm5stack-' and click to connect this AP. -- Open up web browser on your phone and visit 192.168.4.1 +- Open up web browser on your phone and visit 192.168.4.1 - Then here comes the picture. Video is about 5-6 frames per senconds. not super fast. The hardware also comes with some reserved weld pad, just in case you want put these chips back on board. @@ -24,7 +24,10 @@ The hardware also comes with some reserved weld pad, just in case you want put t - **Analog MIC (SPQ2410)** - Lipo Battery power pins - + + + + **Please notice:** There are 2 types of **M5Camera** - Model A & Model B @@ -33,7 +36,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t - In Model A circuit design MPU6050 and camera sensor have I2C conflict, which means you can't use both at the same time. - Model B have better performance on image quality and processing speed. - + **Note: M5Camera is named differently when different hardware is selected. They follow the rules below.** @@ -140,7 +143,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t **BME280 Interface** -*It's IIC address is 0x76.* +*I2C address 0x76.* | *BME280* | *M5Camera(A model)* | *M5Camera(B model)* | | :-----------: | :------: | :------: | @@ -150,7 +153,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t **MPU6050 Interface** -*It's IIC address is 0x68.* +*I2C address 0x68.* | *MPU6050* | *M5Camera(A model)* | *M5Camera(B model)* | | :-----------: | :------: | :------: | diff --git a/docs/en/unit/m5camera_f.md b/docs/en/unit/m5camera_f.md index 079ab348..84949687 100644 --- a/docs/en/unit/m5camera_f.md +++ b/docs/en/unit/m5camera_f.md @@ -10,14 +10,14 @@ **M5CameraF** is a development board for image recognition. It features an ESP32(4M Flash + 520K RAM) chip and 2-Megapixel carmera(OV2640).**M5CameraF** offers plenty of storage, with an extra 4 Mbyte PSRAM. It also supports image transmission via Wi-Fi and debuging through USB Type-C port. - + The hardware comes preloaded software, programmed by ESP-IDF. It is an application to run Wi-Fi camera. The output image is size 600*800, since it's 2-Maga camera, you sure can optimize the software to output the maximum size of photos. what this software can do? - Power the board via USB type-C or GROVE - Use your phone to Wi-Fi scan an AP name start with 'm5stack-' and click to connect this AP. -- Open up web browser on your phone and visit 192.168.4.1 +- Open up web browser on your phone and visit 192.168.4.1 - Then here comes the picture. Video is about 5-6 frames per senconds. not super fast. The hardware also comes with some reserved weld pad, just in case you want put these chips back on board. @@ -26,7 +26,7 @@ The hardware also comes with some reserved weld pad, just in case you want put t - **Digital silicon microphone (SPM1423)** - Lipo Battery power pins - + **Note: M5CameraF is named differently when different hardware is selected. They follow the rules below.** diff --git a/docs/zh_CN/base/base15.md b/docs/zh_CN/base/base15.md index 22ff138d..82424e59 100644 --- a/docs/zh_CN/base/base15.md +++ b/docs/zh_CN/base/base15.md @@ -23,12 +23,13 @@ - 支持高度定制化 - 可替换部件 - M-BUS 拓展 +- 板载DC-DC转换(9 ~ 24V -> 5V) - 2 种底座固定方式 ## 套件清单 -- 1x PLC-Proto Broad +- 1x Base15 Broad - 1x Base15 外壳 - 1x 金属导轨 - 1x Din导轨 diff --git a/docs/zh_CN/base/base26.md b/docs/zh_CN/base/base26.md index ff897266..2791e2bb 100644 --- a/docs/zh_CN/base/base26.md +++ b/docs/zh_CN/base/base26.md @@ -23,11 +23,12 @@ - 支持高度定制化 - 可替换部件 - M-BUS 拓展 +- 板载DC-DC转换(9 ~ 24V -> 5V) - 2 种底座固定方式 ## 套件清单 -- 1x PLC-Proto Broad +- 1x Base26 Broad - 1x Base26 外壳 - 1x TTL-RS485转接板 - 1x 金属导轨 diff --git a/docs/zh_CN/base/lan_base.md b/docs/zh_CN/base/lan_base.md index 263ef09d..fd112a9e 100644 --- a/docs/zh_CN/base/lan_base.md +++ b/docs/zh_CN/base/lan_base.md @@ -20,7 +20,7 @@ HT3.96连接器的 6 个引脚默认悬空，你可以根据需求将其与M-BUS **TTL-RS485 转接板 与 LAN 底座** - + **TTL-RS485 转接板 与 LAN 底座的连接图** diff --git a/docs/zh_CN/base/m5go_bottom.md b/docs/zh_CN/base/m5go_bottom.md index f345bce1..37cac09e 100644 --- a/docs/zh_CN/base/m5go_bottom.md +++ b/docs/zh_CN/base/m5go_bottom.md @@ -12,7 +12,7 @@ ## 管脚映射 -**POGO Pin** +**Pogo Pin** | POGO Pin | ESP32 Chip | | :----------: |:------------: | @@ -29,6 +29,8 @@ **MIC** +模拟输入麦克风 + | MIC Pin | ESP32 Chip | | :----------: |:------------: | | MIC Pin | GPIO34 | @@ -59,7 +61,7 @@ ## 相关链接 -- **[M5GO IOT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** +- **[M5GO IoT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** ## 原理图 diff --git a/docs/zh_CN/base/m5go_charger.md b/docs/zh_CN/base/m5go_charger.md index 24cc257b..939b0459 100644 --- a/docs/zh_CN/base/m5go_charger.md +++ b/docs/zh_CN/base/m5go_charger.md @@ -25,4 +25,4 @@ ## 相关链接 -- **[M5GO IOT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** +- **[M5GO IoT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** diff --git a/docs/zh_CN/base/m5go_rfid.md b/docs/zh_CN/base/m5go_rfid.md index 4beb8130..26453488 100644 --- a/docs/zh_CN/base/m5go_rfid.md +++ b/docs/zh_CN/base/m5go_rfid.md @@ -10,7 +10,7 @@ **M5GO RFID** 是内置RFID的升级版 [M5GO BOTTOM](zh_CN/base/m5go_bottom) 底座。相比普通版本 [M5GO Bottom](zh_CN/base/m5go_bottom)，**底座少了磁铁和电池容量少了230mAh**，多了 **RFID 线圈** 和 **红外发射管**。 -M5GO 底座由 370mAh 的电池(充满 3.7V)、M-Bus 总线接口、麦克风、红色的充电指示 LED、2条 RGB灯条 (10颗)、**RFID 线圈**、**红外发射管**、PORT B 和 PORT C 组成。 +M5GO 底座由 330mAh 的电池(充满 3.7V)、M-Bus 总线接口、麦克风、红色的充电指示 LED、2条 RGB灯条 (10颗)、**RFID 线圈**、**红外发射管**、PORT B 和 PORT C 组成。 ## 管脚映射 @@ -29,7 +29,9 @@ M5GO 底座由 370mAh 的电池(充满 3.7V)、M-Bus 总线接口、麦克风、 | :----------: |:------------: | | LED Pin | GPIO15 | -**麦克风MIC** +**MIC** + +模拟输入麦克风 | MIC Pin | ESP32 Chip | | :----------: |:------------: | @@ -70,7 +72,7 @@ M5GO 底座由 370mAh 的电池(充满 3.7V)、M-Bus 总线接口、麦克风、 ## 相关链接 -- **[M5GO IOT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** +- **[M5GO IoT Starter Kit购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.690a425eFsoYVX&id=568283585553)** diff --git a/docs/zh_CN/base/node_base.md b/docs/zh_CN/base/node_base.md index 94e95b22..c85b02b8 100644 --- a/docs/zh_CN/base/node_base.md +++ b/docs/zh_CN/base/node_base.md @@ -31,15 +31,13 @@ ## 管脚映射 - - + +
ESP32GPIO0GPIO13GPIO5GPIO2 ( MOSI )GPIO34 ( MISO )GPIO21GPIO22GPIO25
Codec Chip ( WM8978 )I2S_CLK ( MCLK )I2S_WS ( LRC )I2S_BCK ( BCK )I2S_IN ( DACDAT )I2S_OUT ( ADCDAT )I2C_SDA ( SDIN )I2C_SCL ( SCLK )L_OUT1 ( LOUT1 )
ESP32GPIO0GPIO13GPIO5GPIO2GPIO34GPIO21GPIO22GPIO25
Codec ChipI2S_CLKI2S_WSI2S_BCKI2S_INI2S_OUTI2C_SDAI2C_SCLL_OUT1
- - - +
ESP32GPIO15GPIO35GPIO12GPIO21GPIO22
RGBLed(SK6812)Signal Pin////
IR/IR_ReceiveIR_Send//
DHT12///I2C_SDAI2C_SCL
node baseRGBLed(SK6812)IR_ReceiveIR_SendDHT12_SDADHT12_SCL
## 包含 diff --git a/docs/zh_CN/base/plc_base.md b/docs/zh_CN/base/plc_base.md index 0b800954..b3690c7a 100644 --- a/docs/zh_CN/base/plc_base.md +++ b/docs/zh_CN/base/plc_base.md @@ -10,7 +10,6 @@ **PLC M12** 是一款工业控制底座.覆盖工业级外壳，专为工控领域设计，与典型工控PLC（可编程逻辑控制器）有所不同.有着更加紧凑的外观设计，在实现基础工控功能的同时，维持控制器低功耗.基于 M5 开发体系，你可以根据需求添加任意数量的继电器开关，并且支持TTL-RS485通信.支持功能模块堆叠拓展，如堆叠 LoRa 模块，使 PLC 成为一个LoRa通信节点.提供 PLC-Proto 板，方便进行后续电路拓展设计.通过不同的硬件堆叠与拓展设计，满足工业级应用场景的各种定制化需求.**PLC** 底座会是工控项目的完美解决方案. -在RS485适配器板上，集成**电流传感器（ACS712TELC-05B）**，能够用于电流监控. diff --git a/docs/zh_CN/hat/hat-neoflash.md b/docs/zh_CN/hat/hat-neoflash.md index 6070667c..918bc4f3 100644 --- a/docs/zh_CN/hat/hat-neoflash.md +++ b/docs/zh_CN/hat/hat-neoflash.md @@ -7,7 +7,6 @@ :memo:**[描述](#描述)**     🛒**[购买链接](https://m5stack.com/products/m5stickc-proto-plus-hat)**  - ## 描述 **Neoflash HAT** 是一款专为M5SticKC设计的矩阵RGB LED灯板.这块尺寸面积仅有pass*pass的PCB板总共嵌入了126颗RGB LED灯，除了支持一般的灯光效果以外，还可以作为一个小型点阵显示屏使用. diff --git a/docs/zh_CN/unit/esp32cam.md b/docs/zh_CN/unit/esp32cam.md index aa00fef2..d768c88a 100644 --- a/docs/zh_CN/unit/esp32cam.md +++ b/docs/zh_CN/unit/esp32cam.md @@ -14,7 +14,7 @@ 这个程序是如何使用的? - 打开手机Wi-Fi，扫描并连接名称以"m5stack-"开头的AP热点. -- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. +- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. - 视频帧率大约在每秒5-6帧. 硬件拓展支持（预留以下IC焊接接口） @@ -33,7 +33,7 @@ * 如果还选配了麦克风 SPQ2410，则命名为 ESP32CAM_6050_MIC * 如果还选配了温湿度气压传感器 BME280，则命名为 ESP32CAM_6050_BME280 - + 因为模块可以生成 WIFI 热点 AP，所以可以用手机、PC 或其他设备通过 WIFI 无线获取摄像头图片，也可以通过模块的GROVE 接口有线获取摄像头图片。 @@ -124,7 +124,7 @@ **BME280 接口** -*IIC 地址是 0x76* +*I2C 地址 0x76* | *BME280* | *ESP32Cam* | | :-----------: | :--------: | @@ -134,7 +134,7 @@ **MPU6050 接口** -*IIC 地址是 0x68* +*I2C 地址是 0x68* | *MPU6050* | *ESP32Cam* | | :-----------: | :--------: | diff --git a/docs/zh_CN/unit/m5camera.md b/docs/zh_CN/unit/m5camera.md index 8828e589..95479709 100644 --- a/docs/zh_CN/unit/m5camera.md +++ b/docs/zh_CN/unit/m5camera.md @@ -14,7 +14,7 @@ 这个程序是如何使用的? - 打开手机Wi-Fi，扫描并连接名称以"m5stack-"开头的AP热点. -- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. +- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. - 视频帧率大约在每秒5-6帧. 硬件拓展支持（预留以下IC焊接接口） @@ -23,13 +23,17 @@ - **模拟MIC (SPQ2410)** - 电池插座 - + + + + **注意:** 有两种类型的 **M5Camera** Model A 和 Model B,它们有着不同的电路设计、可以通过背面贴纸进行分辨.在Model A的电路设计中，MPU6050和摄像头传感器存在I2C冲突，这意味着您无法同时使用两者,现在如今Model A已经停止生产，Model B在图像质量和处理速度方面具有更好的性能 - + + **注意：选配不同硬件时，M5Camera 的命名不一样，遵循以下规则** diff --git a/docs/zh_CN/unit/m5camera_f.md b/docs/zh_CN/unit/m5camera_f.md index 7b64a0c1..a7c1160f 100644 --- a/docs/zh_CN/unit/m5camera_f.md +++ b/docs/zh_CN/unit/m5camera_f.md @@ -14,20 +14,22 @@ 这个程序是如何使用的? - 打开手机Wi-Fi，扫描并连接名称以"m5stack-"开头的AP热点. -- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. +- 打开手机浏览器，访问192.168.4.1,进入监控页面实时获取拍摄视频. - 视频帧率大约在每秒5-6帧. 硬件拓展支持（预留以下IC焊接接口） - 6轴陀螺仪 (MPU6050) - 压力传感器 (BMP280) -- **模拟MIC (SPQ2410)** +- **数字硅晶麦克风 (SPM1423)** - 电池插座 - + - + -这个 Unit 还预留了 9 轴陀螺仪 (MPU6050) 、温湿度气压传感器 (BME280) 和**数字硅晶麦克风 (SPM1423)**的焊接口，如果您需要这些器件，可以自行焊接到对应位置上或者直接购买选配指定硬件版本的 M5CameraF。M5CameraF Unit 还预留了电池接口。外壳内可以容纳的电池大小对应电池容量为 **80mAh**。 + + +这个 Unit 还预留了 6 轴陀螺仪 (MPU6050) 、温湿度气压传感器 (BME280) 和**数字硅晶麦克风 (SPM1423)**的焊接口，如果您需要这些器件，可以自行焊接到对应位置上或者直接购买选配指定硬件版本的 M5CameraF。M5CameraF Unit 还预留了电池接口。外壳内可以容纳的电池大小对应电池容量为 **80mAh**。 **注意：选配不同硬件时，M5CameraF 的命名不一样，遵循以下规则** From 6ff2995121d95e066a86c369f0c5e588bf7a4718 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Thu, 29 Aug 2019 09:25:29 +0800 Subject: [PATCH 2/2] create hat-neoflash file --- docs/en/hat/hat-neoflash.md | 92 +++++++++---------------- docs/en/related_documents/v-training.md | 1 - docs/zh_CN/hat/hat-neoflash.md | 24 +++---- 3 files changed, 44 insertions(+), 73 deletions(-) diff --git a/docs/en/hat/hat-neoflash.md b/docs/en/hat/hat-neoflash.md index 9861cac9..e3a8442e 100644 --- a/docs/en/hat/hat-neoflash.md +++ b/docs/en/hat/hat-neoflash.md @@ -4,83 +4,59 @@ *** -:memo:**[Description](#Description)**    🛒**[Purchase](https://m5stack.com/products/m5stickc-proto-plus-hat)** +:memo:**[描述](#描述)**     🛒**[购买链接](https://m5stack.com/products/m5stickc-proto-plus-hat)**  -## Description +## 描述 -**Neoflash HAT** is +**Neoflash HAT** 是一款专为M5SticKC设计的矩阵RGB LED灯板.这块尺寸面积仅有58x23.5mm的PCB板总共嵌入了126颗可编程RGB LED灯，除了实现一般的灯光效果以外，高密度矩阵设计的它还可以作为一个小型点阵LED显示屏使用. + +在使用灯板制作一些数据显示应用时，使用配套的黑茶色亚克力板，能够有效增强显示效果.结合配套与默认的两组弯曲排针，**Neoflash HAT**能够以两种角度安装到M5StickC上.如果你打算为你的项目添加一个精致小巧的LED矩阵屏幕的话，Neoflash HAT 会是一个不错的选择. -## Product Features +## 产品特性 -- Hole Size: 0.039" 1mm (CNC Drilled) -- Hole Pitch: 0.1 in - (2.54 mm) -- Entire Hole Quantity: 168 Holes - -## Include - -- 1x PROTO PLUS HAT -- 1x 8 pin header（90°） - -## Application - -- Prototyping -- Related work by M5 User: [view](https://www.hackster.io/kiraku-labo/balance-robot-9009db) +- 单像素点的三基色颜色： + - 可实现256级亮度显示 + - 完成16777216种颜色的全真色彩显示. +- RGB LED数量: 126 个 +- 孔间距: 0.1 in - (2.54 mm) +- 孔尺寸: 0.039" 1mm (CNC工艺) +- 安装方式: 紧贴背面（默认）/水平拼接 -## Video +## 重量尺寸 -**Demo** +- 单品尺寸：58mm x 23.5mm x 1mm +- 单品重量：不知道多少克 + +## 包含 + +- 1x Neoflash HAT +- 2x 8 pin 2.54mm弯曲排针（90°） +- 1x 2mm黑茶色亚克力板 +- 2x 15cm导线(71号、0.4mm) + +## 应用 + +- LED矩阵显示屏 +- 数字时钟 + + +## 相关视频 +## 例程 -## Code - -*To get complete code, please click [here](https://github.com/ShashaDDD/EC11Encoder).* +*以下代码仅为片段，如需获取完整代码，[请点击此处.](https://github.com/ShashaDDD/EC11Encoder).* ```arduino #include -#include -#include -#include "RotaryEncoderWithButton.h" - - -//#include - -//RotaryEncoderWithButton rotary(2,3,4); -RotaryEncoderWithButton rotary(26,36,0); - -uint32_t data; -int i; -void t1Callback(); -Task t1(5, TASK_FOREVER, &RotaryEncoderWithButton::ReadAB); -Scheduler runner; - -void setup() { - M5.begin(); - Serial.begin(115200); - rotary.begin(); - - runner.init(); - runner.addTask(t1); - - delay(100); - t1.enable(); - -} - -void loop() { - runner.execute(); -} -``` - - - +``` \ No newline at end of file diff --git a/docs/en/related_documents/v-training.md b/docs/en/related_documents/v-training.md index 55f568e2..83a3199b 100644 --- a/docs/en/related_documents/v-training.md +++ b/docs/en/related_documents/v-training.md @@ -16,7 +16,6 @@ **[6. Run Recognition Program](#Run-Recognition-Program)** - ## Burner Firmware

Users who have already programmed the firmware should start directly from the Second step.

diff --git a/docs/zh_CN/hat/hat-neoflash.md b/docs/zh_CN/hat/hat-neoflash.md index 43986ace..e3a8442e 100644 --- a/docs/zh_CN/hat/hat-neoflash.md +++ b/docs/zh_CN/hat/hat-neoflash.md @@ -9,15 +9,9 @@ ## 描述 -**Neoflash HAT** 是一款专为M5SticKC设计的矩阵RGB LED灯板.这块尺寸面积仅有pass*pass的PCB板总共嵌入了126颗可编程RGB LED灯，除了实现一般的灯光效果以外，高密度矩阵设计的它还可以作为一个小型点阵LED显示屏使用. +**Neoflash HAT** 是一款专为M5SticKC设计的矩阵RGB LED灯板.这块尺寸面积仅有58x23.5mm的PCB板总共嵌入了126颗可编程RGB LED灯，除了实现一般的灯光效果以外，高密度矩阵设计的它还可以作为一个小型点阵LED显示屏使用. -提供两种安装方式， - -除了已经焊接完成的平行排针以外.90°弯曲排针. - -在使用灯板制作一些数据显示应用时，使用配套的黑茶色亚克力板，能够有效增强显示效果. - -如果你打算为你的项目添加一个精致小巧的LED矩阵屏幕的话，Neoflash HAT 会是一个不错的选择. +在使用灯板制作一些数据显示应用时，使用配套的黑茶色亚克力板，能够有效增强显示效果.结合配套与默认的两组弯曲排针，**Neoflash HAT**能够以两种角度安装到M5StickC上.如果你打算为你的项目添加一个精致小巧的LED矩阵屏幕的话，Neoflash HAT 会是一个不错的选择. @@ -27,21 +21,23 @@ - 单像素点的三基色颜色： - 可实现256级亮度显示 - 完成16777216种颜色的全真色彩显示. -- 孔尺寸: 0.039" 1mm (CNC工艺) -- 孔间距: 0.1 in - (2.54 mm) - RGB LED数量: 126 个 +- 孔间距: 0.1 in - (2.54 mm) +- 孔尺寸: 0.039" 1mm (CNC工艺) +- 安装方式: 紧贴背面（默认）/水平拼接 + ## 重量尺寸 -- 单品尺寸：54mm x 23.5mm x 1mm -- 单品重量：2g +- 单品尺寸：58mm x 23.5mm x 1mm +- 单品重量：不知道多少克 ## 包含 - 1x Neoflash HAT -- 2x 8 pin 排针（90°） -- 1x 黑茶色亚克力板 +- 2x 8 pin 2.54mm弯曲排针（90°） +- 1x 2mm黑茶色亚克力板 - 2x 15cm导线(71号、0.4mm) ## 应用