diff --git a/docs/assets/img/product_pics/core/tough/tough_sch.webp b/docs/assets/img/product_pics/core/tough/tough_sch.webp new file mode 100644 index 00000000..c2d3dfa5 Binary files /dev/null and b/docs/assets/img/product_pics/core/tough/tough_sch.webp differ diff --git a/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_01.webp b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_01.webp new file mode 100644 index 00000000..60d0ec56 Binary files /dev/null and b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_01.webp differ diff --git a/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_02.webp b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_02.webp new file mode 100644 index 00000000..6a2eacf0 Binary files /dev/null and b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_02.webp differ diff --git a/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_03.webp b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_03.webp new file mode 100644 index 00000000..0297f6fc Binary files /dev/null and b/docs/assets/img/product_pics/module/grbl13.2/grbl13.2_03.webp differ diff --git a/docs/en/1515/6060-push.md b/docs/en/1515/6060-push.md index 80d44e33..6b10864d 100644 --- a/docs/en/1515/6060-push.md +++ b/docs/en/1515/6060-push.md @@ -15,7 +15,7 @@ This an application-level module, which implements a motion & robotic control an - RS485 - 1515 Aluminium Profile frame - 48 stepper motor: 2 phase 4 lines -- Itinerary: 57.5mm +- Itinerary: 57mm - Input voltage: 12-24V - Motor power: 10W diff --git a/docs/en/atom/atom_motion.md b/docs/en/atom/atom_motion.md index b846211e..17b14a76 100644 --- a/docs/en/atom/atom_motion.md +++ b/docs/en/atom/atom_motion.md @@ -115,7 +115,7 @@ - +
FunctionReg AddressData RangeR/W
Servo(1~4)0x00~0x03angle: 0-180R/W
Servo(1~4)0x10~0x17pulse: 500-2500R/W
Servo(1~4)0x10、0x12、0x14、0x16pulse: 500-2500R/W
Motor(1~2)0x20~0x21speed: -127-127R/W
diff --git a/docs/en/base/m5go_bottom2.md b/docs/en/base/m5go_bottom2.md index d67b871f..08176673 100644 --- a/docs/en/base/m5go_bottom2.md +++ b/docs/en/base/m5go_bottom2.md @@ -6,7 +6,7 @@ ## Description -**M5GO BOTTOM2** is an expansion base designed for M5Core2. It integrates an MPU6886 6 axis gyro/accelerometer，digital mic(SPM1423) and 500mAh LiPo battery. The base also includes 2 HY2.0-4P expanion ports capable of ADC/DAC/UART protocols and data input/output，which allows the use of units from the M5Stack range. On either side of the base beneath a diffuser are a total of 10 programmable RGB LEDs(SK6812)，which can be used as a form of notification or for impressive lighting effectss. Beneath the device are a set of pogo pins which attach to the included base for charging，The charging base incorporates a TP4057 charging IC which facilitates efficient and safe charging. The pogo pin connector can also be used for I2C communication, therefore if the user wants to attach or modify the base to include I2C devices they are able to do so. On the bottom of the device are an array of Lego™ compatible holes which makes integration of your Lego™ projects a breeze. +**M5GO BOTTOM2** is an expansion base designed for M5Core2. It integrates an MPU6886 6 axis gyro/accelerometer，digital mic(SPM1423) and 500mAh LiPo battery. The base also includes 2 HY2.0-4P expanion ports capable of ADC/DAC/UART protocols and data input/output，which allows the use of units from the M5Stack range. On either side of the base beneath a diffuser are a total of 10 programmable RGB LEDs(SK6812)，which can be used as a form of notification or for impressive lighting effectss. Beneath the device are a set of pogo pins which can attach to a charging base (excluded) for charging. The pogo pin connector can also be used for I2C communication, therefore if the user wants to attach or modify the base to include I2C devices they are able to do so. On the bottom of the device are an array of Lego™ compatible holes which makes integration of your Lego™ projects a breeze. ## Features diff --git a/docs/en/core/m5paper.md b/docs/en/core/m5paper.md index 74f1780a..dd4d2ded 100644 --- a/docs/en/core/m5paper.md +++ b/docs/en/core/m5paper.md @@ -247,7 +247,7 @@ For more info on specific pin functions refer to the official ESP32 Docs[ESP32 d - [M5EPD_TTFExample](https://github.com/m5stack/M5EPD_TTFExample) - [M5EPD-Lib](https://github.com/m5stack/M5EPD) ->When using FactoryTest to load special characters (such as Chinese, Japanese), please put the font file into the TF card and name it as `font.ttf`.[download ttf file](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/example/Font.ttf) +>When using FactoryTest to load special characters (such as Chinese, Japanese), please put the font file into the TF card root directory and name it as `font.ttf`.[download ttf file](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/example/Font.ttf) ## Schematic diff --git a/docs/en/module/goplus2.md b/docs/en/module/goplus2.md index 16487697..d1d56e55 100644 --- a/docs/en/module/goplus2.md +++ b/docs/en/module/goplus2.md @@ -78,7 +78,7 @@ Communication protocol: IIC(0x38) ## EasyLoader ->EasyLoader is a concise and fast program writer, which has a built-in case program related to the product. It can be burned to the main control by simple steps to perform a series of function verification. Please install the corresponding driver according to the device type. M5Core host [Please click here to view the CP210X driver installation tutorial](en/arduino/arduino_development), M5StickC/V/T/ATOM series can be used without driver) +>EasyLoader is a concise and fast program writer, which has a built-in case program related to the product. It can be burned to the main control by simple steps to perform a series of function verification. Please install the corresponding driver according to the device type. M5Core host [Please click here to view the CP210X driver installation tutorial](en/arduino/arduino_development)
@@ -124,11 +124,11 @@ Communication protocol: IIC(0x38) To get example code, please [click here to download](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/GoPLUS2) -Last updated: 2020-12-28 +Last updated: 2021-1-22 diff --git a/docs/en/module/nb-iot.md b/docs/en/module/nb-iot.md index 2a490bef..b708ba61 100644 --- a/docs/en/module/nb-iot.md +++ b/docs/en/module/nb-iot.md @@ -70,7 +70,7 @@ Power Operation: ## Include -- 1x NB-IoT module (Only China regional distribution SIM Card) +- 1x NB-IoT module ## Applications diff --git a/docs/en/module/servo2.md b/docs/en/module/servo2.md index 0e6aad60..262ec757 100644 --- a/docs/en/module/servo2.md +++ b/docs/en/module/servo2.md @@ -10,6 +10,9 @@ The maximum total power output of dual channel is 35W (5V / 3.5A * 2), and the maximum output power of single channel is 25W (5V / 5A). When the battery base is used for power supply, the maximum output power is 5V / 2A. The module communicates with the host directly through I2C (the default address is 0x40) however the I2C address can be changed(0x40 - 0x47) through the dial switch. This also means that multiple Servo 2 modules can be stacked and used simultaneously. There is a power switch on the board to control the power supply of Servo 2. + +>The module must use the external power supply of DC interface when driving the servo. When using the AXP192 power management chip's main control (such as CORE2), the M-BUS power mode needs to be configured as input when the program is initialized. + ## Product Features - 16x actuator drive channel @@ -98,7 +101,7 @@ To get the complete code, please click [here](https://github.com/m5stack/M5-Prod \ No newline at end of file diff --git a/docs/zh_CN/module/goplus2.md b/docs/zh_CN/module/goplus2.md index bdb8d0f4..ac23870c 100644 --- a/docs/zh_CN/module/goplus2.md +++ b/docs/zh_CN/module/goplus2.md @@ -127,9 +127,11 @@ 点击[此处获取](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Module/GoPLUS2)示例程序 +Last updated: 2021-1-22 + diff --git a/docs/zh_CN/module/nb-iot.md b/docs/zh_CN/module/nb-iot.md index 6b41b0a3..e4b58331 100644 --- a/docs/zh_CN/module/nb-iot.md +++ b/docs/zh_CN/module/nb-iot.md @@ -55,7 +55,6 @@ ## 包含 -- 1x Nano IoT SIM卡 - 1x NB-IoT 模块 ## 应用 diff --git a/docs/zh_CN/module/servo2.md b/docs/zh_CN/module/servo2.md index de1605d6..4f4dd89c 100644 --- a/docs/zh_CN/module/servo2.md +++ b/docs/zh_CN/module/servo2.md @@ -8,6 +8,7 @@ **SERVO 2** 是M5Stack堆叠模块系列中的一款舵机驱动模块，内部采用PCA9685 16通道PWM控制器，可以同时控制16路舵机。采用直流电源输入（6-12V）设计，通过两片SY8368AQQC进行降压，双通道输出最大总功率35W (5V/3.5A*2)，单通道输出最大功率25W(5V/5A)，当使用电池底座供电时最高支持5V/2A输出。模块与主机直接通过I2C进行通讯（默认0x40），通过拨码开关可改变I2C地址(0x40~0x47)，这也意味着多个SERVO2可以堆叠使用，板上有一个电源切换开关，可控制SERVO2电源通断。 +>该模块驱动舵机时必须使用DC接口外部供电。使用AXP192电源管理芯片的主控(如CORE2)，在程序初始化时需要将M-BUS电源模式配置为输入。 ## 产品特性 @@ -97,7 +98,7 @@ \ No newline at end of file diff --git a/docs/zh_CN/unit/uwb.md b/docs/zh_CN/unit/uwb.md index 0048db1d..f8ea9120 100644 --- a/docs/zh_CN/unit/uwb.md +++ b/docs/zh_CN/unit/uwb.md @@ -22,7 +22,7 @@ - 开发平台: Arduino, UIFlow(Blockly, Python) - 2x LEGO 兼容孔 -## 套件清单 +## 包含 - 1x UWB Unit - 1x HY2.0-4P线缆