From ba77749c22acdc7f4053c04ee0115139d522b611 Mon Sep 17 00:00:00 2001 From: Sean <1026025056@qq.com> Date: Fri, 29 Jan 2021 14:47:53 +0800 Subject: [PATCH 1/2] fix some mistake --- docs/en/app/balac.md | 2 +- docs/en/atom/atomicgps.md | 2 +- docs/en/hat/hat-cardkb.md | 4 ++-- docs/en/hat/hat-env.md | 2 +- docs/en/hat/hat-pir.md | 2 +- docs/en/hat/hat-powerc.md | 10 +++++----- docs/en/hat/hat-roverc.md | 4 ++++ docs/en/hat/hat_envII.md | 4 ++-- docs/en/module/commu.md | 2 +- docs/en/module/encoder.md | 8 ++++---- docs/en/module/goplus.md | 2 +- docs/en/module/goplus2.md | 2 +- docs/en/module/joystick.md | 4 ++-- docs/en/module/lego_plus.md | 4 ++-- docs/en/module/plus.md | 2 +- docs/en/module/servo.md | 2 +- docs/en/product_list.json | 1 + docs/en/tool/usb_downloader.md | 4 ++-- docs/en/unit/4relay.md | 4 ++-- docs/en/unit/cardkb.md | 4 ++-- docs/en/unit/color.md | 2 +- docs/en/unit/dac.md | 2 +- docs/en/unit/dds.md | 25 ++++++++++++++++++++----- docs/en/unit/envII.md | 2 +- docs/en/unit/extio.md | 4 ++-- docs/en/unit/heart.md | 2 +- docs/en/unit/hub.md | 2 +- docs/en/unit/m5camera_f.md | 4 ++-- docs/en/unit/m5camera_x.md | 4 ++-- docs/en/unit/ncir.md | 2 +- docs/en/unit/rfid.md | 2 +- docs/en/unit/sonic.md | 4 ++-- docs/en/unit/thermal.md | 2 +- docs/ja/README.md | 4 ++-- docs/ja/module/goplus.md | 2 +- docs/zh_CN/api/system_m5stickc.md | 2 +- docs/zh_CN/api/tough/lcd.md | 3 +-- docs/zh_CN/app/balac.md | 2 +- docs/zh_CN/atom/atomicgps.md | 2 +- docs/zh_CN/core/fire.md | 2 +- docs/zh_CN/core/m5go_lite.md | 2 +- docs/zh_CN/hat/hat-env.md | 2 +- docs/zh_CN/hat/hat-pir.md | 2 +- docs/zh_CN/hat/hat-powerc.md | 6 +++++- docs/zh_CN/hat/hat-roverc.md | 12 ++++++++---- docs/zh_CN/module/encoder.md | 4 ++-- docs/zh_CN/module/goplus.md | 2 +- docs/zh_CN/module/goplus2.md | 2 +- docs/zh_CN/product_list.json | 1 + docs/zh_CN/tool/usb_downloader.md | 4 ++-- docs/zh_CN/unit/4relay.md | 2 +- docs/zh_CN/unit/cardkb.md | 2 +- docs/zh_CN/unit/color.md | 4 ++-- docs/zh_CN/unit/dac.md | 2 +- docs/zh_CN/unit/dds.md | 25 +++++++++++++++---------- docs/zh_CN/unit/heart.md | 2 +- docs/zh_CN/unit/hub.md | 2 +- docs/zh_CN/unit/m5camera.md | 2 +- docs/zh_CN/unit/m5camera_f.md | 4 ++-- docs/zh_CN/unit/m5camera_x.md | 2 +- docs/zh_CN/unit/ncir.md | 2 +- docs/zh_CN/unit/rfid.md | 2 +- 62 files changed, 132 insertions(+), 99 deletions(-) diff --git a/docs/en/app/balac.md b/docs/en/app/balac.md index f0ff81f3..826fb4b5 100644 --- a/docs/en/app/balac.md +++ b/docs/en/app/balac.md @@ -64,7 +64,7 @@
## Product Features
- 12 RGB Led
-- IIC communication
+- I2C communication
- Simple API for programming
- Mega328 inside
- Encoder detection
@@ -96,7 +96,7 @@ The series communication protocol between M5 core and ENCODER is IIC (The defaul
r, g, b: 0 ~ 254
*/
void Led(int led_index, int r, int g, int b){
- // IIC send data
+ // I2C send data
Wire.beginTransmission(Faces_Encoder_I2C_ADDR);
Wire.write(led_index);
Wire.write(r);
@@ -112,7 +112,7 @@ void Led(int led_index, int r, int g, int b){
void get_encoder_increment(void){
int temp_encoder_increment;
- // IIC read data
+ // I2C read data
Wire.requestFrom(Faces_Encoder_I2C_ADDR, 3);
if(Wire.available()){
temp_encoder_increment = Wire.read();// get increment
diff --git a/docs/en/module/goplus.md b/docs/en/module/goplus.md
index af37be6a..6e2847fb 100644
--- a/docs/en/module/goplus.md
+++ b/docs/en/module/goplus.md
@@ -10,7 +10,7 @@
Comes with 2x DC motor channel, 4x Servo motor channel, IR transmitter, IR receiver, 3x extend PORT B(GPIO Port). This Module can surely help build more complicated and organized motor applications.
-Communication Protocol: IIC (0x61).
+Communication Protocol: I2C (0x61).
## Product Features
diff --git a/docs/en/module/goplus2.md b/docs/en/module/goplus2.md
index d1d56e55..cdf61b75 100644
--- a/docs/en/module/goplus2.md
+++ b/docs/en/module/goplus2.md
@@ -8,7 +8,7 @@
**GoPlus2** is a stackable multi-functional motor and servo control module. The master control integrates the STM32F030C8T6 chipset. The module is equipped with 2-way DC motor drive interface and 4-way servo drive interface. Three PORT-B interfaces(Analog Input,Digital Output,Digital Input) can be expanded. Built-in 500mAh battery and support infrared (IR) transmission and receive. In order to meet the requirements of multi-channel interface power supply at the same time, a DC power interface is provided for external power supply, battery can be charged through the M5Core with USB-C.
-Communication protocol: IIC(0x38)
+Communication protocol: I2C(0x38)
### Product Features
diff --git a/docs/en/module/joystick.md b/docs/en/module/joystick.md
index 2bda1b5a..2972e6fd 100644
--- a/docs/en/module/joystick.md
+++ b/docs/en/module/joystick.md
@@ -7,12 +7,12 @@
**JOYSTICK** is a joystick control panel compatible with the FACE kit. By pushing the joystick on the panel, you can input angle, direction and other data. Using the I2C communication protocol. It's possible to get the offset data of the joystick (X, Y coordinate) and the state of the middle button. An LED bar composed of 12 LEDs is embedded around the joystick. You can customize the luminous form of the LED light according to your needs.
-JOYSTICK IIC address is 0x5E by default.
+JOYSTICK I2C address is 0x5E by default.
## Product Features
- 4 RGB Led
-- IIC communication
+- I2C communication
- Simple API for programming
## Include
diff --git a/docs/en/module/lego_plus.md b/docs/en/module/lego_plus.md
index 37764926..ba6e1e13 100644
--- a/docs/en/module/lego_plus.md
+++ b/docs/en/module/lego_plus.md
@@ -8,7 +8,7 @@
**DC MOTOR** is built with MEGA328 and L293DD microcontrollers, implemented 4 driver channels. A DC power input is designed for power supplement. Through M-BUS the DC in can automatically power the M5 core at top. DC motor module can drive RJ12 interface encoder-motor easily and quickly, such as LEGO ev3 Motor.(This product is not affiliated with or endorsed by LEGO. LEGO is a trademark of the LEGO Group of companies)
-Series Communication: IIC (0x56).
+Series Communication: I2C (0x56).
## Product Features
@@ -16,7 +16,7 @@ Series Communication: IIC (0x56).
- DC Connector Type: XT30 (female)
- 4x Motor port
- Compatible with LEGO EV3 motor
-- 2x IIC GROVE port (extend PORTA from M5 Core)
+- 2x I2C GROVE port (extend PORTA from M5 Core)
- L293DD: PUSH-PULL Driver Chip
## Include
diff --git a/docs/en/module/plus.md b/docs/en/module/plus.md
index 81c80843..349260fc 100644
--- a/docs/en/module/plus.md
+++ b/docs/en/module/plus.md
@@ -10,7 +10,7 @@
## Product Features
-- IIC address:(0x62)
+- I2C address:(0x62)
- 400mAh Battery
- Programmable gear potentiometer
- IR transmitter
diff --git a/docs/en/module/servo.md b/docs/en/module/servo.md
index afb09a7e..538f065b 100644
--- a/docs/en/module/servo.md
+++ b/docs/en/module/servo.md
@@ -6,7 +6,7 @@
## Description
-**SERVO** is made to implement the bestest, easiest way to drive Servo motors. This M5 module will make quick work of your next Servo project! It is able to drive mutiple Servo motors, up to 12 channels(Max load :14W) . We also added an DC input for power supplement. Through M-BUS the DC in can automatically power the M5 core at top.Servo is powered by MEGA328 communicate via IIC(0x53).
+**SERVO** is made to implement the bestest, easiest way to drive Servo motors. This M5 module will make quick work of your next Servo project! It is able to drive mutiple Servo motors, up to 12 channels(Max load :14W) . We also added an DC input for power supplement. Through M-BUS the DC in can automatically power the M5 core at top.Servo is powered by MEGA328 communicate via I2C(0x53).
## Product Features
diff --git a/docs/en/product_list.json b/docs/en/product_list.json
index 8982d3dc..97fc2063 100644
--- a/docs/en/product_list.json
+++ b/docs/en/product_list.json
@@ -66,6 +66,7 @@
{"a":"/#/en/unit/4relay", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/4relay.webp", "p":"4-RELAY", "sku":"U097" ,"kw":"SWITCH", "category":"I/0"},
{"a":"/#/en/unit/extio", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_extio_01.webp", "p":"EXT.IO", "sku":"U011" ,"kw":"PCA9554PW"},
{"a":"/#/en/unit/dac", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_dac_01.webp", "p":"DAC", "sku":"U012" ,"kw":"MCP4725"},
+ {"a":"/#/en/unit/dds", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_dds_01.webp", "p":"DDS", "sku":"U105" ,"kw":"AD9833 Direct Digital Frequency Synthesis"},
{"a":"/#/en/unit/relay", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_relay_01.webp", "p":"RELAY", "sku":"U023" ,"kw":"SWITCH"},
{"a":"/#/en/unit/hub", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_hub_01.webp", "p":"HUB", "sku":"U006" ,"kw":"CONNECTOR"},
{"a":"/#/en/unit/pahub", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_pahub_p1.webp", "p":"PaHUB", "sku":"U040" ,"kw":"CONNECTOR"},
diff --git a/docs/en/tool/usb_downloader.md b/docs/en/tool/usb_downloader.md
index 02a90360..8c0424aa 100644
--- a/docs/en/tool/usb_downloader.md
+++ b/docs/en/tool/usb_downloader.md
@@ -1,4 +1,4 @@
-## Accessory ESP32-Downloader {docsify-ignore-all}
+## ESP32-Downloader
diff --git a/docs/ja/README.md b/docs/ja/README.md
index 5c05c876..368ec4e4 100644
--- a/docs/ja/README.md
+++ b/docs/ja/README.md
@@ -330,7 +330,7 @@
Base
-
+
@@ -863,7 +863,7 @@
応用製品
-
+

-Communication Protocol: IIC (0x61).
+Communication Protocol: I2C (0x61).
## Product Features
diff --git a/docs/zh_CN/api/system_m5stickc.md b/docs/zh_CN/api/system_m5stickc.md
index 4b4dff15..bf8cdeb1 100644
--- a/docs/zh_CN/api/system_m5stickc.md
+++ b/docs/zh_CN/api/system_m5stickc.md
@@ -58,7 +58,7 @@ void setup() {
## GetBm8563Time()
-*这是 BM8563 芯片的 API 函数。该芯片与 ESP32 之间通过 IIC 通信,IIC 地址为 0x51*
+*这是 BM8563 芯片的 API 函数。该芯片与 ESP32 之间通过 I2C 通信,I2C 地址为 0x51*
**函数原型:**
diff --git a/docs/zh_CN/api/tough/lcd.md b/docs/zh_CN/api/tough/lcd.md
index 31992aa5..0ae57476 100644
--- a/docs/zh_CN/api/tough/lcd.md
+++ b/docs/zh_CN/api/tough/lcd.md
@@ -4,6 +4,5 @@
## M5Display类
->在`M5.begin()`初始化中,已经创建了实例`lcd`并进行了初始化. 你可以用该实例中的API进行图案绘制与文本显示。
-
+>`M5Display`在继承了`TFT_eSPI`类的基础上增加对屏幕亮度调节与休眠唤醒等API,在`M5.begin()`初始化中,已经创建了实例`lcd`并进行了初始化. 你可以用该实例中的API进行图案绘制与文本显示。
diff --git a/docs/zh_CN/app/balac.md b/docs/zh_CN/app/balac.md
index e6d5e744..758e133e 100644
--- a/docs/zh_CN/app/balac.md
+++ b/docs/zh_CN/app/balac.md
@@ -62,7 +62,7 @@
-
- **Arduino**
配合JoyC HAT使用 [点击此处](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Hat/RoverC),获取完整程序.
单独使用 [点击此处](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Application/RoverC_Arduino_Alone),获取完整程序.
+- **UIFlow**
+
+
+
## 版本变更
diff --git a/docs/zh_CN/module/encoder.md b/docs/zh_CN/module/encoder.md
index 46095180..c1b64d97 100644
--- a/docs/zh_CN/module/encoder.md
+++ b/docs/zh_CN/module/encoder.md
@@ -106,7 +106,7 @@ M5Core与ENCODER之间的串行通信协议是I2C(地址:0x5E)
r, g, b: 0 ~ 254
*/
void Led(int led_index, int r, int g, int b){
- // IIC send data
+ // I2C send data
Wire.beginTransmission(Faces_Encoder_I2C_ADDR);
Wire.write(led_index);
Wire.write(r);
@@ -122,7 +122,7 @@ void Led(int led_index, int r, int g, int b){
void get_encoder_increment(void){
int temp_encoder_increment;
- // IIC read data
+ // I2C read data
Wire.requestFrom(Faces_Encoder_I2C_ADDR, 3);
if(Wire.available()){
temp_encoder_increment = Wire.read();// get increment
diff --git a/docs/zh_CN/module/goplus.md b/docs/zh_CN/module/goplus.md
index 41998d10..341a7fa7 100644
--- a/docs/zh_CN/module/goplus.md
+++ b/docs/zh_CN/module/goplus.md
@@ -10,7 +10,7 @@
配备2通道直流电机驱动、4通道舵机驱动接口、红外收发器、3个扩展端口B(GPIO端口).具备多种功能特性,能够帮助你快速搭建功能强大的电机应用.
-通信协议:IIC(0x61).
+通信协议:I2C(0x61).
### 产品特性
diff --git a/docs/zh_CN/module/goplus2.md b/docs/zh_CN/module/goplus2.md
index ac23870c..17d0b564 100644
--- a/docs/zh_CN/module/goplus2.md
+++ b/docs/zh_CN/module/goplus2.md
@@ -8,7 +8,7 @@
**GoPlus2** 是一款可堆叠的多功能电机舵机控制模块。下位机采用STM32F030C8T6,模块配备2路直流电机驱动接口,4路舵机驱动接口,可扩展3个PORT-B接口,满足模拟输入、数字输入输出的需求,同时支持红外(IR)发射与接收。模块提供一个DC直流电源接口用于外部供电,此外模块内部有500mAh电池,可通过M5Core主机对其充电。
-通信协议:IIC(0x38)
+通信协议:I2C(0x38)
### 产品特性
diff --git a/docs/zh_CN/product_list.json b/docs/zh_CN/product_list.json
index 07c32e39..24d5b7ba 100644
--- a/docs/zh_CN/product_list.json
+++ b/docs/zh_CN/product_list.json
@@ -66,6 +66,7 @@
{"a":"/#/zh_CN/unit/4relay", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/4relay.webp", "p":"4-RELAY", "sku":"U097" ,"kw":"SWITCH", "category":"I/0"},
{"a":"/#/zh_CN/unit/extio", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_extio_01.webp", "p":"EXT.IO", "sku":"U011" ,"kw":"PCA9554PW"},
{"a":"/#/zh_CN/unit/dac", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_dac_01.webp", "p":"DAC", "sku":"U012" ,"kw":"MCP4725"},
+ {"a":"/#/zh_CN/unit/dds", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_dds_01.webp", "p":"DDS", "sku":"U105" ,"kw":"AD9833 信号源 信号发生器"},
{"a":"/#/zh_CN/unit/relay", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_relay_01.webp", "p":"RELAY", "sku":"U023" ,"kw":"SWITCH"},
{"a":"/#/zh_CN/unit/hub", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_hub_01.webp", "p":"HUB", "sku":"U006" ,"kw":"CONNECTOR"},
{"a":"/#/zh_CN/unit/pahub", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_pahub_p1.webp", "p":"PaHUB", "sku":"U040" ,"kw":"CONNECTOR"},
diff --git a/docs/zh_CN/tool/usb_downloader.md b/docs/zh_CN/tool/usb_downloader.md
index 45ea713c..a71c1244 100644
--- a/docs/zh_CN/tool/usb_downloader.md
+++ b/docs/zh_CN/tool/usb_downloader.md
@@ -1,4 +1,4 @@
-# Accessory ESP32-Downloader
+# ESP32-Downloader
-该 Unit 与 M5Core 通过 PORT A 接口 ( IIC ) 通信,其 I2C 地址是 0x29 。
+该 Unit 与 M5Core 通过 PORT A 接口 ( I2C ) 通信,其 I2C 地址是 0x29 。
## 产品特性
@@ -60,7 +60,7 @@
yCN*L;mz@@cm2b60k`l(?$m;>kZ(Se>
zHcIlk6jM3N+v@JJ|14~e&l-gCoe8mTxA=eXWy6$9Z{BRxR^km?cwnCD({FPOdw34Z
z{MzcUgG)Yb