diff --git a/docs/assets/img/product_pics/module/module_gps_06.png b/docs/assets/img/product_pics/module/module_gps_06.png index 2c6d8f9b..f2dbd888 100644 Binary files a/docs/assets/img/product_pics/module/module_gps_06.png and b/docs/assets/img/product_pics/module/module_gps_06.png differ diff --git a/docs/en/base/basex.md b/docs/en/base/basex.md index 27e1fce5..911273a3 100644 --- a/docs/en/base/basex.md +++ b/docs/en/base/basex.md @@ -114,7 +114,7 @@ Mode config method: Motor address + nByte ### 2. UIFlow -*To get complete code, please click， [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Unit/BASEX/UIFlow).* +*To get complete code, please click， [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/BaseX/UIFlow).* diff --git a/docs/en/base/m5go_rfid.md b/docs/en/base/m5go_rfid.md index fdc9c1b6..e836dcf6 100644 --- a/docs/en/base/m5go_rfid.md +++ b/docs/en/base/m5go_rfid.md @@ -10,7 +10,7 @@ ## Description -**M5GO RFID** is a upgraded version base of [M5GO BOTTOM](en/base/m5go_bottom). Comparing to the normal version ([M5GO Bottom](en/base/m5go_bottom)), M5GO RFID owns **RFID function** and **IR transmitter**, **miss maget**. And it's battery capacity is only **330 mAh**. +**M5GO RFID** is a upgraded version base of [M5GO BOTTOM](en/base/m5go_bottom). Comparing to the normal version ([M5GO Bottom](en/base/m5go_bottom)), M5GO RFID owns **RFID function** and **IR transmitter**, **miss magnet**. And it's battery capacity is only **330 mAh**. M5GO Base is composed of battery(330mAh), M-Bus interface, charging indicator(red led), **RFID coil**, **IR transmitter**, two RGB Bar, PORT B and PORT C. diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md index abb7141e..37030d08 100644 --- a/docs/en/core/fire.md +++ b/docs/en/core/fire.md @@ -219,7 +219,7 @@ The GPIO 16 / 17 in Fire is connected to the PSRAM by default, so when you conne MEMS - BMM150 + SH200Q/MPU6886 + BMM150 + MPU6886 Battery diff --git a/docs/en/core/m5go_lite.md b/docs/en/core/m5go_lite.md index 81681d00..3b307b66 100644 --- a/docs/en/core/m5go_lite.md +++ b/docs/en/core/m5go_lite.md @@ -147,6 +147,7 @@ The newly-produced M5Core replaces the screen with better display performance an ESP32 ChipGPIO22GPIO215VGND BMM150SCLSDA5VGND + #### M5GO Base Port **GROVE Port B** diff --git a/docs/en/core/m5stick.md b/docs/en/core/m5stick.md index 04a4274d..d1161007 100644 --- a/docs/en/core/m5stick.md +++ b/docs/en/core/m5stick.md @@ -34,7 +34,7 @@ M5stick is one of the core devices in M5Stack product series which is built in a - Case Material: PC + ABS - 4 MByte Flash - 9-Axis IMU MPU9250(only gray type) -- Red LED +- Blue LED - Buzzer - IR transmitter - 1 Buttons, OLED(1.3 inch), 1 Reset diff --git a/docs/en/module/faces_rfid.md b/docs/en/module/faces_rfid.md index 9d2ecadb..b5606d75 100644 --- a/docs/en/module/faces_rfid.md +++ b/docs/en/module/faces_rfid.md @@ -76,7 +76,7 @@ Communication Protocol: I2C. ### UIFlow -*下载UIFlow示例，[请点击此处. ](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/FACES_RFID/UIFlow)* +*If you want the complete code, please click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/FACES_RFID/UIFlow)* ## Application - Reader­-Tag @@ -84,7 +84,6 @@ Communication Protocol: I2C. ## Video -**Demo** \ No newline at end of file diff --git a/docs/en/module/joystick.md b/docs/en/module/joystick.md index 1fa375f8..641b9c8c 100644 --- a/docs/en/module/joystick.md +++ b/docs/en/module/joystick.md @@ -8,9 +8,9 @@ ## Description -**JOYSTICK** is a control column module. A joystick is an input device consisting of a stick that pivots on a base and reports its angle or direction to the device it is controlling. Same as ENCODER, it is compatible with FACE Kit. You can have it replace the keycoard panel inside the FACE kit. Through IIC you can get the offset data form (X, Y) axis, also the button status. You can customized the LED behavior as you like. +**JOYSTICK** is a control column module. A joystick is an input device consisting of a stick that pivots on a base and reports its angle or direction to the device it is controlling. Same as ENCODER, it is compatible with FACE Kit. You can have it replace the keyboard panel inside the FACE kit. Through IIC you can get the offset data form (X, Y) axis, also the button status. You can customized the LED behavior as you like. -JOYSTICK IIC address is 0x5E). +JOYSTICK IIC address is 0x5E. @@ -139,4 +139,4 @@ Wire.endTransmission(); -- **[UIFlow example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/JOYSTICK/firmware_328p/FaceJoystick328)** +- **[UIFlow example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/JOYSTICK/UIFlow)** diff --git a/docs/en/module/lego_plus.md b/docs/en/module/lego_plus.md index ab4a0798..9d0dda1d 100644 --- a/docs/en/module/lego_plus.md +++ b/docs/en/module/lego_plus.md @@ -59,7 +59,11 @@ LEGO motor is one of the Technic pieces form LEGO. The purpose of LEGO Technic i ## Example -### UIFlow +### 1. Arduino + +*To get the complete Arduino code, please click [here](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/LEGO_PLUS/LEGO_Test).* + +### 2. UIFlow *To get the complete code, please click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/LEGO_PLUS/UIFlow)。* diff --git a/docs/en/module/lte.md b/docs/en/module/lte.md index 57e2e03c..ad9deaa8 100644 --- a/docs/en/module/lte.md +++ b/docs/en/module/lte.md @@ -78,7 +78,6 @@ Product Feature: - [LTE Module](https://github.com/m5stack/M5-Schematic/blob/master/Modules/module_lte_sch.pdf) - ## EasyLoader @@ -97,7 +96,6 @@ Product Feature: *To get complete code, please click [here](https://github.com/m5stack/M5Stack/blob/master/examples/Modules/LTE/LTE.ino).* - ### Pin Map diff --git a/docs/en/module/servo.md b/docs/en/module/servo.md index 9c6493f8..04b90323 100644 --- a/docs/en/module/servo.md +++ b/docs/en/module/servo.md @@ -86,7 +86,7 @@ Wire.endTransmission(); ### 2. UIFlow -Wanna explore the easiest way of Servo programming?? Check out the Blockly Platform at [UIFlow](flow.m5stack.com). +Wanna explore the easiest way of Servo programming?? Check out the Blockly Platform at [UIFlow](http://flow.m5stack.com). *TO get the complete code, please click [here](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/SERVO/UIFlow).* diff --git a/docs/en/unit/accel.md b/docs/en/unit/accel.md index dbc35893..9cdd7ed6 100644 --- a/docs/en/unit/accel.md +++ b/docs/en/unit/accel.md @@ -8,7 +8,7 @@ ## Description -**ACCEL** is a motion sensor Unit. Integrated with ADXL 345, ACC is able to obtain 3- axis of Acceleration. ADXL 345 is a small, thin, ultralow power, 3-axis accelerometer with high resolution (13-bit) measurement at up to ±16 g. Digital output data is formatted as 16-bit twos complement and is accessible through either an SPI (3- or 4-wire) or I2C digital interface. In this Unit, we used I2C series interface. +**ACCEL** is a motion sensor Unit. Integrated with ADXL 345, ACC is able to obtain 3- axis of Acceleration. ADXL 345 is a small, thin, ultralow power, 3-axis accelerometer with high resolution (13-bit) measurement at up to ±16 g. Digital output data is formatted as 16-bit twos complement and is accessible through I2C digital interface. In this Unit, we used I2C series interface.
*What is an accelerometer?*
diff --git a/docs/en/unit/heart.md b/docs/en/unit/heart.md index 72a9b417..be037a70 100644 --- a/docs/en/unit/heart.md +++ b/docs/en/unit/heart.md @@ -12,7 +12,7 @@ MAX30100 is a complete pulse oximetry and heartrate sensor system solution designed for the demanding requirements of wearable devices. The MAX30100 provides very small total solution size without sacrificing optical or electrical performance. Minimal external hardware components are needed for integration into a wearable device. -- How do we use this Unit to test the heart rate and ? +- How do we use this Unit to test the heart rate ? **Put your finger on the detection area.** - What is the communication protocol between M5 core and this unit? diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index f7e6c05f..05636b4d 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -144,7 +144,7 @@ {a:"/#/zh_CN/base/base15", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_base15_01.jpg", p:"BASE15"}, {a:"/#/zh_CN/base/base26", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_base26_01.jpg", p:"BASE26"}, {a:"/#/zh_CN/accessory/battery_base", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/accessory/battery_base_01.jpg", p:"M5Camera Battery"}, - {a:"/#/zh_CN/base/baseX", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_basex_01.webp", p:"BaseX"}, + {a:"/#/zh_CN/base/basex", img:"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/base/base_basex_01.webp", p:"BaseX"}, ]; var unit_list = [ diff --git a/docs/zh_CN/base/base15.md b/docs/zh_CN/base/base15.md index 82424e59..1a89f6f4 100644 --- a/docs/zh_CN/base/base15.md +++ b/docs/zh_CN/base/base15.md @@ -10,7 +10,7 @@ **Base15** 是M5体系中一款支持高度定制化的工业底座.与PLC Base有着类似，却有着更高级别定制化能力.套件内提供了Protoboard（万能板）允许您添加自己的电路设计，并预留了两个Grove接口焊盘，方便您进行线路的拓展.提供M型防水接头组件，允许用户将其安装在底座的侧面或是底部. -**Base15** 中'15'代号来源于底座的高度15cm,底座上每一侧都是可以自由拆卸，切割，定制成不同的接口，以满足不同需求.关于底座的定制，我们提供了大量的结构组件替代方案，并将其完全开源，你可以基于这些设计去制作3D打印林见或是二次设计.不但如此，该底座完全兼容M5堆叠模块与硬件拓展体系.在产品的底部，我们提供了2种不同的装配方式：导轨固定，悬挂固定。 +**Base15** 中'15'代号来源于底座的高度15cm,底座上每一侧都是可以自由拆卸，切割，定制成不同的接口，以满足不同需求.关于底座的定制，我们提供了大量的结构组件替代方案，并将其完全开源，你可以基于这些设计去制作3D打印文件或是二次设计.不但如此，该底座完全兼容M5堆叠模块与硬件拓展体系.在产品的底部，我们提供了2种不同的装配方式：导轨固定，悬挂固定。 diff --git a/docs/zh_CN/base/basex.md b/docs/zh_CN/base/basex.md index f9ae60d1..01cfce78 100644 --- a/docs/zh_CN/base/basex.md +++ b/docs/zh_CN/base/basex.md @@ -113,7 +113,7 @@ I2C 电机地址: ### 2. UIFlow -*以下代码仅为片段，如需获取完整代码， [请点击此处](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Unit/BASEX/UIFlow).* +*以下代码仅为片段，如需获取完整代码， [请点击此处](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Base/BaseX/UIFlow).* diff --git a/docs/zh_CN/base/m5go_rfid.md b/docs/zh_CN/base/m5go_rfid.md index 1c1c71e1..d7363c16 100644 --- a/docs/zh_CN/base/m5go_rfid.md +++ b/docs/zh_CN/base/m5go_rfid.md @@ -8,7 +8,7 @@ ## 描述 -**M5GO RFID** 是[M5GO BOTTOM](zh_CN/base/m5go_bottom)的升级版,底座内置RFID,相比普通版本 [M5GO Bottom](zh_CN/base/m5go_bottom)，**底座少了磁铁和电池容量少了230mAh**，多了 **RFID 线圈** 和 **红外发射管**。 +**M5GO RFID** 是[M5GO BOTTOM](zh_CN/base/m5go_bottom)的升级版,底座内置RFID,相比普通版本 [M5GO Bottom](zh_CN/base/m5go_bottom)，**底座少了磁铁和电池容量减少**，多了 **RFID 线圈** 和 **红外发射管**。 M5GO 底座由 330mAh 的电池(充满 3.7V)、M-Bus 总线接口、麦克风、红色的充电指示 LED、2条 RGB灯条 (10颗)、**RFID 线圈**、**红外发射管**、PORT B 和 PORT C 组成。 diff --git a/docs/zh_CN/core/fire.md b/docs/zh_CN/core/fire.md index 2a75f174..9a92e76b 100644 --- a/docs/zh_CN/core/fire.md +++ b/docs/zh_CN/core/fire.md @@ -28,7 +28,7 @@ M5Stack Fire 配有三个可分离部件. 顶部与其他的M5主机一样，放 **注意1：** -新生产的M5Core更换了显示效果与可视角更加优质的屏幕，因此与旧版的Arduino库产生了一些兼容性问题，使用旧版程序库进行屏幕驱动时会产生反色显示的现象，您可以打开Arduino的库管理选项将您的M5Stack库升级至最新版本（0.2.8以后）来解决这个问题. +新生产的M5Core更换了显示效果与可视角更加广的屏幕，因此与旧版的Arduino库产生了一些兼容性问题，使用旧版程序库进行屏幕驱动时会产生反色显示的现象，您可以打开Arduino的库管理选项将您的M5Stack库升级至最新版本（0.2.8以后）来解决这个问题.


diff --git a/docs/zh_CN/core/gray.md b/docs/zh_CN/core/gray.md index 59be8bd9..7ed0e1e1 100644 --- a/docs/zh_CN/core/gray.md +++ b/docs/zh_CN/core/gray.md @@ -153,14 +153,6 @@
MPU6886SCLSDA5VGND
-**3-Axis Geomagnetic Sensor BMM150** - -*BMM150 I2C address 0x10* - - - - -
ESP32 ChipGPIO22GPIO215VGND
BMM150SCLSDA5VGND
**3轴磁力计 BMM150** diff --git a/docs/zh_CN/core/m5stick.md b/docs/zh_CN/core/m5stick.md index e739e09c..36c8f6a0 100644 --- a/docs/zh_CN/core/m5stick.md +++ b/docs/zh_CN/core/m5stick.md @@ -35,7 +35,7 @@ M5stick 是 M5Stack 产品系列中的核心设备之一，该产品系列建立 - 基于ESP32开发 - 4 MByte 闪存 - MPU9250(只有灰色款配备) -- Red LED +- Blue LED - 蜂鸣器 - 红外发射管 - 按键x1, OLED(1.3寸), 电源/复位按键x1 diff --git a/docs/zh_CN/core/m5stickv.md b/docs/zh_CN/core/m5stickv.md index 42717445..0f8355a2 100644 --- a/docs/zh_CN/core/m5stickv.md +++ b/docs/zh_CN/core/m5stickv.md @@ -3,7 +3,6 @@ - *** :memo:**[描述](#描述)**    :bulb:**[上手指南](zh_CN/quick_start/m5stickv/m5stickv_quick_start)**    :electric_plug:**[原理图](#原理图)**      🛒**[购买链接](https://m5stack.com/collections/m5-core/products/stickv)**   **[EasyLoader](#EasyLoader)**    :camera:**[V-Training](zh_CN/related_documents/v-training)** @@ -13,7 +12,6 @@ **M5Stick-V RISC-V AI 摄像头** **M5Stick-V**是一款搭载Kendryte K210的AIOT（AI + IOT）摄像头，集成双核64位RISC-V CPU和最先进的神经网络处理器边缘计算片上系统（SoC） -

M5stickV AI 摄像头具备机器视觉能力，支持多种视觉识别能力的它（ 如实时获取被检测目标的大小与坐标 • 实时获取被检测目标的种类），并且能够在低功耗情况下进行卷积神经网络计算，因此M5StickV会是一个很好的零门槛机器视觉嵌入式解决方案

diff --git a/docs/zh_CN/module/joystick.md b/docs/zh_CN/module/joystick.md index 94dc3e2c..a51347de 100644 --- a/docs/zh_CN/module/joystick.md +++ b/docs/zh_CN/module/joystick.md @@ -144,4 +144,4 @@ Wire.endTransmission(); -- **[UIFlow固件](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/JOYSTICK/firmware_328p/FaceJoystick328)** +- **[UIFlow固件](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/JOYSTICK/UIFlow)** diff --git a/docs/zh_CN/module/lego_plus.md b/docs/zh_CN/module/lego_plus.md index 20a8bdf2..07ce18d5 100644 --- a/docs/zh_CN/module/lego_plus.md +++ b/docs/zh_CN/module/lego_plus.md @@ -61,6 +61,10 @@ ## 例程 +### 1. Arduino + +*获取完整Arduino例程 [点击这里](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/LEGO_PLUS/LEGO_Test).* + ### 2. UIFlow *以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/LEGO_PLUS/UIFlow)。* diff --git a/docs/zh_CN/module/lte.md b/docs/zh_CN/module/lte.md index c5873b1a..7b0a055b 100644 --- a/docs/zh_CN/module/lte.md +++ b/docs/zh_CN/module/lte.md @@ -84,7 +84,7 @@ ### Arduino IDE -*以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5Stack/blob/master/examples/Modules/LTE/LTE.ino).* +*如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5Stack/blob/master/examples/Modules/LTE/LTE.ino).* ### 管脚映射 diff --git a/docs/zh_CN/module/servo.md b/docs/zh_CN/module/servo.md index 420769e9..f13ad62c 100644 --- a/docs/zh_CN/module/servo.md +++ b/docs/zh_CN/module/servo.md @@ -114,7 +114,7 @@ void loop() { ### 2. UIFlow -想要探索最简单的Servo编程驱动方式吗？快试试Blockly编程平台[UIFlow](flow.m5stack.com). +想要探索最简单的Servo编程驱动方式吗？快试试Blockly编程平台[UIFlow](http://flow.m5stack.com). *以下代码仅为片段，如需获取完整代码， [请点击此处.](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/SERVO/UIFlow).* diff --git a/docs/zh_CN/module/sim800.md b/docs/zh_CN/module/sim800.md index 60abb6dd..440de146 100644 --- a/docs/zh_CN/module/sim800.md +++ b/docs/zh_CN/module/sim800.md @@ -4,7 +4,7 @@ *** -:memo:**[描述](#描述)**      :electric_plug:**[原理图](#原理图)**      :octocat:**[Example](#Example)**      🛒**[购买链接](https://m5stack.com/collections/m5-module/products/gsm-sim800-module)**      :clapper:**[相关视频](#相关视频)**   **[EasyLoader](#EasyLoader)** +:memo:**[描述](#描述)**      :electric_plug:**[原理图](#原理图)**      :octocat:**[例程](#例程)**      🛒**[购买链接](https://m5stack.com/collections/m5-module/products/gsm-sim800-module)**      :clapper:**[相关视频](#相关视频)**   **[EasyLoader](#EasyLoader)** ## 描述 diff --git a/docs/zh_CN/unit/accel.md b/docs/zh_CN/unit/accel.md index d8cb4aa9..d467c0f3 100644 --- a/docs/zh_CN/unit/accel.md +++ b/docs/zh_CN/unit/accel.md @@ -8,7 +8,7 @@ ## 描述 -**ACCEL** 是一款运动数据传感器. 内部集成**ADXL345**三轴加速度计.可测量范围高达±16g（13位分辨率）的加速度数据.输出数据格式为16位二进制补码，可通过SPI（3线或4线）或I2C数字接口访问. 在该Unit中，采用了I2C通信接口. +**ACCEL** 是一款运动数据传感器. 内部集成**ADXL345**三轴加速度计.可测量范围高达±16g（13位分辨率）的加速度数据.输出数据格式为16位二进制补码，可通过I2C数字接口访问. 在该Unit中，采用了I2C通信接口.
*什么是加速度计？*