m5/m5-docs
0
0
Fork 0
mirror of https://github.com/m5stack/m5-docs.git synced 2026-05-20 10:23:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:m5stack/m5-docs

Browse Source
This commit is contained in:
ali-admin
2021-03-11 11:40:32 +08:00
parent 1329728e1b d6a4bb26b8
commit 6f323cb9bb
11 changed files with 75 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/main-min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/main.css
+2 -3
View File
@@ -1413,12 +1413,11 @@ table tr:nth-child(odd) {
}
.markdown-section blockquote {
background-color: #282c34;
color: white;
background-color: #eff6fb;
}
blockquote strong {
color: white;
color: black;
}
.box-card-item {
docs/en/core/core2.md
+1 -1
View File
@@ -33,7 +33,7 @@ The development platform and programming language supported by M5Stack Core2: Ar
Restart: Click the RST button at the bottom
>To stack M5Core2 with M5 modules, you need to remove/omit the battery bottom of Core2; If you need to keep I2S Mic, IMU and Battery functions, a [M5GO Bottom2](en/base/m5go_bottom2) is needed.
>**To stack M5Core2 with M5 modules, you need to remove/omit the battery bottom of Core2; If you need to keep I2S Mic, IMU and Battery functions, a [M5GO Bottom2](en/base/m5go_bottom2) is needed.**
## Product Features
docs/en/core/core2_for_aws.md
+8 -2
View File
@@ -22,7 +22,7 @@ The Core2 for AWS comes with an ESP32-D0WDQ6-V3 microcontroller, which features
The main unit is equipped with a 2.0-inch capacitive touch screen that provides a smooth and responsive human machine interface. The built-in vibration motor can be used to provide haptic feedback or alerts. Onboard RTC module provides accurate time of day. Power is supplied through an AXP192 power management chip, to monitor and control power attributes of the device. The included TF card slot supports microSD cards up to 16GB. The on-board speaker is paired with an I2S digital audio interface power amplifier chip to reduce signal distortion and provide clearer audio output. There are independent physical power and reset (RST) buttons on the sides of Core2 for AWS, with 3 programmable touch buttons on the front of the screen.
The M5GO Bottom2 for AWS adds additional features and security for IoT applications. The MPU6886 provides 6-axis internal IMU and temperature, the SPM1423 digital microphone captures audio for recording or creating voice applications, 10 individually programmable RGB LEDs via SK6812 to create customized and animated light effects, a 500mAh lithium-ion battery provides power on the go, the onboard Microchip ATECC608 Trust&GO crypto-authentication chip is pre-provisioned with secure keys to simplify connectivity to AWS and accelerate cryptographic computation.
**The M5GO Bottom2 for AWS adds additional features and security for IoT applications. The MPU6886 provides 6-axis internal IMU and temperature, the SPM1423 digital microphone captures audio for recording or creating voice applications, 10 individually programmable RGB LEDs via SK6812 to create customized and animated light effects, a 500mAh lithium-ion battery provides power on the go, the onboard Microchip ATECC608 Trust&GO crypto-authentication chip is pre-provisioned with secure keys to simplify connectivity to AWS and accelerate cryptographic computation.**
**Operations:**
@@ -367,7 +367,7 @@ For more information about Pin assignment and Pin Remapping, Please refer to [ES
- [BM8563](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/BM8563_V1.1_cn.pdf)
- [SY7088](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/SY7088-Silergy.pdf)
- [AXP192](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/AXP192_datasheet_en.pdf)
- [ATECC608](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/ATECC608-TNGTLS-CryptoAuthentication-Data-Sheet-DS40002112B.pdf)
- [ATECC608](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/ATECC608A-TNGTLS-CryptoAuthentication-Data-Sheet-DS40002112B.pdf)
- **API**
@@ -392,6 +392,12 @@ For more information about Pin assignment and Pin Remapping, Please refer to [ES
- [UIFlow](en/quick_start/core2/m5stack_core2_get_started_MicroPython)
- [Arduino](en/arduino/arduino_core2_development)
## Video
<video width="500" controls>
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/Core/CORE2_FOR_AWS_FACTORY2.mp4" type="video/mp4">
</video>
<el-divider content-position="right">Last updated: 2020-12-15</el-divider>
<script>
docs/en/module/nb-iot.md
+21
View File
@@ -25,6 +25,27 @@ Power Operation:
- Reset module: GPIO26 HIGH
<br>
## Module compatibility
<table>
<tr style="font-weight:bold">
<td>Master control device</td>
<td>Compatibility</td>
</tr>
<tr>
<td>BASIC/GRAY/M5GO</td>
<td>Compatible</td>
</tr>
<tr>
<td>FIRE</td>
<td>Conflicts with PSRAM (G16/17), use requires flying leads to another set of UART pins</td>
</tr>
<tr>
<td>CORE2</td>
<td>Occupy external port G32</td>
</tr>
</table>
<img src="assets/img/product_pics/module/nb-iot/nb_iot_03.webp" width="50%" height="50%"><img src="assets/img/product_pics/module/nb-iot/nb_iot_04.webp" width="50%" height="50%">
<br><br>
docs/en/product_list.json
+3 -3
View File
@@ -223,13 +223,13 @@
{"a":"/#/en/module/faces_gameboy", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/face_gamepad.webp", "p":"GAMEPAD", "sku":"A004" ,"kw":"FACES GAMEPAD"}
],
"Other": [
{"id":"other"},
{"a":"/#/en/module/ecg", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/ecg_01.webp", "p":"ECG", "sku":"M034" ,"kw":"AD8232", "category":"Other"}
{"id":"other-module"},
{"a":"/#/en/module/ecg", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/ecg_01.webp", "p":"ECG", "sku":"M034" ,"kw":"AD8232", "category":"Other-Module"}
]
},
"Cameras": {
"WiFi-Cameras": [
{"id":"wifi-Cameras"},
{"id":"wifi-cameras"},
{"a":"/#/en/unit/timercam_x", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_x.webp", "p":"Timer Camera X", "sku":"U082-X", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA X", "category":"WiFi-Cameras"},
{"a":"/#/en/unit/timercam_f", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_f_01.webp", "p":"Timer Camera F", "sku":"U082-F", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA FISH"},
{"a":"/#/en/unit/timercam", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera.webp", "p":"Timer Camera", "sku":"U082", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA"},
docs/zh_CN/core/core2.md
+1 -1
View File
@@ -24,7 +24,7 @@ M5Stack Core2支持的开发平台和程序语言：Arduino，[UIFlow](http://fl
* 复位: 单击底侧RST按键
>M5Core2与M5模块进行堆叠的时候，您需要拆卸Core2的电池底部；如果需要保持底座的I2S麦克风，IMU和电池功能并同时堆叠其他模块，则建议使用[M5GO Bottom2](zh_CN/base/m5go_bottom2)。
>**M5Core2与M5模块进行堆叠的时候，您需要拆卸Core2的电池底部；如果需要保持底座的I2S麦克风，IMU和电池功能并同时堆叠其他模块，则建议使用[M5GO Bottom2](zh_CN/base/m5go_bottom2)。**
## 产品特性
docs/zh_CN/core/core2_for_aws.md
+8 -2
View File
@@ -20,7 +20,7 @@
其核心主控**Core2**配备了ESP32-D0WDQ6-V3，具有两个可以单独控制的 Xtensa® 32-bit LX6 处理器，主频高达240Mhz，支持WiFi与蓝牙功能，板载16MB Flash与8MB PSRAM，可通过TYPE-C接口下载程序，强劲的配置满足复杂应用的资源开销。正面搭载一块2.0寸一体化电容式触摸屏，为用户带来更流畅的人机交互体验。机身内置震动马达，可提供触觉回馈和震动提醒功能。内建的RTC模块可提供精准计时功能。电源部分搭载AXP192电源管理芯片可有效控制机身功耗，内置绿色电源指示灯。同时机身内配备了TF-card(microSD)卡槽与扬声器，为了保证获得更高质量的声音效果，采用I2S数字音频接口的功放芯片，能有效防止信号失真。在机身的左侧和底部配有独立的电源按键与重启(RST)按键，屏幕正面的3个圆点属于触摸屏的一部分，可通过编写程序设置热区映射为3个虚拟按键。
**M5GO-Bottom For AWS** 是专为该定制款设计的拓展型底座，底座集成了MPU6886六轴姿态传感器，数字麦克风(SPM1423),500mAh锂电池。提供两组HY2.0-4P拓展接口将常用的ADC/DAC/UART引脚进行了引出，能够用于各类型传感器的接入。底座两侧分别为10颗可编程RGB灯(SK6812)，配合磨砂透光材质遮光条，能够提供柔和舒适发光效果。底部采用pogo pin磁吸充电接口，当吸附充电底座时，电流将经过内置的TP4057充电芯片安全的流入内部电池。除充电功能外pogo pin接口对主控I2C总线进行了引出，这使得你能够通过磁吸的方式去外接拓展。内置吸附磁铁，背面采用兼容LEGO孔设计，能够与你的其他的LEGO结构设计无缝对接。
**M5GO-Bottom For AWS 是专为该定制款设计的拓展型底座，底座集成了MPU6886六轴姿态传感器，数字麦克风(SPM1423),500mAh锂电池。提供两组HY2.0-4P拓展接口将常用的ADC/DAC/UART引脚进行了引出，能够用于各类型传感器的接入。底座两侧分别为10颗可编程RGB灯(SK6812)，配合磨砂透光材质遮光条，能够提供柔和舒适发光效果。底部采用pogo pin磁吸充电接口，当吸附充电底座时，电流将经过内置的TP4057充电芯片安全的流入内部电池。除充电功能外pogo pin接口对主控I2C总线进行了引出，这使得你能够通过磁吸的方式去外接拓展。内置吸附磁铁，背面采用兼容LEGO孔设计，能够与你的其他的LEGO结构设计无缝对接。**
**AWS定制款嵌入了ATECC608硬件加密芯片，能够以硬件层次密钥的方式加强设备物联网通信过程的安全**
@@ -367,7 +367,7 @@ TF 卡最大支持 16GB
- [BM8563](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/BM8563_V1.1_cn.pdf)
- [SY7088](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/SY7088-Silergy.pdf)
- [AXP192](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/AXP192_datasheet_en.pdf)
- [ATECC608](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/ATECC608-TNGTLS-CryptoAuthentication-Data-Sheet-DS40002112B.pdf)
- [ATECC608](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/ATECC608A-TNGTLS-CryptoAuthentication-Data-Sheet-DS40002112B.pdf)
- **API**
@@ -392,6 +392,12 @@ TF 卡最大支持 16GB
- [UIFlow](zh_CN/quick_start/core2/m5stack_core2_get_started_MicroPython)
- [Arduino](zh_CN/arduino/arduino_core2_development)
## 相关视频
<video width="500" controls>
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/Core/CORE2_FOR_AWS_FACTORY2.mp4" type="video/mp4">
</video>
<el-divider content-position="right">Last updated: 2020-12-15</el-divider>
<script>
docs/zh_CN/module/nb-iot.md
+21 -1
View File
@@ -20,7 +20,27 @@
- 电源按钮长按8s关机
- GPIO26高电平模块复位
?>**M5Stack Fire** 中的 GPIO 16 / 17 默认与PSRAM连接，这使得NB-IoT模块的TXD / RXD（GPIO16，GPIO17）与其产生冲突.因此，当你使用 M5Stack Fire 去驱动 NB-IoT 模块时，你需要将 NB-IoT 模块的 TXD 与 RXD 切断，然后通过飞线引至另一组 UART 引脚.
## 模块兼容
<table>
<tr style="font-weight:bold">
<td>主控设备</td>
<td>兼容性</td>
</tr>
<tr>
<td>BASIC/GRAY/M5GO</td>
<td>兼容</td>
</tr>
<tr>
<td>FIRE</td>
<td>与PSRAM(G16/17)冲突，使用需要飞线引至另一组 UART 引脚</td>
</tr>
<tr>
<td>CORE2</td>
<td>占用外部端口G32</td>
</tr>
</table>
<img src="assets/img/product_pics/module/nb-iot/module_nbiot_note01.webp" width="100%">
docs/zh_CN/product_list.json
+3 -3
View File
@@ -223,13 +223,13 @@
{"a":"/#/zh_CN/module/faces_gameboy", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/face_gamepad.webp", "p":"GAMEPAD", "sku":"A004" ,"kw":"FACES GAMEPAD"}
],
"其他模块": [
{"id":"other"},
{"a":"/#/zh_CN/module/ecg", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/ecg_01.webp", "p":"ECG", "sku":"M034" ,"kw":"AD8232", "category":"Other"}
{"id":"other-module"},
{"a":"/#/zh_CN/module/ecg", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/ecg_01.webp", "p":"ECG", "sku":"M034" ,"kw":"AD8232", "category":"Other-Module"}
]
},
"摄像头": {
"WiFi-摄像头": [
{"id":"wifi-Cameras"},
{"id":"wifi-cameras"},
{"a":"/#/zh_CN/unit/timercam_x", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_x.webp", "p":"Timer Camera X", "sku":"U082-X", "qs":"/#/zh_CN/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA X", "category":"WiFi-Cameras"},
{"a":"/#/zh_CN/unit/timercam_f", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_f_01.webp", "p":"Timer Camera F", "sku":"U082-F", "qs":"/#/zh_CN/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA FISH"},
{"a":"/#/zh_CN/unit/timercam", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera.webp", "p":"Timer Camera", "sku":"U082", "qs":"/#/zh_CN/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA"},
docs/zh_CN/unit/catch.md
+6
View File
@@ -0,0 +1,6 @@
# Catch Unit
## 描述
</script>