From 1194b3f2727da6bcd4fccd1b558e2a30dc93237a Mon Sep 17 00:00:00 2001 From: Gitshaoxiang <1026025056@qq.com> Date: Tue, 17 Mar 2020 11:59:41 +0800 Subject: [PATCH] change form style --- docs/assets/css/main-min.css | 166 ++++++------------- docs/en/core/basic.md | 307 ++++++++++++++++++++++------------- docs/en/core/face_kit.md | 1 - 3 files changed, 241 insertions(+), 233 deletions(-) diff --git a/docs/assets/css/main-min.css b/docs/assets/css/main-min.css index f9094674..36472b22 100644 --- a/docs/assets/css/main-min.css +++ b/docs/assets/css/main-min.css @@ -657,119 +657,6 @@ body[data-page="zh_CN/README.md"] .markdown-section { } } -.table_center tr { - text-align: center -} - -.table-wrapper { - box-shadow: -7px 0 20px 0 #888 -} - -.fl-table { - border-radius: 5px; - font-size: 12px; - font-weight: normal; - border: 0; - border-collapse: collapse; - width: 100%; - max-width: 100%; - white-space: nowrap; - background-color: white -} - -.fl-table td,.fl-table th { - text-align: center !important; - padding: 18px -} - -.fl-table td { - border-right: 1px solid #f8f8f8; - font-size: 12px -} - -.fl-table thead th { - color: #fff; - background: #4fc3a1 -} - -.fl-table thead th:nth-child(odd) { - color: #fff; - background: #324960 -} - -.fl-table tr:nth-child(even) { - background: #f8f8f8 -} - -@media screen and (max-width:768px) { - .fl-table { - display: block !important; - width: 100%; - overflow-x: auto - } - - .fl-table thead,.fl-table tbody,.fl-table thead th { - display: block - } - - .fl-table thead th:last-child { - border-bottom: 0 - } - - .fl-table thead { - float: left; - display: block !important - } - - .fl-table tbody { - width: auto; - position: relative; - overflow-x: auto - } - - .fl-table td,.fl-table th { - padding: 20px .625em .625em .625em; - height: 60px; - vertical-align: middle; - box-sizing: border-box; - overflow-x: auto; - overflow-y: auto; - width: 120px; - font-size: 13px; - text-overflow: ellipsis - } - - .fl-table thead th { - text-align: left; - border-bottom: 1px solid #f7f7f9 - } - - .fl-table tbody tr { - display: table-cell !important - } - - .fl-table tbody tr:nth-child(odd) { - background: 0 - } - - .fl-table tr:nth-child(even) { - background: transparent - } - - .fl-table tr td:nth-child(odd) { - background: #f8f8f8; - border-right: 1px solid #e6e4e4 - } - - .fl-table tr td:nth-child(even) { - border-right: 1px solid #e6e4e4 - } - - .fl-table tbody td { - display: block; - text-align: center - } -} mark { background-color: #888; @@ -1217,7 +1104,8 @@ mark { .markdown-section h1 { font-family: Montserrat; font-weight: 1000; - font-size: 48px; + font-size: 48px; + display: inline; } .markdown-section h2 { @@ -1231,7 +1119,51 @@ mark { font-family: Montserrat; } -/* .markdown-section p:nth-of-type(1){ - margin-top:-15px; -} */ +.product_sku_tag { + margin-left: 5px; + margin-top: 5px; +} + +/* Border styles */ +.table-1 thead, .table-1 tr { + border-top-width: 1px; + border-top-style: solid; + border-top-color: #aabfdc +} + +.table-1 { + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: #aabfdc; + border-top-width: 1px; + border-top-style: solid; + border-top-color: #aabfdc; + overflow: auto; + display: inline-block !important; + /* padding-bottom: 5px; */ +} + +/* Padding and font style */ +.table-1 td, .table-1 th { + padding: 5px 10px; + font-size: 12px; + font-family: Verdana; + color: #597da1; + border-color: hsl(212, 42%, 88%); +} + +/* Alternating background colors */ +.table-1 tr:nth-child(even) { + background: #d3dfed +} +.table-1 tr:nth-child(odd) { + background: #FFF +} + +@media screen and (max-width:768px) { + .table-1 { + display: block !important; + overflow: scroll; + } +} diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index b2b1a7c6..1539aed5 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -1,5 +1,7 @@ # BASIC +
SKU:XXXXXX
+
## Description @@ -82,7 +84,6 @@ The newly-produced M5Core replaces the screen with better display performance an - ## Peripherals Pin Map **LCD & TF Card** @@ -97,122 +98,198 @@ The newly-produced M5Core replaces the screen with better display performance an TF CardMOSIMISOCLK CS -Button & Speaker - - - - +
ESP32 ChipGPIO39GPIO38GPIO37GPIO25
Button PinBUTTON ABUTTON BBUTTON C
Speaker DA PIN
+ + + + + + + + + + + + + + + + + + + + + + +
ESP32 ChipGPIO22GPIO215VGND
GROVE ASCLSDA5VGND
IP5306SCLSDA5VGND
+Button & Speaker + + + + + + + + + + + + + + + + + + + + + + + + +
ESP32 ChipGPIO39GPIO38GPIO37GPIO25
Button PinBUTTON ABUTTON BBUTTON C
Speaker///DA PIN
+ + GROVE Port A & IP5306 -*We've use the customized I2C version of IP5306, on power management.* - -*Its I2C address is 0x75. Click [here](https://github.com/m5stack/M5-Schematic/blob/master/Core/IIC_IP5306_REG_V1.4.pdf) to check its datasheet* - - - - - +
ESP32 ChipGPIO22GPIO215VGND
GROVE ASCLSDA5VGND
IP5306SCLSDA5VGND
+ + + + + + + + + + + + + + + + + + + + + + +
ESP32 ChipGPIO22GPIO215VGND
GROVE ASCLSDA5VGND
IP5306SCLSDA5VGND
-IP5306 charging/discharging，Voltage parameter - - - - - - - - - - - - - - - - - - - - - - - - - +## IP5306 charging/discharging，Voltage parameter +
charging - discharging
0.00 ~ 3.40V -> 0% - 4.20 ~ 4.07V -> 100%
3.40 ~ 3.61V -> 25% - 4.07 ~ 3.81V -> 75%
3.61 ~ 3.88V -> 50% - 3.81 ~ 3.55V -> 50%
3.88 ~ 4.12V -> 75% - 3.55 ~ 3.33V -> 25%
4.12 ~ / -> 100% - 3.33 ~ 0.00V -> 0%
+ + + + + + + + + + + + + + + + + + + + + + + + + +
chargingdischarging
0.00 ~ 3.40V -> 0%4.20 ~ 4.07V -> 100%
3.40 ~ 3.61V -> 25%4.07 ~ 3.81V -> 75%
3.61 ~ 3.88V -> 50%3.81 ~ 3.55V -> 50%
3.88 ~ 4.12V -> 75%3.55 ~ 3.33V -> 25%
4.12 ~ / -> 100%3.33 ~ 0.00V -> 0%
+ ## Parameter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
ResourcesParameter
ESP32240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth
Flash Memory4MB
Power Input5V @ 500mA
PortTypeC x 1, GROVE(I2C+I/0+UART) x 1
IPS Screen2 inch, 320x240 Colorful TFT LCD, ILI9342C
Speaker1W-0928
Battery110mAh @ 3.7V
Operating Temperature 32°F to 104°F ( 0°C to 40°C )
Size54 x 54 x 12.5 mm
Case MaterialPlastic ( PC )
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ResourcesParameter
ESP32240MHz dual core, 600 DMIPS, 520KB SRAM, Wi-Fi, dual mode Bluetooth
Flash Memory4MB
Power Input5V @ 500mA
PortTypeC x 1, GROVE(I2C+I/0+UART) x 1
IPS Screen2 inch, 320x240 Colorful TFT LCD, ILI9342C
Speaker1W-0928
Battery110mAh @ 3.7V
Operating Temperature 32°F to 104°F ( 0°C to 40°C )
Size54 x 54 x 12.5 mm
Case MaterialPlastic ( PC )
- **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) -- ESP32 has two 8-bit DAC (digital to analog converter) channels, connected to GPIO25 (Channel 1) and GPIO26 (Channel 2) + + + + + + + + + + + + + + + + + + + + + +
ADC1ADC2DAC1DAC2
8 channels10 channels2 channels2 channels
G32-39G0/2/4/12-15/25-27G25G26
-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 @@ -234,26 +311,26 @@ For more information about Pin assignment and Pin Remapping, Please refer to EPS ## Version Change -
- - - - - - - - - +
Release DateProduct Change
+ + + + + + + - - + + + - - -
Release DateProduct ChangeNote:
2017.7 Initial public release
/
2019.7 TN screen changed to IPS screen
-
+ before use . pls upgrade your M5Stack library to the latest version (after 0.2.8) to solve screen reverse color problem. + + + + ## Schematic diff --git a/docs/en/core/face_kit.md b/docs/en/core/face_kit.md index 121e03ad..f8d947fd 100644 --- a/docs/en/core/face_kit.md +++ b/docs/en/core/face_kit.md @@ -244,7 +244,6 @@ The error message displayed on the screen, is actually normal, it doesn't mean s