Merge branch 'dev-watson'

2026-05-20 10:23:01 -07:00 · 2018-12-13 15:20:56 +08:00
parent d4fc1fe4cb f4b5a4bb25
commit 9b9eec7a97
45 changed files with 1016 additions and 396 deletions
@@ -12,3 +12,4 @@ node_modules
 ._*
 .cache
 .DS_Store
+*.mp4
@@ -1,10 +1,56 @@
 # Product Documents

-[中文](/zh_CN/product_documents) | English | [日本語](/ja/product_documents)
+***

 <img src='assets/img/product_pics/1.jpg'> <img src='assets/img/product_pics/cores.png'>

-| M5Core        | MiniCore      |
+**M5Core**
+
+[![](https://img-blog.csdnimg.cn/20181210155042186.jpg)](en/product_documents/m5stack-core/m5core_basic) [![](https://img-blog.csdnimg.cn/20181210155059380.jpg)](en/product_documents/m5stack-core/m5core_gray) [![](https://img-blog.csdnimg.cn/20181210155116910.jpg)](en/product_documents/m5stack-core/m5core_fire)
+
+**MiniCore**
+
+[![](https://img-blog.csdnimg.cn/2018121015515360.jpg)](en/product_documents/m5stack-core/minicore_stick)
+
+**Kit**
+
+[![](https://img-blog.csdnimg.cn/20181210155134684.png)](en/product_documents/m5stack-core/m5go_iot_starter_kit)[![](https://img-blog.csdnimg.cn/20181210155938827.jpg)](en/product_documents/m5stack-core/face_kit)
+
+***
+
+<img src='assets/img/product_pics/2.jpg'> <img src='assets/img/product_pics/module.png'>
+
+**Communication Modules**
+
+[![](https://img-blog.csdnimg.cn/20181210163322273.jpg)](en/product_documents/modules/module_gps)[![](https://img-blog.csdnimg.cn/20181210163333682.jpg)](en/product_documents/modules/module_lora)[![](https://img-blog.csdnimg.cn/20181210163345680.jpg)](en/product_documents/modules/module_sim800)[![](https://img-blog.csdnimg.cn/20181210163357400.jpg)](en/product_documents/modules/module_commu)[![](https://img-blog.csdnimg.cn/20181212111936228.jpg)](en/product_documents/modules/module_usb)
+
+**Expansion Modules**
+
+[![](https://img-blog.csdnimg.cn/20181210163430353.jpg)](en/product_documents/modules/module_battery)[![](https://img-blog.csdnimg.cn/20181210163857125.jpg)](en/product_documents/modules/module_proto)[![](https://img-blog.csdnimg.cn/20181212110809815.png)](en/product_documents/modules/module_plus)
+
+**Drive Modules**
+
+[![](https://img-blog.csdnimg.cn/20181210163555583.jpg)](en/product_documents/modules/module_stepmotor)[![](https://img-blog.csdnimg.cn/20181210163610300.jpg)](en/product_documents/modules/module_servo)[![](https://img-blog.csdnimg.cn/2018121211200138.jpg)](en/product_documents/modules/module_lego+)
+
+***
+
+<img src='assets/img/product_pics/3.jpg'> <img src='assets/img/product_pics/unit.png'>
+
+**Input/Sensing Unit**
+
+[![](https://img-blog.csdnimg.cn/20181211173622546.png)](en/product_documents/units/unit_env)[![](https://img-blog.csdnimg.cn/20181211174001353.png)](en/product_documents/units/unit_ir)[![](https://img-blog.csdnimg.cn/20181211174020278.png)](en/product_documents/units/unit_pir)[![](https://img-blog.csdnimg.cn/20181211174328827.png)](en/product_documents/units/unit_angle)[![](https://img-blog.csdnimg.cn/20181211174313215.png)](en/product_documents/units/unit_adc)
+
+[![](https://img-blog.csdnimg.cn/20181211175208695.png)](en/product_documents/units/unit_dac)[![](https://img-blog.csdnimg.cn/20181211174349287.png)](en/product_documents/units/unit_button)[![](https://img-blog.csdnimg.cn/20181211175218426.png)](en/product_documents/units/unit_dual_button)
+
+**Output/Controlling Unit**
+
+[![](https://img-blog.csdnimg.cn/20181211174047354.png)](en/product_documents/units/unit_rgb)[![](https://img-blog.csdnimg.cn/20181211174057301.png)](en/product_documents/units/unit_relay)[![](https://img-blog.csdnimg.cn/20181211174111764.png)](en/product_documents/units/unit_neopixel)
+
+**Interface Unit**
+
+[![](https://img-blog.csdnimg.cn/20181211174142806.png)](en/product_documents/units/unit_hub)[![](https://img-blog.csdnimg.cn/20181211174154240.png)](en/product_documents/units/unit_396port)
+
+<!-- | M5Core        | MiniCore      |
 | :----------:  |:------------: |
 | [BASIC](en/product_documents/m5stack-core/m5core_basic)         | [Stick](en/product_documents/m5stack-core/minicore_stick)         |
 | [GRAY](en/product_documents/m5stack-core/m5core_gray)          | /            |
@@ -73,4 +119,4 @@

 <img src='assets/img/product_pics/6.jpg'> <img src='assets/img/product_pics/tool.png'>

-* [M5Stack USB Downloader](en/product_documents/tools/tool_usb_downloader)
+* [M5Stack USB Downloader](en/product_documents/tools/tool_usb_downloader) -->
@@ -1,39 +1,53 @@
 # M5Core BASIC

-[中文](/zh_CN/product_documents/m5stack-core/m5core_basic) | English | [日本語](ja/product_documents/m5stack-core/m5core_basic)
+<img src="assets/img/product_pics/core/basic/basic_02.jpg" alt="basic_02" width="250" height="250"> <img src="assets/img/product_pics/core/basic/basic_03.jpg" alt="basic_03" width="250" height="250"> <img src="assets/img/product_pics/core/basic/basic_04.jpg" alt="basic_04" width="65%" height="65%">

-## DESCRIPTION
+* * *

-The M5Stack **<mark>BASIC</mark>** is a black development kit based on <mark>ESP32</mark> chip composed of a black M5Core and a Bottom Base board. You can even program The M5Stack BASIC through Blockly, Arduino or MicroPython. The black core is a basic kit and **it does not own any MEMS chip(like MPU9250...)**.
+:memo:**[Description](#Description)**|:bulb:**[Quick Start](en/quick_start/m5core/m5stack_core_quick_start)**|:octocat:**[Example](https://github.com/m5stack/M5Stack/tree/master/examples/Basics)** | :electric_plug:**[Schematic](https://github.com/m5stack/M5-3D_and_PCB/blob/master/M5_Core_SCH%2820171206%29.pdf)** | 🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Stock-Offer-ESP32-Basic-Core-Development-Kit-Extensible-Micro-Control-Wifi-BLE-IoT-Prototype/3226069_32837164440.html?spm=2114.12010615.8148356.2.3b9b2de96y27jH)**:clapper:**[Related Video](#Related-Video)**
+
+## Description
+
+**The M5Stack BASIC** is a black development kit based on **ESP32** chip composed of a black M5Core and a Bottom Base board. You can even program The M5Stack BASIC through Blockly, Arduino or MicroPython. The black core is a basic kit and **it does not own any MEMS chip(like MPU9250...)**.

 The a Bottom board on the back of M5Core. It's designed for expanding gpio on M-Bus besides I2S Pins(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34)for DIY. Each gpio on M-Bus is expanded as pin and port for convenience and flexibility.

-## FEATURES
+## Feature

-  Programming Support
-  Arduino
-  ESP-IDF
-  MicroPython
-  TF Card Support
+-  Programming Support: [UiFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/) and [Arduino](http://www.arduino.cc)
+-  TF Card Support(Up to 16GB)

-## PARAMETER
+## Source PinMap

-| Source        | Parameter      |
-| :----------:  |:------------: |
-| <mark>ESP32</mark>         | 240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth         |
-| Flash          | 4M-Bytes            |
-| Input          | 5V @ 500mA            |
-| Interface          | TypeC x 1, GROVE(I2C+I/0+UART) x 1            |
-| LCD          | 2 inch, 320x240 Colorful TFT LCD, ILI9342            |
-| Speaker          | 1W-0928            |
-| Battery          | 150mAh @ 3.7V, inside  vb            |
-| Op.Temp.          | 32°F to 104°F ( 0°C to 40°C )            |
-| Size          | 54 x 54 x 12.5 mm            |
-| C.A.S.E          | Plastic ( PC )            |
-| Weight          | 120g with bottom, 100g only core            |
+*We have several kinds of M5Cores, There is [their difference in schematic](https://github.com/m5stack/M5-Schematic/blob/master/Core/hardware_diff_between_m5cores.md).*

+**LCD & TF Card**

-## PinMap
+*LCD Resolution: 320x240*
+
+<table>
+ <tr><td>ESP32 Chip</td><td>GPIO23</td><td>GPIO19</td><td>GPIO18</td><td>GPIO14</td><td>GPIO27</td><td>GPIO33</td><td>GPIO32</td><td>GPIO4</td></tr>
+ <tr><td>ILI9341</td><td>/</td><td>MISO</td><td>CLK</td><td>CS</td><td>DC</td><td>RST</td><td>BL</td><td> </td></tr>
+ <tr><td>TF Card</td><td>MOSI</td><td>MISO</td><td>CLK</td><td> </td><td> </td><td> </td><td> </td><td>CS</td></tr>
+
+</table>
+
+**Button & Speaker**
+
+<table>
+ <tr><td>ESP32 Chip</td><td>GPIO39</td><td>GPIO38</td><td>GPIO37</td><td>GPIO25</td></tr>
+ <tr><td>Button Pin</td><td>BUTTON A</td><td>BUTTON B</td><td>BUTTON C</td></tr>
+ <tr><td>Speaker</td><td> </td><td> </td><td> </td><td>Speaker Pin</td></tr>
+</table>
+
+**GROVE A**
+
+<table>
+ <tr><td>ESP32 Chip</td><td>GPIO22</td><td>GPIO21</td></tr>
+ <tr><td>GROVE A</td><td>SCL</td><td>SDA</td></tr>
+</table>
+
+<!-- ## PinMap

 **Speak**

@@ -82,42 +96,97 @@ The a Bottom board on the back of M5Core. It's designed for expanding gpio on M-
 **M-Bus**

 <figure>
-  <img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="300" height="300">
-</figure>
+  <!-- <img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="300" height="231">
+  <img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="400" height="308"> -->
+  <!-- <img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="500" height="385">
+</figure> -->

-## INCLUDES
+## Parameter
+
+<!-- | Source        | Parameter      |
+| :----------:  |:------------: |
+| <mark>ESP32</mark>         | 240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth         |
+| Flash          | 4M-Bytes            |
+| Input          | 5V @ 500mA            |
+| Interface          | TypeC x 1, GROVE(I2C+I/0+UART) x 1            |
+| LCD          | 2 inch, 320x240 Colorful TFT LCD, ILI9342            |
+| Speaker          | 1W-0928            |
+| Battery          | 150mAh @ 3.7V, inside  vb            |
+| Op.Temp.          | 32°F to 104°F ( 0°C to 40°C )            |
+| Size          | 54 x 54 x 12.5 mm            |
+| C.A.S.E          | Plastic ( PC )            |
+| Weight          | 120g with bottom, 100g only core            | -->
+
+<table>
+   <tr style="font-weight:bold">
+      <td>Source</td>
+      <td>Parameter</td>
+   </tr>
+   <tr>
+      <td>ESP32</td>
+      <td>240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth</td>
+   </tr>
+   <tr>
+      <td>Flash</td>
+      <td>4M-Bytes</td>
+   </tr>
+   <tr>
+      <td>Input</td>
+      <td>5V @ 500mA</td>
+   </tr>
+   <tr>
+      <td>Interface</td>
+      <td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
+   </tr>
+   <tr>
+      <td>LCD</td>
+      <td>2 inch, 320x240 Colorful TFT LCD, ILI9342</td>
+   </tr>
+   <tr>
+      <td>Speaker</td>
+      <td>1W-0928</td>
+   </tr>
+   <tr>
+      <td>Battery</td>
+      <td>150mAh @ 3.7V</td>
+   </tr>
+   <tr>
+      <td>Op.Temp.</td>
+      <td>32°F to 104°F ( 0°C to 40°C )</td>
+   </tr>
+   <tr>
+      <td>Size</td>
+      <td>54 x 54 x 12.5 mm</td>
+   </tr>
+   <tr>
+      <td>C.A.S.E</td>
+      <td>Plastic ( PC )</td>
+   </tr>
+   <tr>
+      <td>Weight</td>
+      <td>120g with bottom, 100g only core</td>
+   </tr>
+</table>
+
+## Include

 -  1x M5Stack BASIC
 -  1x M5Stack BASIC Bottom
 -  Type-C USB Cable
 -  User Manual

-## DOCUMENTS
+<img src="assets/img/product_pics/core/basic/basic_06.jpg" alt="basic_06" width="250" height="250"> <img src="assets/img/product_pics/core/basic/basic_07.jpg" alt="basic_07" width="250" height="250">

-  **[Schematic](https://github.com/m5stack/M5-3D_and_PCB/blob/master/M5_Core_SCH%2820171206%29.pdf)**
+<img src="assets/img/product_pics/core/basic/basic_08.jpg" alt="basic_08" width="250" height="250"> <img src="assets/img/product_pics/core/basic/basic_09.jpg" alt="basic_09" width="250" height="250">

-  **Example** - [Arduino Example](https://github.com/m5stack/M5Stack/tree/master/examples)
+<img src="assets/img/product_pics/core/basic/basic_10.jpg" alt="basic_10" width="50%" height="50%">
+
+## Related Link

 -  **Datasheet** - [ESP32](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_cn.pdf)

-  **<mark>Quick Start</mark>**
-  - Arduino - [MacOS](/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) - [Windows_64](/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows)
-  - [MicroPython](/en/quick_start/m5core/m5stack_core_get_started_MicroPython)
+## Related Video

- **[The difference between M5Cores](https://github.com/m5stack/M5-Schematic/blob/master/Core/hardware_diff_between_m5cores.md)**
+- **m5stack's instroduce**

-<figure>
-  <img src="assets/img/product_pics/core/basic/basic_01.jpg" alt="basic_01" width="500px" height="500px">
-</figure>
-<figure>
-  <img src="assets/img/product_pics/core/basic/basic_02.jpg" alt="basic_02" width="500px" height="500px">
-</figure>
-<figure>
-  <img src="assets/img/product_pics/core/basic/basic_03.jpg" alt="basic_03" width="500px" height="500px">
-</figure>
-<figure>
-  <img src="assets/img/product_pics/core/basic/basic_04.jpg" alt="basic_04" width="65%" height="65%">
-</figure>
-<figure>
-  <img src="assets/img/product_pics/core/basic/basic_05.jpg" alt="basic_05" width="65%" height="65%">
-</figure>
+<iframe width="560" height="315" src="https://www.youtube.com/embed/W5ZfDCBc1lk" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
@@ -1,24 +1,21 @@
-# M5Core GRAY
+# 灰色升级版M5Core

-[中文](/zh_CN/product_documents/m5stack-core/m5core_gray) | English | [日本語](ja/product_documents/m5stack-core/m5core_gray)
+:octocat:**[Example](https://github.com/m5stack/M5Stack/tree/master/examples/Basics)** | :bulb:**[Quick Start](en/quick_start/m5core/m5stack_core_quick_start)** | :electric_plug:**[Schematic](https://github.com/m5stack/M5-3D_and_PCB/blob/master/M5_Core_SCH%2820171206%29.pdf)** | 🛒**[Purchase](https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-1172588101.23.f64c4476tugBw5&id=559226082388)**|**[M-Bus](#mbus)**

-## DESCRIPTION
+## Description

-The M5Core **<mark>GRAY</mark>** is a development kit based on <mark>ESP32</mark> chip composed of a gray M5Core and a Bottom Base board. You can even program The M5Core GRAY through Blockly, Arduino or MicroPython.
+**M5Core GRAY** is a development kit based on ESP32 chip composed of a gray M5Core and a Bottom Base board. You can even program The M5Core GRAY through Blockly, Arduino or MicroPython.

-The M5Core GRAY equips the ESP32 with everything necessary to program, run and develop on the wonderchip. It also features a MEMS Chip(**MPU9250**), and a TFT LCD, so you can create a 3D remote gesture controller, a simple "Leap Motion" via M5Core GRAY in a day in stead of couple weeks and so on.
+The M5Core GRAY equips the ESP32 with everything necessary to program, run and develop on the wonderchip. It also features a MEMS Chip(**MPU9250**), and a TF  `T LCD, so you can create a 3D remote gesture controller, a simple "Leap Motion" via M5Core GRAY in a day in stead of couple weeks and so on.

 The a Bottom board on the back of M5Core. It's designed for expanding gpio on M-Bus besides I2S Pins(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34)for DIY. Each gpio on M-Bus is expanded as pin and port for convenience and flexibility.

-## FEATURES
+## Feature

-  Programming Support
-  Arduino
-  ESP-IDF
-  MicroPython
-  TF Card Support
+-  Programming Support: [UiFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/) and [Arduino](http://www.arduino.cc)
+-  TF Card Support(Up to 16GB)

-## PARAMETER
+## Parameter

 | Source        | Parameter      |
 | :----------:  |:------------: |
@@ -1,14 +1,19 @@
 # Unit ENV

-[中文](/zh_CN/product_documents/units/unit_env) | English | [日本語](ja/product_documents/units/unit_env)
+<img src="assets/img/product_pics/units/M5GO_Unit_env.png" width="30%" height="30%">

-## DESCRIPTION
+***
+
+:memo:**[Description](#Description)**|:octocat:**[Example](Example)**| :electric_plug:**[Schematic](#Schematic)** | 🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Mini-ENV-Unit-with-DHT12-BMP280-Digital-DHT-12-Temperature-Humidity-Aire-Pressure-Sensor/3226069_32933115893.html?spm=2114.12010615.8148356.2.758c5bcbURtQtR)**
+
+
+## Description

 <mark>ENV</mark> is a environment sensor for M5GO that can easily detect
 temperature, humidity and air pressure with M5GO Core, including
-temperature and humidity sensor and absolute barometric pressure sensor.
+temperature and humidity sensor and absolute barometric pressure sensor. Connect to GRVE A of M5Core.

-## FEATURES
+## Features

 -  Temperature:
 -  measuring range: 20 ~ 60℃
@@ -22,11 +27,26 @@ temperature and humidity sensor and absolute barometric pressure sensor.
 -  GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc)
 -  Two Lego installation holes

-## DOCUMENTS
+## Example

-<!-- - **[Example](en/file_to_display_null)** -->
- **[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Mini-ENV-Unit-with-DHT12-BMP280-Digital-DHT-12-Temperature-Humidity-Aire-Pressure-Sensor/3226069_32933115893.html?spm=a2g1y.12024536.productList_5885013.subject_22)**
+```c++
+DHT12 dht12; //new a object
+Adafruit_BMP280 bme;

-<figure>
-    <img src="assets/img/product_pics/units/M5GO_Unit_env.png">
-</figure>
+float tmp = dht12.readTemperature();//temperature
+float hum = dht12.readHumidity();//humidity
+float pressure = bme.readPressure();//pressure
+```
+
+Click [here]((https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Units/ENV)。) for Specific example.
+
+## Schematic
+
+<img src="assets/img/product_pics/units/env_sch.jpg">
+
+### PinMap
+
+<table>
+ <tr><td>M5Core(GROVE A)</td><td>GPIO22</td><td>GPIO21</td></tr>
+ <tr><td>ENV Unit</td><td>SCL</td><td>SDA</td></tr>
+</table>
@@ -1,6 +1,6 @@
 # Unit relay

-[中文](/zh_CN/product_documents/units/unit_relay) | English | [日本語](ja/product_documents/units/unit_relay)
+[Example](#example)

 ## DESCRIPTION

@@ -25,6 +25,46 @@ Only a low electrial level is sent to this unit, the relay will be close and the
 - **[Schematic](https://github.com/m5stack/M5-Schematic/blob/master/Units/UNIT_RELAY.pdf)**
 -  **[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-Mini-Relay-Unit-DC-3A-30V-AC-3A-220V-with-Triode-Driven-GROVE-Port/3226069_32922856211.html?spm=a2g1y.12024536.productList_5885013.subject_24)**

+
+<span id = "example"></span>
+
+*Example*
+
+<!-- tabs:start -->
+
+#### ** Arduino Code**
+
+```c++
+#include <M5Stack.h>
+
+void setup() {
+  M5.begin();
+  M5.Lcd.clear(BLACK);
+  M5.Lcd.setTextFont(4);
+  M5.Lcd.setTextColor(YELLOW, BLACK);
+  //disable the speak noise
+  dacWrite(25, 0);
+  pinMode(26, OUTPUT);
+}
+
+void loop(void) {
+  digitalWrite(26, HIGH);
+  delay(500);
+  digitalWrite(26, LOW);
+  delay(500);
+}
+```
+
+#### ** MicroPython Code **
+
+Coming soom...
+
+#### ** UIFlow **
+
+Coming soom...
+
+<!-- tabs:end -->
+
 <figure>
    <img src="assets/img/product_pics/units/M5GO_Unit_relay.png" height="300" width="300">
 </figure>
@@ -10,7 +10,7 @@

 1. [Setting Environment](#setting-environment)

-    - [Step1. Download Arduino-ESP32 Support](#step1-download-arduino-esp32-suppord)
+    - [Step1. Download Arduino-ESP32 Support](#step1-download-arduino-esp32-support)

    - [Step2. Download the M5Stack Lib](#step2-download-the-m5stack-lib)

@@ -18,7 +18,7 @@

 ## 1. Setting Environment

-#### (*Only two steps to complete setting*)
+*(Only two steps to complete setting)*

 ### Step1. Download Arduino-ESP32 Support

--- a/Show More
+++ b/Show More