From 0c45dfb543d69c6a3395920a38280c056419bf3a Mon Sep 17 00:00:00 2001 From: vany5921 <908744431@qq.com> Date: Tue, 21 Apr 2020 09:48:26 +0800 Subject: [PATCH 1/4] update led Specifications --- docs/en/core/atom_lite.md | 2 +- docs/en/core/atom_matrix.md | 2 +- docs/en/unit/neoflash.md | 2 +- docs/en/unit/neopixel.md | 2 +- docs/zh_CN/atom_base/Tail-485.md | 70 ++++++++++++++++++++++++++++++++ docs/zh_CN/atom_base/Tail-BaT.md | 70 ++++++++++++++++++++++++++++++++ docs/zh_CN/hat/hat-neoflash.md | 2 +- docs/zh_CN/unit/catear.md | 14 ++----- docs/zh_CN/unit/neopixel.md | 2 +- 9 files changed, 149 insertions(+), 17 deletions(-) create mode 100644 docs/zh_CN/atom_base/Tail-485.md create mode 100644 docs/zh_CN/atom_base/Tail-BaT.md diff --git a/docs/en/core/atom_lite.md b/docs/en/core/atom_lite.md index e613a33b..399fa6d5 100644 --- a/docs/en/core/atom_lite.md +++ b/docs/en/core/atom_lite.md @@ -11,7 +11,7 @@ ## Product Features - ESP32-based -- RGB LED +- RGB LED(SK6812) - Programmable button - Built-in Infra-red - Extendable Pins & Holes diff --git a/docs/en/core/atom_matrix.md b/docs/en/core/atom_matrix.md index 81f38d21..ab73c3ce 100644 --- a/docs/en/core/atom_matrix.md +++ b/docs/en/core/atom_matrix.md @@ -14,7 +14,7 @@ - ESP32 PICO-based - Programmable button -- 5 * 5 RGB LED matrix panel +- 5 * 5 RGB LED matrix panel(WS2812C) - Buitl-in Infra-red LED - Built-in MPU6886 Inertial Sensor - Extendable Pins & Holes diff --git a/docs/en/unit/neoflash.md b/docs/en/unit/neoflash.md index 13e87114..a807001e 100644 --- a/docs/en/unit/neoflash.md +++ b/docs/en/unit/neoflash.md @@ -6,7 +6,7 @@ ## Description -**NEOFLASH** is a RGB LED panel with 192 RGB LED(24x8). +**NEOFLASH** is a RGB LED panel with 192 RGB LED(WS2812C). When you program this Unit, please pay attention to the sequence of the RGB LEDs. From top left (Where PIR placed) to right, and top to bottom. Connect this unit with M5Core via GROVE PORTB Single-Bus. diff --git a/docs/en/unit/neopixel.md b/docs/en/unit/neopixel.md index 0020cbc0..681f29bf 100644 --- a/docs/en/unit/neopixel.md +++ b/docs/en/unit/neopixel.md @@ -6,7 +6,7 @@ ## Description -**RGB LED** is a extendable strip light with RGB LED lined on. Just in case you haven’t heard about RGB LED yet, RGB LED features digitally addressable LEDs,which means each led can display RGB color and brightness individually. It is very easy to program by Single-BUS with simple protocol. Another feature is the extension and flexiblulity.You can even connect many of them up together to create a massive long LED display. It's important to note that, the brightness and the quantity of LEDs matters the most to the power consuming, if you have a bunch of them connectted up, you will need extra power supply. +**RGB LED** is a extendable strip light with RGB LED(SK6812) lined on. Just in case you haven’t heard about RGB LED yet, RGB LED features digitally addressable LEDs,which means each led can display RGB color and brightness individually. It is very easy to program by Single-BUS with simple protocol. Another feature is the extension and flexiblulity.You can even connect many of them up together to create a massive long LED display. It's important to note that, the brightness and the quantity of LEDs matters the most to the power consuming, if you have a bunch of them connectted up, you will need extra power supply. *Notice: please pay attention to the direction of the input port and output port* diff --git a/docs/zh_CN/atom_base/Tail-485.md b/docs/zh_CN/atom_base/Tail-485.md new file mode 100644 index 00000000..3604d8c8 --- /dev/null +++ b/docs/zh_CN/atom_base/Tail-485.md @@ -0,0 +1,70 @@ +# Tail-Bat + +

| 规格 | +参数 | +
|---|---|
| 外接端口 | +VH-3.96 4P | +
| 尺寸 | +47 x 34 x 18mm | +
| 重量 | +42g | +
| 外壳材质 | +Plastic ( PC ) | +

| 规格 | +参数 | +
|---|---|
| 外接端口 | +VH-3.96 4P | +
| 尺寸 | +47 x 34 x 18mm | +
| 重量 | +42g | +
| 外壳材质 | +Plastic ( PC ) | +
@@ -118,8 +118,6 @@ Click here to download [examples](https://github.com/m5stack/M5-ProductExampleCo
var purchase_link = 'https://m5stack.com/collections/all/products/bala-c-esp32-development-mini-self-balancing-car';
- var quickstart_link = '';
-
anchor_search(purchase_link);
scrollFunc();
diff --git a/docs/en/atom_base/atomic.md b/docs/en/atom_base/atomic.md
index f610a319..67b3cb26 100644
--- a/docs/en/atom_base/atomic.md
+++ b/docs/en/atom_base/atomic.md
@@ -6,21 +6,21 @@
## Description
-**ATOMIC** is a DIY Proto Kit specially adapted to Atom series, which is convenient for users to design small circuits or external hardware by themselves. It can be stacked with Atom directly through 9 pin arrangement. Two proto blank boards are provided in the kit, each of which provides more than 60 hole positions to meet the spatial layout requirements of users. A pair of 3.96 * 4P seats are contained to make the external electrical connection more reliable. The shell adopts the perforated design, which can meet the needs of heat dissipation and provide the use of non-closed space such as temperature and humidity measurement. The product provides a variety of fixation methods, such as suspension, Lego connection, screw fixation, etc. If you want to make a mini node controller with characteristics, ATOMIC should be the best choice.
+**ATOMIC** is a DIY Proto Kit designed specially for the Atom series, which makes it convenient for users to design small circuits or external hardware by themselves. It can be stacked with Atom directly via the 9 pins on the base. Two blank proto boards are provided in the kit, each of which provides more than 60 hole positions to meet the spatial layout requirements of users. A pair of 3.96 4 pin connectors are contained to make the external electrical connection more reliable. The shell incorporates a series of ventilation holes which allow heat dissipation and allows for more accurate temperature and humidity readings from sensors. The product provides a variety of attachment methods, such as mounting hole, Lego connection, screw mounting, etc. If you want to make a mini controller with customized characteristics, ATOMIC should be the best choice.
## Product Features
- Compatible with Atom
-- Mini Fuselage
-- DIY Personality
+- Compact form factor
+- DIY Style
- Built-in Infra-red
-- Unclosed design
+- Open design
## Include
- 1x Proto Board
- 1x Proto Board(soldered pin/finished product)
-- 1x 4P VH-3.96 Plug&Plug Base
+- 1x 4P VH-3.96 Plug + Plug Base
- 1x 4P 2.0 Pins
- 1x 5P 2.0 Pins
- 1x ATOMIC Case
@@ -71,8 +71,6 @@
var purchase_link = 'https://m5stack.com/collections/all/products/atomic-proto-kit';
- var quickstart_link = '';
-
anchor_search(purchase_link);
scrollFunc();
diff --git a/docs/en/unit/envII.md b/docs/en/unit/envII.md
index b420d26c..70020a2e 100644
--- a/docs/en/unit/envII.md
+++ b/docs/en/unit/envII.md
@@ -6,11 +6,10 @@
## Description
-**ENV II** is a environment sensor which can be used for temperature, humidity and atmospheric pressure measurement. It is Built with SHT30 and BMP280.
-Supporting I2C interface, SHT30 is a digital temperature and humidity sensor with high precision and low power consumption. BMP280 is an absolute barometric pressure sensor which is especially designed for mobile applications. It offers the highest flexibility to optimize the device regarding power consumption, resolution and filter performance.
+**ENV II** is an environment sensor which can sense temperature, humidity and atmospheric pressure. It is built with SHT30 and BMP280 sensors and is programmed over I2C. SHT30 is a digital temperature and humidity sensor with high precision and low power consumption. BMP280 is an absolute barometric pressure sensor which is especially designed for mobile applications. It offers the highest flexibility to optimize the device regarding power consumption, resolution and filter performance.
-## Feature
+## Product Features
- High-precision
- Support IIC
From 7fc951d7935b29470295908dd4713fb7ff86f59a Mon Sep 17 00:00:00 2001
From: vany5921 <908744431@qq.com>
Date: Tue, 21 Apr 2020 16:10:54 +0800
Subject: [PATCH 3/4] add easyloader video
---
docs/en/app/ac_socket.md | 27 ++++++++++++++++++++++++
docs/en/module/commu.md | 31 ++++++++++++++++++++--------
docs/en/module/lora868.md | 31 ++++++++++++++++++++--------
docs/en/module/servo.md | 40 +++++++++++++++++++++++++-----------
docs/en/unit/op180.md | 31 ++++++++++++++++++++--------
docs/en/unit/op90.md | 31 ++++++++++++++++++++--------
docs/zh_CN/app/ac_socket.md | 27 ++++++++++++++++++++++++
docs/zh_CN/module/commu.md | 32 +++++++++++++++++++++--------
docs/zh_CN/module/lora868.md | 31 ++++++++++++++++++++--------
docs/zh_CN/module/servo.md | 31 ++++++++++++++++++++--------
docs/zh_CN/unit/op180.md | 31 ++++++++++++++++++++--------
docs/zh_CN/unit/op90.md | 2 +-
12 files changed, 267 insertions(+), 78 deletions(-)
diff --git a/docs/en/app/ac_socket.md b/docs/en/app/ac_socket.md
index 89663cce..9d177f69 100644
--- a/docs/en/app/ac_socket.md
+++ b/docs/en/app/ac_socket.md
@@ -49,6 +49,33 @@ Let's break it down a little bit, start with the bottom part.
- Smart AC Socket Outlet With wire control of RS485
+## 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)
+
+
+
## Example
[Please click here to download Arduino code](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/App/acSocketCtl)
diff --git a/docs/en/module/commu.md b/docs/en/module/commu.md
index cd7c7cb5..d460ce5d 100644
--- a/docs/en/module/commu.md
+++ b/docs/en/module/commu.md
@@ -53,15 +53,30 @@ Be care about TTL Interface. It is a UART Interface actually by default. But you
## 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)
-
-
->1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. It can be burned to the master through simple steps, and a series of function verification can be performed.(**Currently EasyLoader is only available for Windows OS**)
-
->2.After downloading the software, double-click to run the application, connect the M5 device to the computer via the data cable, select the port parameters, and click **"Burn"** to start burning.
-
-!>3.The CP210X (USB driver) needs to be installed before the EasyLoader is burned. [Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-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), M5StickC/V/T/ATOM series can be used without driver)
-
-
->1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. It can be burned to the master through simple steps, and a series of function verification can be performed.(**Currently EasyLoader is only available for Windows OS**)
-
->2.After downloading the software, double-click to run the application, connect the M5 device to the computer via the data cable, select the port parameters, and click **"Burn"** to start burning.
-
-!>3.The CP210X (USB driver) needs to be installed before the EasyLoader is burned. [Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-driver)
+
-
-
-
->1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. It can be burned to the master through simple steps, and a series of function verification can be performed.(**Currently EasyLoader is only available for Windows OS**)
-
->2.After downloading the software, double-click to run the application, connect the M5 device to the computer via the data cable, select the port parameters, and click **"Burn"** to start burning.
-
-!>3.The CP210X (USB driver) needs to be installed before the EasyLoader is burned. [Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-driver)
-
## PinMap
**Mega328 ISP**Download interface Pin foot definition
diff --git a/docs/en/unit/op180.md b/docs/en/unit/op180.md
index b562d955..50bfc977 100644
--- a/docs/en/unit/op180.md
+++ b/docs/en/unit/op180.md
@@ -39,15 +39,30 @@ The actuator of this Unit is consist of a pair of IR part, emitter side and rece
## 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)
-
-
->1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. It can be burned to the master through simple steps, and a series of function verification can be performed. .
-
->2. After downloading the software, double-click to run the application, connect the M5 device to the computer through the data cable, select the port parameters, click **"Burn"** to start burning. (**For M5StickC burning, please Set the baud rate to 750000 or 115200**)
-
-?>3. Currently EasyLoader is only suitable for Windows operating system, compatible with M5 system adopts ESP32 as the control core host. Before installing for M5Core, you need to install CP210X driver (you do not need to install with M5StickC as controller)[Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-driver)
+
## Example
diff --git a/docs/en/unit/op90.md b/docs/en/unit/op90.md
index 467b0d26..3ef6a3ac 100644
--- a/docs/en/unit/op90.md
+++ b/docs/en/unit/op90.md
@@ -39,15 +39,30 @@ The actuator of this Unit is consist of a pair of IR part, emitter side and rece
## 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)
-
-
->1.EasyLoader is a simple and fast program burner. Every product page in EasyLoader provides a product-related case program. It can be burned to the master through simple steps, and a series of function verification can be performed. .
-
->2. After downloading the software, double-click to run the application, connect the M5 device to the computer through the data cable, select the port parameters, click **"Burn"** to start burning. (**For M5StickC burning, please Set the baud rate to 750000 or 115200**)
-
-?>3. Currently EasyLoader is only suitable for Windows operating system, compatible with M5 system adopts ESP32 as the control core host. Before installing for M5Core, you need to install CP210X driver (you do not need to install with M5StickC as controller)[Click here to view the driver installation tutorial](en/related_documents/M5Burner#install-usb-driver)
+
## Example
diff --git a/docs/zh_CN/app/ac_socket.md b/docs/zh_CN/app/ac_socket.md
index 46b14345..78abe10f 100644
--- a/docs/zh_CN/app/ac_socket.md
+++ b/docs/zh_CN/app/ac_socket.md
@@ -53,6 +53,33 @@
- 智能AC插座
+## EasyLoader
+
+>EasyLoader是一个简洁快速的程序烧录器,其内置了一个产品相关的案例程序,通过简单步骤将其烧录至主控,即可进行一系列的功能验证.**(程序烧录前,请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动),M5StickC/V/T/ATOM系列可免驱动使用)**
+
+
+
## 案例程序
*Arduino代码示例 [点击这里](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/App/acSocketCtl).*
diff --git a/docs/zh_CN/module/commu.md b/docs/zh_CN/module/commu.md
index 067f9f03..c96c2609 100644
--- a/docs/zh_CN/module/commu.md
+++ b/docs/zh_CN/module/commu.md
@@ -53,16 +53,30 @@
## EasyLoader
-
-
-
-
->1.EasyLoader是一个简洁快速的程序烧录器,每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序,通过简单步骤将其烧录至主控,能够进行一系列的功能验证.**(目前EasyLoader仅适用于Windows操作系统)**
-
->2.下载软件后,双击运行应用程序,将M5设备通过数据线连接至电脑,选择端口参数,点击 **"Burn"** 即可开始烧录
-
-!>3.EasyLoader烧录前需要安装有CP210X(USB驱动程序),[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动)
+>EasyLoader是一个简洁快速的程序烧录器,其内置了一个产品相关的案例程序,通过简单步骤将其烧录至主控,即可进行一系列的功能验证.**(程序烧录前,请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动),M5StickC/V/T/ATOM系列可免驱动使用)**
+
## 管脚分配
diff --git a/docs/zh_CN/module/lora868.md b/docs/zh_CN/module/lora868.md
index 7110fcb0..57d9fc58 100644
--- a/docs/zh_CN/module/lora868.md
+++ b/docs/zh_CN/module/lora868.md
@@ -49,15 +49,30 @@ LoRa和LoRaWAN允许与不同类型的物联网(IoT)设备,进行远程连
## EasyLoader
-
+>EasyLoader是一个简洁快速的程序烧录器,其内置了一个产品相关的案例程序,通过简单步骤将其烧录至主控,即可进行一系列的功能验证.**(程序烧录前,请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动),M5StickC/V/T/ATOM系列可免驱动使用)**
-
-
->1.EasyLoader是一个简洁快速的程序烧录器,每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序,通过简单步骤将其烧录至主控,能够进行一系列的功能验证.**(目前EasyLoader仅适用于Windows操作系统)**
-
->2.下载软件后,双击运行应用程序,将M5设备通过数据线连接至电脑,选择端口参数,点击 **"Burn"** 即可开始烧录
-
-!>3.EasyLoader烧录前需要安装有CP210X(USB驱动程序),[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动)
+
## 案例程序
diff --git a/docs/zh_CN/module/servo.md b/docs/zh_CN/module/servo.md
index 1e006854..8e75c28a 100644
--- a/docs/zh_CN/module/servo.md
+++ b/docs/zh_CN/module/servo.md
@@ -34,15 +34,30 @@
## EasyLoader
-
+>EasyLoader是一个简洁快速的程序烧录器,其内置了一个产品相关的案例程序,通过简单步骤将其烧录至主控,即可进行一系列的功能验证.**(程序烧录前,请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动),M5StickC/V/T/ATOM系列可免驱动使用)**
-
-
->1.EasyLoader是一个简洁快速的程序烧录器,每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序,通过简单步骤将其烧录至主控,能够进行一系列的功能验证.**(目前EasyLoader仅适用于Windows操作系统)**
-
->2.下载软件后,双击运行应用程序,将M5设备通过数据线连接至电脑,选择端口参数,点击 **"Burn"** 即可开始烧录
-
-!>3.EasyLoader烧录前需要安装有CP210X(USB驱动程序),[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动)
+
## 管脚映射
diff --git a/docs/zh_CN/unit/op180.md b/docs/zh_CN/unit/op180.md
index 2d57706a..2ea12a86 100644
--- a/docs/zh_CN/unit/op180.md
+++ b/docs/zh_CN/unit/op180.md
@@ -25,15 +25,30 @@
## EasyLoader
-
+>EasyLoader是一个简洁快速的程序烧录器,其内置了一个产品相关的案例程序,通过简单步骤将其烧录至主控,即可进行一系列的功能验证.**(程序烧录前,请根据设备类型安装相应驱动程序. M5Core型主机[请点击此处查看CP210X驱动安装教程](zh_CN/arduino/arduino_development?id=安装串口驱动),M5StickC/V/T/ATOM系列可免驱动使用)**
-
-
->1.EasyLoader是一个简洁快速的程序烧录器,每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序,通过简单步骤将其烧录至主控,能够进行一系列的功能验证.
-
->2.下载软件后,双击运行应用程序,将M5设备通过数据线连接至电脑,选择端口参数,点击 **"Burn"** 即可开始烧录.(**为M5StickC烧录时,请将波特率设置在750000或115200**)
-
-?>3.目前EasyLoader仅适用于Windows操作系统、兼容M5体系采用ESP32作为控制核心的主机.在为M5Core烧录前需要安装CP210X驱动程序(使用M5StickC作为控制器的则无需安装)[点击此处查看驱动安装教程](zh_CN/related_documents/M5Burner#安装串口驱动)
+
## 原理图
diff --git a/docs/zh_CN/unit/op90.md b/docs/zh_CN/unit/op90.md
index d7766c2e..77e3f1fb 100644
--- a/docs/zh_CN/unit/op90.md
+++ b/docs/zh_CN/unit/op90.md
@@ -45,7 +45,7 @@
案例描述:
-显示温湿度与大气压数据.
+传感器被遮挡时输出1.
From 3e2b5089afe01dcb1b565bc542d00ead6cdfefe4 Mon Sep 17 00:00:00 2001 From: vany5921 <908744431@qq.com> Date: Tue, 21 Apr 2020 16:13:19 +0800 Subject: [PATCH 4/4] Update op90.md --- docs/en/unit/op90.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/unit/op90.md b/docs/en/unit/op90.md index 3ef6a3ac..790f03f9 100644 --- a/docs/en/unit/op90.md +++ b/docs/en/unit/op90.md @@ -45,15 +45,15 @@ The actuator of this Unit is consist of a pair of IR part, emitter side and rece