diff --git a/docs/assets/img/product_pics/core/m5go/m5go_02.jpg b/docs/assets/img/product_pics/core/m5go/m5go_02.jpg new file mode 100644 index 00000000..d1b28326 Binary files /dev/null and b/docs/assets/img/product_pics/core/m5go/m5go_02.jpg differ diff --git a/docs/assets/img/product_pics/core/m5go/m5go_02.webp b/docs/assets/img/product_pics/core/m5go/m5go_02.webp deleted file mode 100644 index 76223f33..00000000 Binary files a/docs/assets/img/product_pics/core/m5go/m5go_02.webp and /dev/null differ diff --git a/docs/assets/img/product_pics/module/module_plus_01.jpg b/docs/assets/img/product_pics/module/module_plus_01.jpg new file mode 100644 index 00000000..9b67d7e4 Binary files /dev/null and b/docs/assets/img/product_pics/module/module_plus_01.jpg differ diff --git a/docs/assets/img/product_pics/module/module_plus_01.png b/docs/assets/img/product_pics/module/module_plus_01.png deleted file mode 100644 index 18530e9d..00000000 Binary files a/docs/assets/img/product_pics/module/module_plus_01.png and /dev/null differ diff --git a/docs/en/app/bala.md b/docs/en/app/bala.md index ac26fb7e..ef3cd6f5 100644 --- a/docs/en/app/bala.md +++ b/docs/en/app/bala.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Application BALA
SKU:K014
diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index fcb904da..76f5ac57 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -93,12 +93,8 @@ M5Stack Basic is consist with two separable parts. the upside part has all kinds 32°F to 104°F ( 0°C to 40°C ) - Host size - 54 x 54 x 12.5 mm - - - Basic bottom size - 54 x 54 x 5.4 mm + size + 54 x 54 x 17.9 mm Case Material @@ -136,6 +132,8 @@ M5Stack Basic is consist with two separable parts. the upside part has all kinds ## Peripherals Pin Map +**LCD & TF card** + LCD ：320x240 TF card Maximum size 16GB @@ -177,7 +175,7 @@ TF card Maximum size 16GB -Button & Speaker +**Button & Speaker** @@ -204,7 +202,7 @@ Button & Speaker
-GROVE Port A & IP5306 +**GROVE Port A & IP5306** @@ -357,7 +355,7 @@ For more information about Pin assignment and Pin Remapping, Please refer to [ES ### Arduino IDE -点击[这里](https://github.com/m5stack/M5Stack/tree/master/examples/Basics)获得Arduino示例 +Click[here](https://github.com/m5stack/M5Stack/tree/master/examples/Basics)to get Arduino code ## Video diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md index 1031d8be..861d42c2 100644 --- a/docs/en/core/fire.md +++ b/docs/en/core/fire.md @@ -175,7 +175,7 @@ BMM150 I2C address 0x10
BMM150SCLSDA5VGND
-### M5GO Base Port +## M5GO Base Port **GROVE Port B** @@ -359,6 +359,12 @@ For more information about Pin assignment and Pin Remapping, Please refer to [ES +## Example + +### Arduino IDE + +Click[here](https://github.com/m5stack/M5Stack/tree/master/examples/Basics)to get Arduino code + ## Video **m5stack instroduce** diff --git a/docs/en/core/m5go.md b/docs/en/core/m5go.md index 6c9ed401..e8652650 100644 --- a/docs/en/core/m5go.md +++ b/docs/en/core/m5go.md @@ -2,7 +2,7 @@
SKU:K006
-
+
diff --git a/docs/en/module/plus.md b/docs/en/module/plus.md index 9e9a7cb4..4fcf9fba 100644 --- a/docs/en/module/plus.md +++ b/docs/en/module/plus.md @@ -2,7 +2,7 @@
SKU:M019
-
+
## Description diff --git a/docs/index.md b/docs/index.md index 66b1a428..6d8491fb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -39,7 +39,7 @@ //Expansion Modules {a:"/#/en/module/battery", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_battery_01.webp", p:"BATTERY"}, {a:"/#/en/module/proto", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_proto_01.png", p:"PROTO"}, - {a:"/#/en/module/plus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_plus_01.png", p:"PLUS"}, + {a:"/#/en/module/plus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_plus_01.jpg", p:"PLUS"}, {a:"/#/en/module/usb", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_usb_01.png", p:"USB"}, {a:"/#/en/module/bus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_bus_01.png", p:"BUS"}, {a:"/#/en/module/goplus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_goplus_p1.png", p:"GoPlus"}, @@ -64,7 +64,7 @@ {a:"/#/en/base/btc_base", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_btc_01.png", p:"BTC"}, {a:"/#/en/base/plc_base", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/plc_m12_01.jpg", p:"PLC"}, {a:"/#/en/base/core_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_core_bottom_01.png", p:"Core BOTTOM"}, - {a:"#/en/base/m5go_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_bottom_01.png", p:"M5GO BOTTOM"}, + {a:"#/en/base/m5go_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_base.jpg", p:"M5GO BOTTOM"}, {a:"/#/en/base/m5go_rfid", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_rfid_01.png", p:"M5GO RFID"}, {a:"/#/en/base/m5go_charger", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_base_01.png", p:"M5GO CHARGER"}, {a:"/#/en/base/base15", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_base15_01.jpg", p:"BASE15"}, diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 8ccb781f..7a5876cd 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -40,7 +40,7 @@ //Expansion Modules {a:"/#/zh_CN/module/battery", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_battery_01.webp", p:"BATTERY"}, {a:"/#/zh_CN/module/proto", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_proto_01.png", p:"PROTO"}, - {a:"/#/zh_CN/module/plus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_plus_01.png", p:"PLUS"}, + {a:"/#/zh_CN/module/plus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_plus_01.jpg", p:"PLUS"}, {a:"/#/zh_CN/module/usb", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_usb_01.png", p:"USB"}, {a:"/#/zh_CN/module/bus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_bus_01.png", p:"BUS"}, {a:"/#/zh_CN/module/goplus", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/module_goplus_p1.png", p:"GoPlus"}, @@ -65,7 +65,7 @@ {a:"/#/zh_CN/base/btc_base", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_btc_01.png", p:"BTC"}, {a:"/#/zh_CN/base/plc_base", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/plc_m12_01.jpg", p:"PLC"}, {a:"/#/zh_CN/base/core_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_core_bottom_01.png", p:"Core BOTTOM"}, - {a:"#/zh_CN/base/m5go_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_bottom_01.png", p:"M5GO BOTTOM"}, + {a:"#/zh_CN/base/m5go_bottom", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_base.jpg", p:"M5GO BOTTOM"}, {a:"/#/zh_CN/base/m5go_rfid", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_rfid_01.png", p:"M5GO RFID"}, {a:"/#/zh_CN/base/m5go_charger", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_m5go_base_01.png", p:"M5GO CHARGER"}, {a:"/#/zh_CN/base/base15", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_base15_01.jpg", p:"BASE15"}, diff --git a/docs/zh_CN/core/atom_lite.md b/docs/zh_CN/core/atom_lite.md index f2508a0c..02f8c277 100644 --- a/docs/zh_CN/core/atom_lite.md +++ b/docs/zh_CN/core/atom_lite.md @@ -62,7 +62,7 @@ IR - Infrared transmission x 1 + Infrared transmission 按键 diff --git a/docs/zh_CN/core/atom_matrix.md b/docs/zh_CN/core/atom_matrix.md index 5e0c7d68..8cf67ecd 100644 --- a/docs/zh_CN/core/atom_matrix.md +++ b/docs/zh_CN/core/atom_matrix.md @@ -66,12 +66,12 @@ WS2812B x 25 - 陀螺仪加速计 + MEMS MPU6886 IR - Infrared transmission x 1 + Infrared transmission 按键 diff --git a/docs/zh_CN/core/basic.md b/docs/zh_CN/core/basic.md index 0c99afa4..a19c21f1 100644 --- a/docs/zh_CN/core/basic.md +++ b/docs/zh_CN/core/basic.md @@ -24,7 +24,7 @@ M5Stack Basic 由两个可分离部分堆叠组成. 顶部放置了电路板， - 内置锂电池 - 背部磁吸设计 - 可拓展的引脚与接口 -- M-Bus总线母座 & 引脚 +- M-Bus总线母座 - 开发平台 [UIFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/), [Arduino](http://www.arduino.cc) @@ -97,12 +97,8 @@ M5Stack Basic 由两个可分离部分堆叠组成. 顶部放置了电路板， 32°F to 104°F ( 0°C to 40°C ) - 主机尺寸 - 54 x 54 x 12.5 mm - - - Core底座尺寸 - 54 x 54 x 5.4 mm + 尺寸 + 54 x 54 x 17.9mm 重量 diff --git a/docs/zh_CN/core/face_kit.md b/docs/zh_CN/core/face_kit.md index 93887dd6..0587790b 100644 --- a/docs/zh_CN/core/face_kit.md +++ b/docs/zh_CN/core/face_kit.md @@ -39,21 +39,15 @@ ESPTool烧录游戏教程：https://docs.m5stack.com/#/zh_CN/quick_start/faces/g ## 产品特性 -- 5V 直流电源 -- USB Type-C - 基于 ESP32 开发 -- 16 MByte flash(旧版：4 MByte flash) -- BMM150 + MPU6886 -- 扬声器，按键x3，LCD屏幕（320 * 240），电源/复位按键x1 -- 2.4G天线：Proant 440 +- 内置陀螺仪加速计与磁力计 +- 内置扬声器，按键，LCD屏幕，电源/复位按键x1 - TF卡插槽（最大可拓展16GB） -- 电池总线母座和 600 mAh 锂电池 +- M-BUS总线母座 +- 磁吸式充电设计 +- 内置锂电池 - 可拓展的引脚与接口 -- Grove 接口 -- M-Bus总线母座 & 引脚 - 开发平台 [UIFlow](http://flow.m5stack.com), [MicroPython](http://micropython.org/), [Arduino](http://www.arduino.cc) -- 产品尺寸：58.2mm x 54.2mm x 18.7mm -- 产品重量：264.6g ## 包含 @@ -74,6 +68,80 @@ ESPTool烧录游戏教程：https://docs.m5stack.com/#/zh_CN/quick_start/faces/g - 数据输入外设 - 物联网控制器 +## 规格参数 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
主控资源参数
ESP32-D0WDQ6240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth
Flash16MB(旧版4MB)
输入电压5V @ 500mA
主机接口TypeC x 1, GROVE(I2C+I/0+UART) x 1
Core底座接口PIN (G1，G2，G3，G16, G17, G18, G19, G21, G22, G23, G25, G26, G35, G36)
IPS屏幕2 inch, 320x240 Colorful TFT LCD, ILI9342C
扬声器1W-0928
按键自定义按键 x 3
2.4G天线Proant 440
锂电池600mAh @ 3.7V
MEMSMPU6886+BMM150
2.4G天线Proant 440
工作温度32°F to 104°F ( 0°C to 40°C )
尺寸58.2mm x 54.2mm x 18.7mm
重量264.6g
外壳材质Plastic ( PC )
+ + ## EasyLoader >EasyLoader是一个简洁快速的程序烧录器，其内置了一个产品相关的案例程序，通过简单步骤将其烧录至主控，即可进行一系列的功能验证.**(程序烧录前，请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动)，M5StickC/V/T/ATOM系列可免驱动使用)** @@ -100,84 +168,6 @@ ESPTool烧录游戏教程：https://docs.m5stack.com/#/zh_CN/quick_start/faces/g -### 相关链接 - -- **数据手册** - - - [ESP32](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) - - [MPU6886](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/MPU-6886-000193%2Bv1.1_GHIC_en.pdf) - - [BMM150](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/BMM150_datasheet_en.pdf) - -- **寄存器手册** - - - [IP5306](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/IIC_IP5306_REG_V1.4_cn.pdf) - -**IP5306充/放电，电压参数** - - - - - - - - - - - - - - - - - - - - - - - - - - -
充电 - 放电
0.00 ~ 3.40V -> 0% - 4.20 ~ 4.07V -> 100%
3.40 ~ 3.61V -> 25% - 4.07 ~ 3.81V -> 75%
3.61 ~ 3.88V -> 50% - 3.81 ~ 3.55V -> 50%
3.88 ~ 4.12V -> 75% - 3.55 ~ 3.33V -> 25%
4.12 ~ / -> 100% - 3.33 ~ 0.00V -> 0%
- -## 原理图 - -- [原理图](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/M5-Core-Schematic(20171206).pdf) - -## 版本变更 - -
- - - - - - - - - - - - - - - - - - - - - -
上市日期产品变动
2017.12首次发售
2019.6MPU9250变更为MPU6886+BMM150
2019.7TN屏幕变更为IPS屏幕
-
- ## 管脚映射 **Mega328 ISP**下载接口Pin脚定义 @@ -236,20 +226,93 @@ ESPTool烧录游戏教程：https://docs.m5stack.com/#/zh_CN/quick_start/faces/g +## IP5306充/放电，电压参数 + + + + + + + + + + + + + + + + + + + + + + + + + + +
充电 + 放电
0.00 ~ 3.40V -> 0% + 4.20 ~ 4.07V -> 100%
3.40 ~ 3.61V -> 25% + 4.07 ~ 3.81V -> 75%
3.61 ~ 3.88V -> 50% + 3.81 ~ 3.55V -> 50%
3.88 ~ 4.12V -> 75% + 3.55 ~ 3.33V -> 25%
4.12 ~ / -> 100% + 3.33 ~ 0.00V -> 0%
+ 有关引脚分配和引脚重新映射的更多信息，请参考[ESP32 datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf)
-**注意3：Face Kit 出厂程序**
+**注意：Face Kit 出厂程序**
出厂程序由于没有main.py文件，因此错误信息提示是正常的，并不意味着硬件问题,请放心使用.
+### 相关链接 + +- **Datasheet** + + - [ESP32](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_cn.pdf) + - [MPU6886](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/MPU-6886-000193%2Bv1.1_GHIC_en.pdf) + - [BMM150](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/BMM150_datasheet_en.pdf) + - [IP5306](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/IIC_IP5306_REG_V1.4_cn.pdf) + +## 原理图 + +- [原理图](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/schematic/Core/M5-Core-Schematic(20171206).pdf) + +## 版本变更 + +
+ + + + + + + + + + + + + + + + + + + + + +
上市日期产品变动
2017.12首次发售
2019.6MPU9250变更为MPU6886+BMM150
2019.7TN屏幕变更为IPS屏幕
+
+ ## 案例程序 -- [例程](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/FACES) +### ArduinoIDE +点击[这里](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/FACES)获取Arduino示例 -## 用户作品 -- **[2048 Game with FACES Kit- Video](https://www.youtube.com/watch?v=ccEq0s7dU84)** -- **[2048 Game with FACES Kit- Source Code](https://github.com/phillowcompiler/2048_M5Stack)** \ No newline at end of file