Merge branch 'dev-watson'

This commit is contained in:
LiHuashen
2018-11-30 15:07:05 +08:00
22 changed files with 228 additions and 66 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 474 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

+2 -2
View File
@@ -2,7 +2,7 @@
[中文](zh_CN/product_documents) | English | [日本語](ja/product_documents)
*The `Quick Start` section of each product is placed in the corresponding product document.*
?> The `Quick Start` section of each product is placed in the corresponding product document.
<img src='assets/img/product_pics/1.jpg'> <img src='assets/img/product_pics/cores.png'>
@@ -42,7 +42,7 @@
| | | |
| :------------------: |:------------------:| :--------------------:|
| [LEGO-CABLE](en/product_documents/accessories/cables/accessory_lego_cable) | [FRAME](en/product_documents/accessories/frame) | / |
| [LEGO-CABLE](en/product_documents/accessories/cables/lego_cable) | [FRAME](en/product_documents/accessories/frame) | / |
<img src='assets/img/product_pics/3.jpg'> <img src='assets/img/product_pics/unit.png'>
@@ -1,3 +0,0 @@
# LEGO Cable
## (coming soom...)
@@ -0,0 +1,20 @@
# LEGO Cable
[中文](/zh_CN/product_documents/accessories/lego_cable) | English | [日本語](ja/product_documents/accessories/lego_cable)
## DESCRIPTION
<mark>LEGO Cable</mark>is designed for connecting GRVOE interface and LEGO, particularly, using for connecting M5Core and LEGO.
## FEATURES
- 3 specifications: 10cm, 20cm, 30cm
## DOCUMENTS
<!-- - **[Example](en/file_to_display_null)** -->
- **[Purchase](https://www.aliexpress.com/store/product/M5Stack-M5Bala-ESP32-6Pin-10-20/3226069_32923086380.html)**
<figure>
<img src="assets/img/product_pics/accessories/lego_cable_01.jpg" alt="lego_cable_01" width="300px" height="300px">
</figure>
+22 -1
View File
@@ -1,3 +1,24 @@
# Frame
## (coming soom...)
[中文](zh_CN/product_documents/accessories/frame) | English | [日本語](ja/product_documents/accessories/frame)
## DESCRIPTION
<mark>Frame</mark>is designed as a fixed frame for M5Core.
## DOCUMENTS
- [Purchase](https://www.aliexpress.com/store/product/M5Stack-2/3226069_32874948519.html)
<figure>
<img src="assets/img/product_pics/accessories/frame_01.jpg" alt="frame_01" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_02.jpg" alt="frame_02" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_03.jpg" alt="frame_03" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_04.jpg" alt="frame_04" width="300px" height="300px">
</figure>
+57 -2
View File
@@ -1,3 +1,58 @@
# LAN
# LAN Base
## (coming soon...)
[中文](/en/product_documents/bases/lan_base) | English| [日本語](ja/product_documents/bases/lan_base)
## DESCRIPTION
<mark>LAN Base</mark> is base built in W5500 chip which designed for meeting the demand of wired network. If your project only can access network through network cable, LAN Base is fit.
In addition, if you want to communicate with LAN through RS485, we also supply a adapter for converting TLL to RS485.
## PinMap
**W5500**
| W5500 | ESP32 Chip |
| :----------: |:------------: |
| MOSI | GPIO23 |
| MISO | GPIO19 |
| CLK | GPIO18 |
| CS | GPIO26 |
| RST | GPIO13 |
| INTn | GPIO34 |
**M-Bus**
<figure>
<img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="500" height="500">
</figure>
## FEATURES
- Input Supply Voltage: 9-24V
- HT3.96 port for supporting RS485
- Easy to fixed on the wall
## DOCUMENTS
- **[Schematic](https://github.com/m5stack/M5GO/blob/master/hardware/schematics/M5GO_Base.pdf)**
- **[Example](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/W5500)**
- **[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)**
<figure>
<img src="assets/img/product_pics/bases/lan_01.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_02.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_03.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_04.png" width="65%" height="65%">
</figure>
@@ -55,9 +55,9 @@ The ESP32Cam equips the ESP32 with everything necessary to program, run and deve
- [ESP32Cam purchase (AliExpress)](https://www.aliexpress.com/store/product/M5Stack-Official-ESP32-Camera-Module-Development-Board-OV2640-Camera-Type-C-Grove-Port-3D-Wifi-Antenna/3226069_32881414545.html)
<figure>
<img src="assets/img/product_pics/units/m5camera.jpg">
<img src="assets/img/product_pics/units/esp32cam.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_02.jpg">
<img src="assets/img/product_pics/units/esp32cam_02.jpg">
</figure>
@@ -12,39 +12,28 @@
### 1. Download M5Burner
For downloading M5Burner, visit the [offical website](http://www.m5stack.com) please.
For downloading M5Burner, visit the [M5Stack Website](http://www.m5stack.com) please.
<figure class="thumbnails">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/download_M5Burner.png" alt="Screenshot of coverpage" title="Cover page">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/download_M5Burner.png">
</figure>
### 2. Burn the firmware
Unzip the M5Burner tool which you donwloaded for official website just now, then double click `M5Burner.exe`.
<figure class="thumbnails">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_01.png" alt="Screenshot of coverpage" title="Cover page">
</figure>
**Then choice the `serial port` which is connected with your board and the `Baud` which is 921600 following below steps. Choice a right firmware, click `Erase` and then click `Burn`.**
**Then choice the `serial port` which is connected with your board and the `Baud` which is 921600 following below steps.**
?> **Tip** **a.** If you want to program with [M5Flow](http://flow.m5stack.com)(/[M5Cloud](http://cloud.m5stack.com)), select `M5Flow-vx.x`(/`M5Cloud-vx.x.x`) option(the lastest version). **b.** If you own a ESP32CAM (/ M5CAMERA), select `M5Cam-vx.x (/M5Cam-psram)` option
<figure class="thumbnails">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_02.png" alt="Screenshot of coverpage" title="Cover page">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_flow_firmware.gif">
</figure>
!> **Notice** If it does not display any ``COMx`` port or only ``COM1`` exists at the option, you need to visit this article [establish_serial_connection](/en/related_documents/establish_serial_connection) and reinstall the USB driver.
**a. Choice a right firmware**
a. select `M5Flow-vx.x` option(the lastest version), if you want to program with [M5Flow](http://flow.m5stack.com)
b. select `M5Cam-vx.x (/M5Cam-psram)` option, if you own a ESP32CAM (/ M5CAMERA)
**b. Click `Erase`**
<figure class="thumbnails">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_06.png" alt="Screenshot of coverpage" title="Cover page">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_01.png" alt="Screenshot of coverpage" title="Cover page">
</figure>
*If M5Burner shows the information `Hard resetting via RTS pin...` below, it means chip has been erased successfully.*
@@ -53,12 +42,6 @@ b. select `M5Cam-vx.x (/M5Cam-psram)` option, if you own a ESP32CAM (/ M5CAMERA)
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_04.png" alt="Screenshot of coverpage" title="Cover page">
</figure>
**c. Click `Burn`**
<figure class="thumbnails">
<img src="assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_03.png" alt="Screenshot of coverpage" title="Cover page">
</figure>
*If M5Burner shows the information `Leaving... Staying in bootloader.` below, it means chip has been burnt successfully.*
<figure class="thumbnails">
+2 -2
View File
@@ -44,8 +44,8 @@
| | | |
|:---:|:---:|:---:|
| [LEGO-CABLE](ja/product_documents/accessories/cables/accessory_lego_cable) | [FRAME](ja/product_documents/accessories/frame) | [Headers Socket](ja/product_documents/accessories/headers_socket) |
| [GROVE-CABLE](ja/product_documents/accessories/cables/accessory_grove_cable) | [USB-TTL UART Serial Adapter](ja/product_documents/accessories/usb_uart_adapter) | / |
| [LEGO-CABLE](ja/product_documents/accessories/cables/lego_cable) | [FRAME](ja/product_documents/accessories/frame) | [Headers Socket](ja/product_documents/accessories/headers_socket) |
| [GROVE-CABLE](ja/product_documents/accessories/cables/grove_cable) | [USB-TTL UART Serial Adapter](ja/product_documents/accessories/usb_uart_adapter) | / |
<!-- ## ユニット -->
@@ -1,5 +1,7 @@
# LEGO-CABLE
[中文](zh_CN/product_documents/accessories/lego_cable) | [English](en/product_documents/accessories/lego_cable) | 日本語
## 概要
(近日公開...)
@@ -1,5 +1,7 @@
# FRAME
[中文](zh_CN/product_documents/accessories/frame) | [English](en/product_documents/accessories/frame) | 日本語
## 概要
(近日公開...)
+3 -1
View File
@@ -1,5 +1,7 @@
# LAN ベース
[中文](zh_CN/product_documents/bases/lan_base) | [English](/en/product_documents/bases/lan_base) | 日本語
## 概要
**<mark>LAN</mark>**ベースはI2Cとユーザ定義の6ピンポートによってイーサネット通信が可能なベースです。
@@ -32,7 +34,7 @@ M5Stackの無線通信が遅かったり、無線ネットワークに繋がら
- [M5Stack](https://m5stack.com)
- **サンプルコード**
- [Arduino](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/W5500)
- [Example](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/W5500)
- **データシート**
- [W5500](https://cdn.sparkfun.com/datasheets/Dev/Arduino/Shields/W5500_datasheet_v1.0.2_1.pdf)
+2 -2
View File
@@ -2,7 +2,7 @@
中文 | [English](/en/product_documents) | [日本語](ja/product_documents)
*每个产品的`快速上手(Quick Start)`部分都放置在了该产品的介绍文档里。*
?> 每个产品的`快速上手(Quick Start)`部分都放置在了该产品的介绍文档里。
<img src='assets/img/product_pics/1.jpg'> <img src='assets/img/product_pics/cores.png'>
@@ -41,7 +41,7 @@
| | | |
| :------------------: |:------------------:| :--------------------:|
| [LEGO-CABLE](zh_CN/product_documents/accessories/cables/accessory_lego_cable) | [FRAME](zh_CN/product_documents/accessories/frame) | / |
| [LEGO-CABLE](zh_CN/product_documents/accessories/cables/lego_cable) | [FRAME](zh_CN/product_documents/accessories/frame) | / |
<img src='assets/img/product_pics/3.jpg'> <img src='assets/img/product_pics/unit.png'>
@@ -1,3 +0,0 @@
# LEGO Cable
## (敬请期待...)
@@ -0,0 +1,20 @@
# LEGO Cable
中文 | [English](en/product_documents/accessories/lego_cable) | [日本語](ja/product_documents/accessories/lego_cable)
## 描述
<mark>LEGO Cable</mark>专门设计用来连接GRVE接口和乐高机器人组件,特别是用来连接M5Core与乐高机器人组件。
## 特性
- 3种规格: 10cm, 20cm, 30cm
## 相关链接
<!-- - **[Example](en/file_to_display_null)** -->
- **[购买链接](https://www.aliexpress.com/store/product/M5Stack-M5Bala-ESP32-6Pin-10-20/3226069_32923086380.html)**
<figure>
<img src="assets/img/product_pics/accessories/lego_cable_01.jpg" alt="lego_cable_01" width="300px" height="300px">
</figure>
@@ -1,3 +1,24 @@
# Frame - 5x5的M5外框
## (敬请期待...)
中文 | [English](en/product_documents/accessories/frame) | [日本語](ja/product_documents/accessories/frame)
## 描述
<mark>Frame</mark>专门设计用来做M5Core的固定框架。
## 相关链接
- [购买链接](https://www.aliexpress.com/store/product/M5Stack-2/3226069_32874948519.html)
<figure>
<img src="assets/img/product_pics/accessories/frame_01.jpg" alt="frame_01" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_02.jpg" alt="frame_02" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_03.jpg" alt="frame_03" width="300px" height="300px">
</figure>
<figure>
<img src="assets/img/product_pics/accessories/frame_04.jpg" alt="frame_04" width="300px" height="300px">
</figure>
+59 -2
View File
@@ -1,3 +1,60 @@
# LAN
# LAN底座
## (coming soon...)
中文 | [English](/en/product_documents/bases/lan_base) | [日本語](ja/product_documents/bases/lan_base)
## 描述
<mark>LAN底座</mark>是集成了以太网芯片W5500的底座,目的是提供给有让M5Core接入有线网络需求的用户。因为M5Core集成了无线WIFI,能接收无线热点的网络,可是没有网络接口,如果你需要让M5Core接入有线网络来工作的话,这个LAN底座正好合适,而且LAN底座还配备了磁铁和滑动杆,方便你装置LAN和M5Core到壁面上。
另外LAN底座还有橙色HT3.96端子,这个接口还没有电气连接,它连接不同Pin脚的时候,可以实现对应的Pin拓展。如果你需要这个接口变成RS485的拓展接口的话,那么使用配套的排针和TLL转RS485功能小板子焊接到LAN底座上面,即可实现RS485接口,从而可以通过这个HT3.96端子,通过RS485协议控制M5Core的整个功能。
如果TLL转RS485的功能小板子与LAN底板结合的话,小板子上的串口引脚将与LAN底板的GPIO1、GPIO3(UART0)连接。
## 管脚映射
**W5500以太网芯片**
| W5500 | ESP32 Chip |
| :----------: |:------------: |
| MOSI | GPIO23 |
| MISO | GPIO19 |
| CLK | GPIO18 |
| CS | GPIO26 |
| RST | GPIO13 |
| INTn | GPIO34 |
**M-Bus**
<figure>
<img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="500" height="500">
</figure>
## 特性
- 允许9-24V范围的电源输入
- 3.96规格端子,可以自定义引脚
- 易于固件到墙上,方便装配
## 相关链接
- **[原理图](https://github.com/m5stack/M5GO/blob/master/hardware/schematics/M5GO_Base.pdf)**
- [例程](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/W5500)
- **[M5GO IOT Starter Kit购买链接](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)**
<figure>
<img src="assets/img/product_pics/bases/lan_01.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_02.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_03.jpg" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/lan_04.png" width="65%" height="65%">
</figure>

Some files were not shown because too many files have changed in this diff Show More