Merge branch 'dev-watson'

This commit is contained in:
Lihuashen
2018-11-28 14:26:07 +08:00
56 changed files with 900 additions and 363 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 532 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 KiB

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

+75 -2
View File
@@ -1,3 +1,76 @@
# M5GO-Base
# M5GO Base
## (coming soon...)
[中文](/zh_CN/product_documents/bases/m5go_base) | English | [日本語](ja/product_documents/bases/m5go_base)
## DESCRIPTION
<mark>M5GO Base</mark>is a base of [M5GO IOT Starter Kit](en/product_documents/m5stack-core/m5go_iot_starter_kit) or [M5Fire](en/product_documents/m5stack-core/m5core_fire).
M5GO Base is composed of battery(600mAh), M-Bus interface, charging indicator(red led), two RGB Bar, PORT B and PORT C.
The charging indicator light will blink when base is charging, but the light will keep on when charge completed.
## PinMap
**POGO Pin**
| POGO Pin | ESP32 Chip |
| :----------: |:------------: |
| SCL | GPIO22 |
| SDA | GPIO21 |
**LED Bar**
*There are 10 RGB Leds built in M5GO Base*
| LED Pin | ESP32 Chip |
| :----------: |:------------: |
| LED Pin | GPIO15 |
**MIC**
| MIC Pin | ESP32 Chip |
| :----------: |:------------: |
| MIC Pin | GPIO34 |
**GROVE**
| PORT A(I2C) | ESP32 Chip |
| :----------: |:------------: |
| SCL | GPIO22 |
| SDA | GPIO21 |
| 5V | 5V |
| GND | GND |
| PORT B(I/O) | ESP32 Chip |
| :----------: |:------------: |
| G36 | GPIO36 |
| G26 | GPIO26 |
| 5V | 5V |
| GND | GND |
| PORT C(UART2) | ESP32 Chip |
| :----------: |:------------: |
| RXD | GPIO16 |
| TXD | GPIO17 |
| 5V | 5V |
| GND | GND |
**M-Bus**
<figure>
<img src="assets/img/product_pics/core/M-BUS.jpg" alt="M_BUS" width="500" height="500">
</figure>
## DOCUMENTS
- **[Schematic](https://github.com/m5stack/M5GO/blob/master/hardware/schematics/M5GO_Base.pdf)**
- **[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/m5go_base_01.png" width="65%" height="65%">
</figure>
<figure>
<img src="assets/img/product_pics/bases/m5go_base_02.png" width="65%" height="65%">
</figure>
@@ -103,7 +103,7 @@ The a Bottom board on the back of M5Core. It's designed for expanding gpio on M-
- **<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)
- **[The difference between M5Cores](https://github.com/m5stack/M5-Schematic/blob/master/Core/hardware_diff_between_m5cores.md)**
<figure>
@@ -1,5 +1,7 @@
# M5Stack BATTERY Module
[中文](/zh_CN/product_documents/modules/module_battery) | English | [日本語](ja/product_documents/modules/module_battery)
# DESCRIPTION
The M5Stack BATTERY Module is module with 850mAh High-Capacity Battery.
@@ -1,5 +1,7 @@
# M5Stack BTC Module
[中文](/zh_CN/product_documents/modules/module_btc) | English | [日本語](ja/product_documents/modules/module_btc)
# DESCRIPTION
The M5Stack BTC Module is a base including DHT12 module which can detect
@@ -18,12 +20,25 @@ Core via Type-C Cable after adding this BTC Module.
- M3 x 16
- Tools
# DOCUMENTS
# PinMap
- [WebSite](https://m5stack.com)
| DHT12 | ESP32 |
| :----------: |:------------:|
| SCL | G22 |
| GND | GND |
| SDA | G21 |
| 3V3 | 3V3 |
<figure>
<img src="assets/img/product_pics/modules/btc_01.png" height="300" width="300">
<img src="assets/img/product_pics/modules/btc_dht12_pinmap.jpg">
</figure>
# DOCUMENTS
- [Example](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/DHT12) (for DHT12)
<figure>
<img src="assets/img/product_pics/modules/btc_01.jpg" height="300" width="300">
</figure>
<figure>
@@ -1,4 +1,6 @@
# COMMU
# COMMU
[中文](/zh_CN/product_documents/modules/module_commu) | English | [日本語](ja/product_documents/modules/module_commu)
## DESCRIPTION
@@ -1,5 +1,7 @@
# M5Stack GPS Module
[中文](/zh_CN/product_documents/modules/module_gps) | English | [日本語](ja/product_documents/modules/module_gps)
## DESCRIPTION
The M5Stack GPS Module is a module with small GPS module. The small GPS
@@ -1,5 +1,7 @@
# M5Stack LAN Module
<!-- [中文](/zh_CN/product_documents/modules/module_btc) | English | [日本語](ja/product_documents/modules/module_btc) -->
## DESCRIPTION
The M5Stack LAN Module is a ethernet module which with a I2C Grove port and 6 pins user ports.
@@ -1,5 +1,7 @@
# M5Stack LORA Module
[中文](/zh_CN/product_documents/modules/module_lora) | English | [日本語](ja/product_documents/modules/module_lora)
## DESCRIPTION
The <mark>LoRa</mark> Module is a module with small LoRa module named Ra-02.
@@ -1,5 +1,7 @@
# LoRaWAN
[中文](/zh_CN/product_documents/modules/module_btc) | English | [日本語](ja/product_documents/modules/module_btc)
## DESCRIPTION
<mark>LoRaWAN</mark> is a small LoRa terminal module built-in LoRa chip(SX1276) and ST MCU that means this module has been built with complete LoRa protocal stack. So you can develop a LoRaWAN module through UART or simple AT command with M5Core.
@@ -11,7 +11,6 @@ like.
- Flexible extended blank circle
- Compatible with all series of M5Stack Core
- A environment detector - DHT12 Module
## Interface
@@ -36,7 +35,6 @@ like.
## INCLUDES
- 1x M5Stack PROTO Module
- 1x DHT12 Temperature & Humidity Sensor
- 1x Bus Socket
- 1x GROVE Cable
- 1x Packing Box
+2 -2
View File
@@ -31,13 +31,13 @@ If you have one of ESP32 development boards listed below, click the correspondin
---|---|---
[M5StackCore](/en/quick_start/m5core/m5stack_core_quick_start) | [M5Camera](/en/quick_start/m5camera/m5camera_quick_start) | [M5BALA](/en/quick_start/bala/bala_quick_start)
## Practice
<!-- ## Practice
**For being familiar with the programming mode you lik, We suggest you following the corresponding option to do more practices.**
<img src="assets/img/getting_started_pics/programming_mode_arduino.png"> | <img src="assets/img/getting_started_pics/programming_mode_blockly.png"> | <img src="assets/img/getting_started_pics/programming_mode_micropython.png">
---|---|---
[Arduino](/en/practice/practice_arduino) | [M5Flow-Blockly](/en/practice/practice_blockly) | [M5Flow-MicroPython](/en/practice/practice_micropython)
[Arduino](/en/practice/practice_arduino) | [M5Flow-Blockly](/en/practice/practice_blockly) | [M5Flow-MicroPython](/en/practice/practice_micropython) -->
## Related Documents

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