diff --git a/docs/assets/css/main-min.css b/docs/assets/css/main-min.css
index 7b164a23..9cb4a96e 100644
--- a/docs/assets/css/main-min.css
+++ b/docs/assets/css/main-min.css
@@ -31,15 +31,13 @@ img {
.markdown-section {
max-width: 80%;
- margin-top: 50px
+ margin-top: 50px;
+ padding: 2rem 10px 2rem 60px;
}
.markdown-section a {
- color: var(--theme-color,#42b983)
-}
-
-.markdown-section iframe[src*="buttons.github.io"] {
- margin: 0
+ /* color: var(--theme-color,#42b983) */
+ color: hsl(211, 100%, 50%);
}
body[data-page="zh_CN/uiflow/uiflow_home_page.md"] article.markdown-section {
@@ -1101,10 +1099,6 @@ mark {
}
-
-
-
-
.markdown-section h1 {
font-family: Montserrat;
font-weight: 1000;
@@ -1129,14 +1123,15 @@ mark {
margin-top: 5px;
}
+
/* Border styles */
-.table-1 thead, .table-1 tr {
+table thead, table tr {
border-top-width: 1px;
border-top-style: solid;
- border-top-color: #aabfdc
+ border-top-color: #aabfdc;
}
-.table-1 {
+table {
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: #aabfdc;
@@ -1144,30 +1139,30 @@ mark {
border-top-style: solid;
border-top-color: #aabfdc;
overflow: auto;
- display: inline-block !important;
+ display: table !important;
/* padding-bottom: 5px; */
}
/* Padding and font style */
-.table-1 td, .table-1 th {
+table td, table th {
padding: 5px 10px;
- font-size: 12px;
- font-family: Verdana;
- color: #597da1;
+ font-size: 13px;
+ font-family: Montserrat;
+ color: #597da1 !important;
border-color: hsl(212, 42%, 88%);
}
/* Alternating background colors */
-.table-1 tr:nth-child(even) {
- background: #d3dfed
+table tr:nth-child(even) {
+ background: #d3dfed !important;
}
-.table-1 tr:nth-child(odd) {
- background: #FFF
+table tr:nth-child(odd) {
+ background: #FFF !important;
}
@media screen and (max-width:768px) {
- .table-1 {
+ table {
display: block !important;
overflow: scroll;
}
-}
+}
\ No newline at end of file
diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md
index 3267885a..2c31b3e4 100644
--- a/docs/en/core/basic.md
+++ b/docs/en/core/basic.md
@@ -239,12 +239,36 @@ GROVE Port A & IP5306
-**Notice1:M5PORT EXPLAIN**
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Singel-bus communication, Blue is PortC(16/17) can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color for specify which port it should go in on the M5Core.
-Those port identification is a convenience for UIFlow (Blockly) Users. For advanced using ,you can do you own customization, since most of the PIN on ESP32 are remapping-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
+## M5PORT EXPLAIN
-
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
+
+## ESP32 ADC/DAC
+
+
ADC1
ADC2
@@ -267,7 +291,7 @@ Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
### Kit includes
@@ -283,7 +307,7 @@ For more information about Pin assignment and Pin Remapping, Please refer to EPS
## Version Change
-
+
Release Date
Product Change
@@ -300,6 +324,11 @@ For more information about Pin assignment and Pin Remapping, Please refer to EPS
TN screen changed to IPS screen
before use . pls upgrade your M5Stack lib to the latest version (after 0.2.8) to solve screen reverse color problem.
+
+
2020.3
+
Battery capacity changed from 150mAh to 110mAh
+
/
+
diff --git a/docs/en/core/face_kit.md b/docs/en/core/face_kit.md
index 627ea312..5c725323 100644
--- a/docs/en/core/face_kit.md
+++ b/docs/en/core/face_kit.md
@@ -198,23 +198,66 @@ Other than 3 functional panels, this development kit comes with more stuff like
+
+## M5PORT EXPLAIN
+
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
+
+## ESP32 ADC/DAC
+
+
+
+
ADC1
+
ADC2
+
DAC1
+
DAC2
+
+
+
+
8 channels
+
10 channels
+
2 channels
+
2 channels
+
+
+
G32-39
+
G0/2/4/12-15/25-27
+
G25
+
G26
+
+
+
+
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
+
+
## Example
- [Example](https://github.com/m5stack/M5Stack/tree/master/examples/Modules/FACES)
-**Notice1:M5PORT EXPLAIN**
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Single-bus communication, Blue is PortC(16/17) which can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color to specify which port it should go in on the M5Core.
-Those port identifications are a convenience for UIFlow (Blockly) users. For advanced users ,you can do your own customization, since most of the PIN on ESP32 are remap-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
-
-- ADC1(8 channels atteched to GPIOs 32-39)
-- ADC2(10 channels atteched to GPIOs 0,2,4,12-15,25-27)
-
-To use AD read function :
-1, Use Dupont cable refers to the pins on the side which can be used as an AD channel.
-2, Get a M5GO bottom, which comes with a PortB.
-3, Get a PbHUB and connect it with PortA, then you can have 6 PortBs.
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
**Notice3:Face Kit factory test code**
The error message displayed on the screen, is actually normal, it doesn't mean something wrong with the hardware, it means that the main.py file is missing, but you can add your own, don't worry.
diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md
index cad0c49e..60cf18d2 100644
--- a/docs/en/core/fire.md
+++ b/docs/en/core/fire.md
@@ -90,7 +90,7 @@ TF card Maximum size 16GB
ESP32 Chip
GPIO39
GPIO38
GPIO37
GPIO25
-
Button Pin
BUTTON A
BUTTON B
BUTTON C
+
Button Pin
BUTTON A
BUTTON B
BUTTON C
/
Speaker
Speaker Pin
@@ -235,19 +235,59 @@ BMM150 I2C address 0x10
-**Notice1:M5PORT EXPLAIN **
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Singel-bus communication, Blue is PortC(16/17) can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color for specify which port it should go in on the M5Core.
-Those port identification is a convenience for UIFlow (Blockly) Users. For advanced using ,you can do you own customization, since most of the PIN on ESP32 are remapping-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
+## M5PORT EXPLAIN
-- ADC1(8 channels atteched to GPIOs 32-39)
-- ADC2(10 channels atteched to GPIOs 0,2,4,12-15,25-27)
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
-To use AD read function :
-1, Use Dupont cable refers to the pins on the side which can be used as an AD channel.
-2, Get a M5GO bottom, which comes with a PortB.
-3, Get a PbHUB and connect it with PortA, then you can have 6 PortBs.
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
+## ESP32 ADC/DAC
+
+
+
+
ADC1
+
ADC2
+
DAC1
+
DAC2
+
+
+
+
8 channels
+
10 channels
+
2 channels
+
2 channels
+
+
+
G32-39
+
G0/2/4/12-15/25-27
+
G25
+
G26
+
+
+
+
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
## Include
@@ -284,24 +324,29 @@ For more information about Pin assignment and Pin Remapping, Please refer to EPS
Release Date
Product Change
+
Note:
2018.6
Initial public release
+
/
2019.7
MPU9250 changed to SH200Q+BMM150, TN screen changed to IPS screen
+
before use . pls upgrade your M5Stack lib to the latest version (after 0.2.8) to solve screen reverse color problem.
2019.8
SH200Q changed to MPU6886
+
/
2019.11
Battery capacity changed from 600mAh to 500mAh
+
/
diff --git a/docs/en/core/gray.md b/docs/en/core/gray.md
index cd199285..6e0d889b 100644
--- a/docs/en/core/gray.md
+++ b/docs/en/core/gray.md
@@ -211,19 +211,59 @@ BMM150 I2C address 0x10
-**Notice1:M5PORT EXPLAIN**
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Singel-bus communication, Blue is PortC(16/17) can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color for specify which port it should go in on the M5Core.
-Those port identification is a convenience for UIFlow (Blockly) Users. For advanced using ,you can do you own customization, since most of the PIN on ESP32 are remapping-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
+## M5PORT EXPLAIN
-- ADC1(8 channels atteched to GPIOs 32-39)
-- ADC2(10 channels atteched to GPIOs 0,2,4,12-15,25-27)
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
-To use AD read function :
-1, Use Dupont cable refers to the pins on the side which can be used as an AD channel.
-2, Get a M5GO bottom, which comes with a PortB.
-3, Get a PbHUB and connect it with PortA, then you can have 6 PortBs.
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
+## ESP32 ADC/DAC
+
+
+
+
ADC1
+
ADC2
+
DAC1
+
DAC2
+
+
+
+
8 channels
+
10 channels
+
2 channels
+
2 channels
+
+
+
G32-39
+
G0/2/4/12-15/25-27
+
G25
+
G26
+
+
+
+
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
## Include
- 1x Gray
diff --git a/docs/en/core/m5go.md b/docs/en/core/m5go.md
index 6bed9b5b..9cb95550 100644
--- a/docs/en/core/m5go.md
+++ b/docs/en/core/m5go.md
@@ -230,19 +230,59 @@ BMM150 I2C address 0x10
-**Notice1:M5PORT EXPLAIN**
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Singel-bus communication, Blue is PortC(16/17) can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color for specify which port it should go in on the M5Core.
-Those port identification is a convenience for UIFlow (Blockly) Users. For advanced using ,you can do you own customization, since most of the PIN on ESP32 are remapping-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
+## M5PORT EXPLAIN
-- ADC1(8 channels atteched to GPIOs 32-39)
-- ADC2(10 channels atteched to GPIOs 0,2,4,12-15,25-27)
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
-To use AD read function :
-1, Use Dupont cable refers to the pins on the side which can be used as an AD channel.
-2, Get a M5GO bottom, which comes with a PortB.
-3, Get a PbHUB and connect it with PortA, then you can have 6 PortBs.
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
+## ESP32 ADC/DAC
+
+
+
+
ADC1
+
ADC2
+
DAC1
+
DAC2
+
+
+
+
8 channels
+
10 channels
+
2 channels
+
2 channels
+
+
+
G32-39
+
G0/2/4/12-15/25-27
+
G25
+
G26
+
+
+
+
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
## Include
diff --git a/docs/en/core/m5go_lite.md b/docs/en/core/m5go_lite.md
index 9f417065..25c74e85 100644
--- a/docs/en/core/m5go_lite.md
+++ b/docs/en/core/m5go_lite.md
@@ -228,19 +228,60 @@ BMM150 I2C address 0x10
-**Notice1:M5PORT EXPLAIN**
-You can identify the port name and function by its color, red is PortA(21/22) mainly used for I2C, black is PortB(26/36) which can be used for DA/AD, Singel-bus communication, Blue is PortC(16/17) can be used for Uart. Correspondingly, most of the M5 Units have the Port with matched color for specify which port it should go in on the M5Core.
-Those port identification is a convenience for UIFlow (Blockly) Users. For advanced using ,you can do you own customization, since most of the PIN on ESP32 are remapping-able.
-Unfortunatly, PortA(red) can not be used as analog read in. It refers to GPIO 21 & 22 from ESP32, which doesn't have AD channel alternatives:
-- ADC1(8 channels atteched to GPIOs 32-39)
-- ADC2(10 channels atteched to GPIOs 0,2,4,12-15,25-27)
+## M5PORT EXPLAIN
-To use AD read function :
-1, Use Dupont cable refers to the pins on the side which can be used as an AD channel.
-2, Get a M5GO bottom, which comes with a PortB.
-3, Get a PbHUB and connect it with PortA, then you can have 6 PortBs.
-For more information about Pin assignment and Pin Remapping, Please refer to EPS32 Datasheet
+
+
+
PORT
+
PIN
+
Note:
+
+
+
+
PORT-A(Red)
+
G21/22
+
I2C
+
+
+
PORT-B(Black)
+
G26/36
+
DAC/ADC
+
+
+
PORT-C(Blue)
+
G16/17
+
UART
+
+
+
+
+## ESP32 ADC/DAC
+
+
+
+
ADC1
+
ADC2
+
DAC1
+
DAC2
+
+
+
+
8 channels
+
10 channels
+
2 channels
+
2 channels
+
+
+
G32-39
+
G0/2/4/12-15/25-27
+
G25
+
G26
+
+
+
+
+For more information about Pin assignment and Pin Remapping, Please refer to [ESP32 Datasheet](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/esp32_datasheet_en.pdf)
## Package Includes:
diff --git a/docs/en/core/m5stickc.md b/docs/en/core/m5stickc.md
index 37a6e029..243ef32f 100644
--- a/docs/en/core/m5stickc.md
+++ b/docs/en/core/m5stickc.md
@@ -175,20 +175,29 @@ Resolution:80 * 160