From 86d1c8f59eb5ef11c5736d45080ca4b7b8865dcc Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Fri, 9 Aug 2019 11:59:31 +0800 Subject: [PATCH] change M5GO Bottom battery to 500mAh --- docs/en/base/m5go_bottom.md | 2 +- docs/en/core/basic.md | 6 +++--- docs/en/core/face_kit.md | 2 +- docs/en/core/fire.md | 6 +++++- docs/en/core/gray.md | 2 +- docs/en/core/m5go.md | 8 ++++++-- docs/en/core/m5go_lite.md | 8 ++++++-- .../m5core/m5stack_core_get_started_MicroPython.md | 4 ++++ .../m5stick/m5stick_quick_start_with_uiflow.md | 4 ++++ .../m5stickc/m5stickc_quick_start_with_uiflow.md | 4 ++++ docs/en/related_documents/Setting_WIFI.md | 4 ++++ docs/zh_CN/base/m5go_bottom.md | 2 +- docs/zh_CN/core/fire.md | 4 ++-- docs/zh_CN/core/m5go.md | 4 ++-- docs/zh_CN/core/m5go_lite.md | 4 ++-- .../m5core/m5stack_core_get_started_MicroPython.md | 6 +++++- .../m5stick/m5stick_quick_start_with_uiflow.md | 4 ++++ .../m5stickc/m5stickc_quick_start_with_uiflow.md | 4 ++++ docs/zh_CN/related_documents/Setting_WIFI.md | 7 +++++++ 19 files changed, 66 insertions(+), 19 deletions(-) diff --git a/docs/en/base/m5go_bottom.md b/docs/en/base/m5go_bottom.md index 51da0aa0..a58b6860 100644 --- a/docs/en/base/m5go_bottom.md +++ b/docs/en/base/m5go_bottom.md @@ -8,7 +8,7 @@ ## Description -**M5GO BOTTOM** is apparently the bottom part of M5GO which is a upgrade of basic bottoms, with a larger battery, LOGO-compatilble holes, MICPHONE, LED Bar , two more CONNEXT PORT，and more. +**M5GO BOTTOM** is apparently the bottom part of M5GO which is a upgrade of basic bottoms, with a larger battery(500mAh), LOGO-compatilble holes, MICPHONE, LED Bar , two more CONNEXT PORT，and more. **M5GO BOTTOM** is the same Bottom of [M5GO Lite](https://docs.m5stack.com/#/en/core/m5go_lite), [M5GO IoT Kit](https://docs.m5stack.com/#/en/core/m5go) and [M5Fire](https://docs.m5stack.com/#/en/core/fire). diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index 1cd5398a..885f939f 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -19,13 +19,13 @@ M5Stack Basic is consist with two separable parts. the upside part has all kinds -**Notice: +**Notice:** 1)Basic kit have no IMU sensor inside 2)GPIO0, GPIO12, GPIO13, GPIO15, GPIO34, pins that related to I2S are not extended out -3)GPIO34-39 are input-only** +3)GPIO34-39 are input-only -**Notice: ** +**Notice:** The newly-produced M5Core replaces the screen with better display performance and higher viewing angle, so it has some compatibility problems with the old Arduino library. When using the old library for screen driving, it will produce reverse color display. You can open the Arduino. The library management option will upgrade your M5Stack library to the latest version (after 0.2.8) to solve this problem. diff --git a/docs/en/core/face_kit.md b/docs/en/core/face_kit.md index 36352682..07e977ba 100644 --- a/docs/en/core/face_kit.md +++ b/docs/en/core/face_kit.md @@ -51,7 +51,7 @@ Other than 3 functional panels, this development kit comes with more stuff like *For more information on M5Stack series development board, please check the **Gray Kit*** -**Notice: ** +**Notice:** The newly-produced M5Core replaces the screen with better display performance and higher viewing angle, so it has some compatibility problems with the old Arduino library. When using the old library for screen driving, it will produce reverse color display. You can open the Arduino. The library management option will upgrade your M5Stack library to the latest version (after 0.2.8) to solve this problem. diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md index 3cddda8f..43d954f6 100644 --- a/docs/en/core/fire.md +++ b/docs/en/core/fire.md @@ -219,9 +219,13 @@ The GPIO 16 / 17 in Fire is connected to the PSRAM by default, so when you conne Speaker 1W-0928 + + MEMS + BMM150 + SH200Q/MPU6886 + Battery - 600mAh @ 3.7V + 500mAh @ 3.7V Operating Temperature diff --git a/docs/en/core/gray.md b/docs/en/core/gray.md index 0261decd..e5bdfec9 100644 --- a/docs/en/core/gray.md +++ b/docs/en/core/gray.md @@ -23,7 +23,7 @@ Supported development platforms and program languages: Arduino, Blockly language -**Notice: ** +**Notice:** The newly-produced M5Core replaces the screen with better display performance and higher viewing angle, so it has some compatibility problems with the old Arduino library. When using the old library for screen driving, it will produce reverse color display. You can open the Arduino. The library management option will upgrade your M5Stack library to the latest version (after 0.2.8) to solve this problem. diff --git a/docs/en/core/m5go.md b/docs/en/core/m5go.md index 611760a1..3c400bc7 100644 --- a/docs/en/core/m5go.md +++ b/docs/en/core/m5go.md @@ -16,7 +16,7 @@ Every M5stack development kit can be programmed through Arduino IDE, WebIDE UIFl This M5GO kit is specifically designed for STEM education. The pack includes 1 M5GO conroller + 6 M5units + plenty of accessories. Having all those goods, together with the Blockly program platform, allows the school students to explore the engineering world , making their own IoT product and implement brilliant ideas into real life. -**Notice: ** +**Notice:** The newly-produced M5Core replaces the screen with better display performance and higher viewing angle, so it has some compatibility problems with the old Arduino library. When using the old library for screen driving, it will produce reverse color display. You can open the Arduino. The library management option will upgrade your M5Stack library to the latest version (after 0.2.8) to solve this problem. @@ -204,9 +204,13 @@ The newly-produced M5Core replaces the screen with better display performance an Speaker 1W-0928 + + MEMS + BMM150 + MPU6886 + Battery - 600mAh @ 3.7V + 500mAh @ 3.7V Operating Temperature diff --git a/docs/en/core/m5go_lite.md b/docs/en/core/m5go_lite.md index 33a94e15..dcf8aafe 100644 --- a/docs/en/core/m5go_lite.md +++ b/docs/en/core/m5go_lite.md @@ -17,7 +17,7 @@ All M5stack development board can be programmed through Arduino IDE, WebIDE UIFlow, Micropython, and Blockly, simplifying the development process for those requiring a joint hardware and software solution. Not only does M5stack have far-reaching IoT applications in industry, agriculture, and home, but it also empowers students to learn to code in STEM classrooms. -**Notice: ** +**Notice:** The newly-produced M5Core replaces the screen with better display performance and higher viewing angle, so it has some compatibility problems with the old Arduino library. When using the old library for screen driving, it will produce reverse color display. You can open the Arduino. The library management option will upgrade your M5Stack library to the latest version (after 0.2.8) to solve this problem. @@ -205,9 +205,13 @@ The newly-produced M5Core replaces the screen with better display performance an Speaker 1W-0928 + + MEMS + BMM150 + MPU6886 + Battery - 600mAh @ 3.7V + 500mAh @ 3.7V Operating Temperature diff --git a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md index d6d6a0bb..41258d61 100644 --- a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md +++ b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md @@ -138,6 +138,10 @@ Connect the device to your computer via a USB Type-C cable, open `Windows Device ### (2) Connect to AP +#### Notice + +The information content of the configured WIFI is not allowed to use Chinese and special symbols. + - Now the device is in Wi-Fi AP mode, use your phone to connect this AP. The AP name would start with "M5Stack-". - After connected to the AP, your phone and the device has established a Wi-Fi connection. - Then you will need to visit this address `192.168.4.1` on your phone browser. Here you will enter the Wi-Fi config page. diff --git a/docs/en/quick_start/m5stick/m5stick_quick_start_with_uiflow.md b/docs/en/quick_start/m5stick/m5stick_quick_start_with_uiflow.md index 12a05681..f037f2f4 100644 --- a/docs/en/quick_start/m5stick/m5stick_quick_start_with_uiflow.md +++ b/docs/en/quick_start/m5stick/m5stick_quick_start_with_uiflow.md @@ -38,6 +38,10 @@ ### Step1. Set up WIFI +#### Notice + +The information content of the configured WIFI is not allowed to use Chinese and special symbols. + - If you got M5Stick for the very first time, once it powered on, by default, it will enter the configuration page. The LED screen will display an **AP name(SSID)** and a **webpage address(192.168.4.1)**. - You will need to use your phone to connect that AP. diff --git a/docs/en/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md b/docs/en/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md index 4850f06a..d6e4dd89 100644 --- a/docs/en/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md +++ b/docs/en/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md @@ -59,6 +59,10 @@ After flash the UIFlow firmware, press and hold the `Power` button (bottom left #### (2) Connect to AP +#### Notice + +The information content of the configured WIFI is not allowed to use Chinese and special symbols. + - Now the device is in Wi-Fi AP mode, use your phone to connect this AP. The AP name would start with "M5-". - After connected to the AP, your phone and the device has established a Wi-Fi connection. - Once it connected, you will need to visit this address (192.168.4.1) on your phone browser. Here you will enter the Wi-Fi config page. diff --git a/docs/en/related_documents/Setting_WIFI.md b/docs/en/related_documents/Setting_WIFI.md index 8371459c..38753706 100644 --- a/docs/en/related_documents/Setting_WIFI.md +++ b/docs/en/related_documents/Setting_WIFI.md @@ -7,6 +7,10 @@ ?>**Please click the anchor point below to view the corresponding Wi-Fi configuration tutorial according to the device type. The following content is only applicable to the M5Core device that has programmed the UIFlow firmware. If your device does not have the UIFlow firmware installed,[Please click here to view the firmware burning Tutorial](zh_CN/related_documents/M5Burner)** +## Notice + +The information content of the configured WIFI is not allowed to use Chinese and special symbols. + ## Text Tutorial **[For M5Core](#For-M5Core)** diff --git a/docs/zh_CN/base/m5go_bottom.md b/docs/zh_CN/base/m5go_bottom.md index 9d02db3a..f345bce1 100644 --- a/docs/zh_CN/base/m5go_bottom.md +++ b/docs/zh_CN/base/m5go_bottom.md @@ -8,7 +8,7 @@ ## 描述 -**M5GO BOTTOM** 是一款 M5Core 增强型通用底座.它是 [M5GO Lite](https://docs.m5stack.com/#/zh_CN/core/m5go_lite)、[M5GO IoT Kit](https://docs.m5stack.com/#/zh_CN/core/m5go)、[M5Fire](https://docs.m5stack.com/#/zh_CN/core/fire)底座的单独零售版，其硬件内容完全一致.相比基础型而言，增强型底座配备了更大容量的锂电池，集成麦克风，LED 灯条，并拓展出两个 GROVE 接口等. +**M5GO BOTTOM** 是一款 M5Core 增强型通用底座.它是 [M5GO Lite](https://docs.m5stack.com/#/zh_CN/core/m5go_lite)、[M5GO IoT Kit](https://docs.m5stack.com/#/zh_CN/core/m5go)、[M5Fire](https://docs.m5stack.com/#/zh_CN/core/fire)底座的单独零售版，其硬件内容完全一致.相比基础型而言，增强型底座配备了更大容量的锂电池(500mAh)，集成麦克风，LED 灯条，并拓展出两个 GROVE 接口等. ## 管脚映射 diff --git a/docs/zh_CN/core/fire.md b/docs/zh_CN/core/fire.md index 97225c52..e0250ccc 100644 --- a/docs/zh_CN/core/fire.md +++ b/docs/zh_CN/core/fire.md @@ -225,11 +225,11 @@ Fire 中的 GPIO 16 / 17 默认与PSRAM连接，因此当你在连接或是堆 MEMS - MPU9250 + BMM150 + SH200Q/MPU6886 电池 - 600mAh @ 3.7V, inside vb + 500mAh @ 3.7V, inside vb 工作温度 diff --git a/docs/zh_CN/core/m5go.md b/docs/zh_CN/core/m5go.md index 028f39aa..fbb3071d 100644 --- a/docs/zh_CN/core/m5go.md +++ b/docs/zh_CN/core/m5go.md @@ -207,11 +207,11 @@ MEMS - MPU9250 + BMM150 + MPU6886 电池 - 600mAh @ 3.7V, inside vb + 500mAh @ 3.7V, inside vb 工作温度 diff --git a/docs/zh_CN/core/m5go_lite.md b/docs/zh_CN/core/m5go_lite.md index 2e20897e..81cd2540 100644 --- a/docs/zh_CN/core/m5go_lite.md +++ b/docs/zh_CN/core/m5go_lite.md @@ -212,11 +212,11 @@ MEMS - MPU9250 + BMM150 + MPU6886 电池 - 600mAh @ 3.7V, inside vb + 500mAh @ 3.7V, inside vb 工作温度 diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md index 2ce6f1b9..ea2ade6a 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md @@ -78,7 +78,11 @@ #### (2) 连接 AP -打开手机或电脑的 Wi-Fi，然后连接屏幕上显示的 M5Core 的热点 `AP` ( 比如现在显示的 M5Stack-0d60 )，连接成功之后，打开浏览器输入网址 `192.168.4.1`，然后选择可联网的 Wi-Fi，输入密码。( 现在可以联网的 Wi-Fi 是 M5 ) +#### 注意 + +配置的WIFI的信息内容不允许使用中文及特殊符号. + +打开手机或电脑的 Wi-Fi，然后连接屏幕上显示的 M5Core 的热点 `AP` ( 比如现在显示的 M5Stack-0d60 )，连接成功之后，打开浏览器输入网址 `192.168.4.1`，然后选择可联网的 Wi-Fi，输入密码。 diff --git a/docs/zh_CN/quick_start/m5stick/m5stick_quick_start_with_uiflow.md b/docs/zh_CN/quick_start/m5stick/m5stick_quick_start_with_uiflow.md index bd21802a..e6ffb9f3 100644 --- a/docs/zh_CN/quick_start/m5stick/m5stick_quick_start_with_uiflow.md +++ b/docs/zh_CN/quick_start/m5stick/m5stick_quick_start_with_uiflow.md @@ -38,6 +38,10 @@ ### Step1. 设置WIFI +#### 注意 + +配置的WIFI的信息内容不允许使用中文及特殊符号. + 首次开机时，会默认进入配置页面，stick的屏幕上显示了**热点的名称（SSID）**，以及**网络配置的地址（192.168.4.1）** 这时候可以使用手机连接这个热点，待连接成功后，使用浏览器输入网络配置地址，进入WIFI配置页面，输入个人WIFI的信息，点击保存，等待连接成功 diff --git a/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md b/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md index d90e8070..cd5ec450 100644 --- a/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md +++ b/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start_with_uiflow.md @@ -54,6 +54,10 @@ M5StickC 将会开启 Wi-Fi 热点，并显示热点 ( AP ) 名字，如下图 #### (2) 连接到 AP +#### 注意 + +配置的WIFI的信息内容不允许使用中文及特殊符号. + 打开您手机或电脑的 Wi-Fi 设置，然后连接显示在 M5StickC 屏幕上的热点 ( 比如, 我这里显示的热点名字是 M5-80f0 )，成功连接之后, 打开浏览器访问网址 `192.168.4.1`, 然后选择可联网的 Wi-Fi，并输入 Wi-Fi 密码。 ( 现在, 我这里的 Wi-Fi 是 M5 。 ) diff --git a/docs/zh_CN/related_documents/Setting_WIFI.md b/docs/zh_CN/related_documents/Setting_WIFI.md index 07b2c5f4..7ada68ab 100644 --- a/docs/zh_CN/related_documents/Setting_WIFI.md +++ b/docs/zh_CN/related_documents/Setting_WIFI.md @@ -7,6 +7,13 @@ ?>**请根据设备类型点击下方锚点查看相应的Wi-Fi配置教程，以下内容仅适用于烧录了UIFlow固件的M5Core设备，若您的设备还未安装UIFlow固件，[请点击此处查看固件烧录教程](zh_CN/related_documents/M5Burner)** + + +## 注意 + +配置的WIFI的信息内容不允许使用中文及特殊符号. + + ## 文本教程 **[For M5Core](#M5Core配置)**