m5/m5-docs
0
0
Fork 0
mirror of https://github.com/m5stack/m5-docs.git synced 2026-05-20 10:23:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:m5stack/m5-docs

Browse Source
This commit is contained in:
ali-admin
2021-02-04 18:18:09 +08:00
parent 0f03818bc7 55a308e220
commit b86aad16bc
24 changed files with 1143 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/main-min.css
Vendored
+4 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/main.css
+252 -41
View File
@@ -42,11 +42,10 @@ img {
top: 50%;
left: 50px;
transform: translateY(-50%);
z-index: 50;
border-radius: 10px;
overflow: hidden;
box-shadow: 0px 1px 20px 1px #e6e6e6;
z-index: 1880;
z-index: 99;
}
#pc_anchor .el-submenu .el-menu-item {
@@ -134,7 +133,7 @@ img {
#pc_header {
position: fixed;
z-index: 999;
z-index: 150;
left: 0px;
top: 0px;
right: 0px;
@@ -163,24 +162,6 @@ img {
}
body[data-page="index.md"] .search {
display: inline-block;
}
body[data-page="en/faq.md"] .search {
display: inline-block
}
body[data-page="zh_CN/README.md"] .search {
display: inline-block;
}
body[data-page="zh_CN/faq.md"] .search {
display: inline-block
}
body[data-page="index.md"] .markdown-section {
margin-top: 0px;
max-width: 75%;
@@ -209,7 +190,6 @@ body[data-page="zh_CN/quick_start/m5stickv/m5stickv_quick_start.md"] article.mar
}
.pic {
width: 30%
}
@@ -420,9 +400,9 @@ div.card-img-overlay:hover {
.search {
position: fixed;
z-index: 2000;
top: 22px;
left: 260px;
z-index: 105;
top: 80px;
left: 80px;
padding: 0 20px
}
@@ -431,7 +411,7 @@ div.card-img-overlay:hover {
border: 0;
outline: 0;
background: #eee;
width: 240px;
width: 125px;
height: 38px;
padding: 0 0 0 20px
}
@@ -1031,7 +1011,7 @@ table tr:nth-child(odd) {
}
#search_cover {
z-index: 1998;
z-index: 100;
position: fixed;
top: 0;
right: 0;
@@ -1043,7 +1023,7 @@ table tr:nth-child(odd) {
#search_contant_box {
margin: 90px 15% 10% 15%;
margin: 150px 15% 10% 15%;
padding: 50px 100px 50px 100px;
background-color:#ffffffd6;
overflow: scroll;
@@ -1093,16 +1073,247 @@ table tr:nth-child(odd) {
cursor: pointer;
}
/* .product_eol {
background-color: #2b2b2bb8;
text-align: center;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 60px;
color: white;
height: 60px;
line-height: 60px;
border-radius: 50%;
} */
.nav-dropdown .dropdown-title {
display: flex;
justify-content: center;
align-items: center;
}
.logo {
background-repeat: no-repeat;
background-size: 100% 100%;
}
* {
margin: 0;
padding: 0;
box-sizing: border-box;
touch-action: none;
}
li {
list-style-type: none;
}
.container img {
width: 100%;
height: 100%;
}
a {
text-decoration: none;
}
button {
border: none;
background-color: transparent;
outline: none;
cursor: pointer;
}
header {
width: 100%;
height: 50px;
padding: 0 360px;
z-index: 1000;
}
@media screen and (max-width:1600px) {
header {
width: 100%;
height: 50px;
padding: 0 260px;
}
}
@media screen and (max-width:1400px) {
header {
width: 100%;
height: 50px;
padding: 0 220px;
}
}
.container {
position: relative;
width: 100%;
height: 100%;
display: flex;
margin: 0 auto;
align-items: center;
justify-content: flex-end;
}
.logo {
position: absolute;
left: 0;
width: 48px;
height: 41px;
/* background-image: url("/assets/LOGO.jpg"); */
}
.shop-btn,
.user-btn {
width: 24px;
height: 24px;
margin-right: 32px;
}
.language-btn {
width: 60px;
height: 20px;
}
.header-nav {
width: auto;
display: flex;
flex-direction: row;
justify-content: flex-end;
font-size: 14px;
color: #434343;
margin-right: 32px;
height: 100%;
}
.header-nav li {
cursor: pointer;
margin: 0px 0px 0px 32px;
line-height: 50px;
}
.nav-dropdown {
position: fixed;
top: 50px;
left: 0;
width: 100%;
height: 180px;
border-top: 1px solid #f1f1f1;
background-color: #fff;
z-index: 9999;
overflow: hidden;
animation: dropdown 0.1s ease;
box-shadow: 1px 2px 9px 0px #f9f9f9;
}
.nav-dropdown .dropdown-container {
width: 62%;
height: 100%;
display: flex;
margin: 0 auto;
padding: 25px 0;
}
@media screen and (max-width:1400px) {
.nav-dropdown .dropdown-container {
width: 80%;
height: 100%;
display: flex;
margin: 0 auto;
padding: 25px 0;
}
}
.nav-dropdown .dropdown-title {
width: 282px;
height: 100%;
font-size: 16px;
font-weight: 400;
color: #959595;
}
.nav-dropdown .dropdown-content {
flex: 1;
height: 100%;
border-left: 1px solid #E5E5E5;
}
@keyframes dropdown {
0% {
height: 0;
}
100% {
height: "*";
}
}
.dropdown-content-box {
width: 905px;
display: flex;
flex-wrap: wrap;
padding: 10px 10px 10px 50px;
}
.header-nav a {
color: #434343;
}
.dropdown-item {
display: flex;
flex-direction: row;
margin: 10px 20px;
width: 100px;
align-items: center;
}
.dropdown-item div {
width: 30px;
display: flex;
justify-content: center;
margin-right: 15px;
}
.dropdown-item img{
height: 30px;
width: auto;
}
.dropdown-item p {
color: #959595;
white-space:nowrap;
font-size: 1px;
flex: 1;
}
.dropdown-category a {
font-size: 1;
margin: 0;
padding: 0;
}
.dropdown-category {
line-height: 25px !important;
padding-left: 52px;
margin: 0 !important;
}
.dropdown-item2 {
display: flex;
flex-direction: row;
width: 160px;
align-items: center;
overflow: hidden;
}
.dropdown-item2 p {
color: #0064c2;
}
.dropdown-category p {
color: #959595;
}
.dropdown-item2 img {
height: 30px;
width: auto;
margin-right: 10px;
}
docs/assets/img/product_pics/atom_base/atom_socket/atom_socket_sch_01.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

docs/assets/img/product_pics/atom_base/atom_socket/atom_socket_sch_02.webp
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 KiB

docs/assets/js/custom.js
+335 -106
View File
File diff suppressed because it is too large Load Diff
docs/assets/js/custom.min.js
Vendored
+10 -19
View File
File diff suppressed because one or more lines are too long
docs/en/arduino/arduino_home_page.md
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="container uiflow_banner">
<div class="uiflow_banner">
<div>
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/home_page/arduino_home_page.webp">
</div>
docs/en/atom/atom_motion.md
+1
View File
@@ -77,6 +77,7 @@
<div><img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/easyloader_intro.webp"></div>
<div class="easyloader-btn">
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/Windows/ATOM_BASE/EasyLoader_Atom_Motion.exe">Windows</a>
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/MacOS/ATOM_BASE/EasyLoader_ATOM_Motion.dmg">MacOS</a>
</div>
</div>
<div>
docs/en/core/core2_for_aws.md
+1 -1
View File
@@ -16,7 +16,7 @@ Choose the development platform you want to use, view the corresponding tutorial
**Core2 for AWS** is the reference hardware kit for AWS IoT EduKit – a prescriptive learning program from AWS which makes it easy and cost effective to learn how to build IoT applications using AWS services. It comes equipped with a Microchip ATECC608 [Trust&GO](https://www.microchip.com/design-centers/security-ics/trust-platform/trust-go) pre-provisioned secure element, in addition to the existing features of the standard M5Stack Core2 and M5GO Bottom2. The Core2 for AWS is a feature rich, plug and play extensible, and secure hardware kit for learning and building a wide range of IoT applications.
To learn more about the **AWS IoT EduKit** program, visit [https://edukit.workshop.aws.](https://edukit.workshop.aws)
To learn more about the **AWS IoT EduKit** program, visit [https://edukit.workshop.aws](https://edukit.workshop.aws)
The Core2 for AWS comes with an ESP32-D0WDQ6-V3 microcontroller, which features dual Xtensa 32-bit LX6 cores and a main frequency up to 240Mhz, with 2.4GHz WiFi, Bluetooth v4.2 BR/EDR, and BLE support. Comes with 8MB PSRAM and 16MB flash on board.
docs/en/module/grbl13.2.md
+1
View File
@@ -87,6 +87,7 @@ The power input interface is DC/9-24V, the motor drive current can reach 1.5A, a
<div><img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/easyloader_intro.webp"></div>
<div class="easyloader-btn">
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/Windows/MODULE/EasyLoader_GRBL13.2.exe">Windows</a>
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/MacOS/MODULE/EasyLoader_GRBL13.2.dmg">MacOS</a>
</div>
</div>
<div>
docs/en/mpy/mpy_api_list.md
+1 -1
View File
@@ -25,7 +25,7 @@
<script>
const quickstart = {
'title':"快速上手/固件烧录",
'title':"Quick Start/Development environment setup tutorial",
'item':{
'BASIC / M5GO / FIRE / FACES':'#/en/arduino/arduino_development',
'M5StickC':'#/en/arduino/arduino_development',
docs/en/product_list.json
+22
View File
@@ -1,6 +1,7 @@
{
"Controllers": {
"core": [
{"id":"core"},
{"a":"/#/en/core/core2", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core2_01.webp", "p":"CORE2", "sku":"K010", "qs":"/#/en/quick_start/core2/m5stack_core2_quick_start" ,"kw":"ESP32 AXP192 MPU6886 BM8563 MICPHONE", "category":"M5Core/Kit"},
{"a":"/#/en/core/basic", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_basic_01.webp", "p":"BASIC", "sku":"K001", "qs":"/#/en/quick_start/m5core/m5stack_core_quick_start" ,"kw":"ESP32 IP5306"},
{"a":"/#/en/core/gray", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_gray_01.webp", "p":"GRAY", "sku":"K002", "qs":"/#/en/quick_start/m5core/m5stack_core_quick_start" ,"kw":"ESP32 IP5306 MPU6886 BMM150"},
@@ -9,23 +10,27 @@
{"a":"/#/en/core/core2_for_aws", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core2_for_aws_01.webp", "p":"CORE2 FOR AWS", "sku":"K010-AWS", "qs":"/#/en/quick_start/core2_for_aws/quick_start_list" ,"kw":"ESP32 AXP192 MPU6886 LEGO MICPHONE LED"}
],
"stick": [
{"id":"stick"},
{"a":"/#/en/core/m5stickc_plus", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_m5stickc_plus_01.webp", "p":"M5StickC PLUS", "sku":"K016-P", "qs":"/#/en/quick_start/m5stickc_plus/m5stickc_plus_quick_start" ,"kw":"ESP32 AXP192 MPU6886", "category":"M5Stick"},
{"a":"/#/en/core/m5stickc", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_m5stickc_01.webp", "p":"M5StickC", "sku":"K016-C", "qs":"/#/en/quick_start/m5stickc/m5stickc_quick_start" ,"kw":"ESP32 AXP192 MPU6886"},
{"a":"/#/en/core/m5stickt", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/m5stickt_01.webp", "p":"M5StickT", "sku":"K016-T" ,"kw":"ESP32 FLIR3.0 AXP192"},
{"a":"/#/en/core/m5stick", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/core_m5stick_01.webp", "p":"M5Stick", "sku":"K016", "qs":"/#/en/quick_start/m5stick/m5stick_quick_start" ,"kw":"ESP32 OLED IP5306 MPU9250"}
],
"atom": [
{"id":"atom"},
{"a":"/#/en/core/atom_lite", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/atom_lite_01.webp", "p":"ATOM LITE", "sku":"C008" ,"qs":"/#/en/quick_start/atom/atom_quick_start", "kw":"ESP32 LED", "category":"ATOM"},
{"a":"/#/en/core/atom_matrix", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/atom_matrix_01.webp", "p":"ATOM MATRIX", "sku":"C008-B", "qs":"/#/en/quick_start/atom/atom_quick_start" ,"kw":"ESP32 LED MPU6886"},
{"a":"/#/en/atom/atomecho", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/atom_echo.webp", "p":"ATOM ECHO", "sku":"C008-C","qs":"/#/en/quick_start/atom/atom_echo_quick_start" ,"kw":"ESP32 Speaker I2S"}
],
"e-paper": [
{"id":"e-paper"},
{"a":"/#/en/core/coreink", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/coreink_01.webp", "p":"CORE.INK", "sku":"K048", "qs":"/#/en/quick_start/coreink/quick_start_list" ,"kw":"ESP32 E-Ink", "category":"E-Paper"},
{"a":"/#/en/core/m5paper", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/m5paper_01.webp", "p":"M5PAPER", "sku":"K049", "qs":"/#/en/quick_start/m5paper/quick_start_arduino" ,"kw":"ESP32 E-Ink SHT30"}
]
},
"Sensors": {
"Sensors": [
{"id":"sensors"},
{"a":"/#/en/unit/sonic", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/ultrasonic.webp", "p":"UlTRASONIC", "sku":"U098" ,"kw":"DISTANCE ULTRASONIC SENSOR", "category":"Sensors"},
{"a":"/#/en/unit/mic", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/mic.webp", "p":"MIC", "sku":"U096" ,"kw":"MIC SOUND SENSOR"},
{"a":"/#/en/unit/ameter", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/ameter.webp", "p":"AMeter", "sku":"U086" ,"kw":"AMETER SENSOR"},
@@ -55,6 +60,7 @@
{"a":"/#/en/unit/imu", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/imu.webp", "p":"IMU", "sku":"U095" ,"kw":"MPU6886 IMU"}
],
"Acturators": [
{"id":"acturators"},
{"a":"/#/en/unit/unit_fan", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_fan_01.webp", "p":"FAN", "sku":"U063" ,"kw":"DC MOTOR", "category":"Acturators"},
{"a":"/#/en/unit/vibrator", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_vibrator_motor_01.webp", "p":"VIBRATOR-MOTOR", "sku":"U059" ,"kw":"DC MOTOR"},
{"a":"/#/en/unit/rgb_led_strip", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/rgb_led_strip_01.webp", "p":"RGB LED STRIP", "sku":"A093" ,"kw":"RGB LED NEOPIXEL SK6812 IP65"},
@@ -63,6 +69,7 @@
{"a":"/#/en/unit/rgb", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_rgb_01.webp", "p":"RGB", "sku":"U003" ,"kw":"RGB LED NEOPIXEL"}
],
"I-O": [
{"id":"i-o"},
{"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"},
@@ -82,6 +89,7 @@
{"a":"/#/en/unit/cardkb", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_cardkb_01.webp", "p":"CardKB", "sku":"U035" ,"kw":"CONTROLER KEYBOARD"}
],
"Transivers": [
{"id":"transivers"},
{"a":"/#/en/unit/ir", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_ir_01.webp", "p":"IR", "sku":"U002" ,"kw":"IR", "category":"Transivers"},
{"a":"/#/en/unit/gps", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_gps_01.webp", "p":"GPS", "sku":"U032" ,"kw":"AT6558"},
{"a":"/#/en/unit/rs485", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit_rs485_01.webp", "p":"RS485", "sku":"U034" ,"kw":"SP485EEN"},
@@ -93,6 +101,7 @@
{"a":"/#/en/unit/uwb", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/uwb_01.webp", "p":"UWB", "sku":"U100" ,"kw":"DW1000"}
],
"Add-ons": [
{"id":"add-ons"},
{"a":"/#/en/hat/hat_envII", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/hat/envii.webp", "p":"ENV II", "sku":"U053-B" ,"kw":"BMP280 BMM150 SHT30", "category":"C-HAT"},
{"a":"/#/en/hat/hat-spk", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/hat/spk_hat_01.webp", "p":"SPK", "sku":"U055" ,"kw":"MUSIC SPEAKER"},
{"a":"/#/en/hat/hat-env", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/hat/env_hat_01.webp", "p":"ENV", "sku":"U053" ,"kw":"DHT12 BMP280 BMM150"},
@@ -121,6 +130,7 @@
{"a":"/#/en/hat/hat_roverc_pro", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/hat/roverc_pro.webp", "p":"RoverC.Pro", "sku":"K036-B" ,"kw":"ROVERC ROBOT"}
],
"ATOM-BASE": [
{"id":"atom-base"},
{"a":"/#/en/atom/atomic", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/atom_base/atomic_01.webp", "p":"ATOMIC", "sku":"A077" ,"kw":"PROTOTYPE", "category":"ATOM-BASE"},
{"a":"/#/en/atom/tail485", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/atom_base/tail485_01.webp", "p":"Tail485", "sku":"T002" ,"kw":"RS485"},
{"a":"/#/en/atom/tailbat", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/atom_base/tailbat_01.webp", "p":"TailBat", "sku":"T001" ,"kw":"BATTERY POWER SUPPLY LIPO"},
@@ -142,6 +152,7 @@
},
"Modules": {
"Wireless":[
{"id":"wireless"},
{"a":"/#/en/module/comx_gps", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/comx_gps.webp", "p":"COM.GPS", "sku":"M031-G" ,"kw":"GPS M8N", "category":"Communication Modules"},
{"a":"/#/en/module/comx_gsm", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/comx_gsm.webp", "p":"COM.GSM", "sku":"M031-D" ,"kw":"SIM800C"},
{"a":"/#/en/module/comx_lorawan", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/comx_lorawan.webp", "p":"COM.LoRaWAN", "sku":"M031-C" ,"kw":"LoRaWAN"},
@@ -160,6 +171,7 @@
{"a":"/#/en/module/nb-iot_plus", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/nb_iot_plus.webp", "p":"NB-IoT Plus", "sku":"M030" ,"kw":"M5311GB"}
],
"Driver":[
{"id":"driver"},
{"a":"/#/en/module/grbl13.2", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/grbl13.2_01.webp", "p":"GRBL 13.2", "sku":"M035" ,"kw":"DRV8825PWPR STEPMOTOR", "category":"Driver Modules"},
{"a":"/#/en/module/servo2", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/servo2.webp", "p":"SERVO2", "sku":"M014-B" ,"kw":"PCA9685 SERVO"},
{"a":"/#/en/module/stepmotor", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_stepmotor_01.webp", "p":"STEPMOTOR", "sku":"M012" ,"kw":"GRBL DRV8825"},
@@ -168,6 +180,7 @@
{"a":"/#/en/module/fan", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_FAN.webp", "p":"FAN", "sku":"M013" ,"kw":"DC MOTOR"}
],
"Extention":[
{"id":"extention"},
{"a":"/#/en/module/goplus2", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/module/GoPlus2.webp", "p":"GoPlus 2", "sku":"M025-B" ,"kw":"SERVO DC MOTOR IR", "category":"Extention Modules"},
{"a":"/#/en/module/battery", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_battery_01.webp", "p":"BATTERY", "sku":"M002" ,"kw":"POWER SUPPLY LIPO"},
{"a":"/#/en/module/proto", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_proto_01.webp", "p":"PROTO", "sku":"M001" ,"kw":"PROTOTYPE"},
@@ -179,6 +192,7 @@
{"a":"/#/en/module/proto13.2_mesu", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/proto_13.2_mesu.webp", "p":"PROTO-MEAS 13.2", "sku":"M033" ,"kw":"PROTO 13.2 MEAS"}
],
"BASE":[
{"id":"base"},
{"a":"/#/en/base/w5500PoE", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/base/w5500PoE_01.webp", "p":"PoE", "sku":"K012-C" ,"kw":"W5500 INTERNET RS485 PoE", "category":"BASE"},
{"a":"/#/en/base/lan_base", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/base/base_lan_01.webp", "p":"LAN", "sku":"K012-B" ,"kw":"W5500 INTERNET RS485"},
{"a":"/#/en/base/btc_base", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/base/base_btc_01.webp", "p":"BTC", "sku":"A011-B" ,"kw":"DHT12 SHT30"},
@@ -192,6 +206,7 @@
{"a":"/#/en/base/basex", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/base/base_basex_01.webp", "p":"BaseX", "sku":"K037" ,"kw":"LEGO EV3 MOTOR"}
],
"FACE-Panels":[
{"id":"face-panels"},
{"a":"/#/en/core/face_kit", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/kit_faces_01.webp", "p":"FACES Kit", "sku":"K005", "qs":"/#/en/quick_start/m5core/m5stack_core_quick_start" ,"kw":"ESP32 IP5306 MPU6886 BMM150 MICPHONE", "category":"Panels-For-FACE"},
{"a":"/#/en/module/encoder", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_encoder_01.webp", "p":"ENCODER", "sku":"A006" ,"kw":"FACES"},
{"a":"/#/en/module/joystick", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/module_joystick_01.webp", "p":"JOYSTICK", "sku":"A007" ,"kw":"FACES"},
@@ -204,11 +219,13 @@
{"a":"/#/en/module/faces_gameboy", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/face_gamepad.webp", "p":"GAMEPAD", "sku":"A004" ,"kw":"FACES GAMEPAD"}
],
"Other": [
{"id":"other"},
{"a":"/#/en/module/ecg", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/module/ecg_01.webp", "p":"ECG", "sku":"M034" ,"kw":"AD8232", "category":"Other"}
]
},
"Cameras": {
"WiFi-Cameras": [
{"id":"wifi-Cameras"},
{"a":"/#/en/unit/timercam_x", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_x.webp", "p":"Timer Camera X", "sku":"U082-X", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA X", "category":"WiFi-Cameras"},
{"a":"/#/en/unit/timercam_f", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera_f_01.webp", "p":"Timer Camera F", "sku":"U082-F", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA FISH"},
{"a":"/#/en/unit/timercam", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/unit/timercamera.webp", "p":"Timer Camera", "sku":"U082", "qs":"/#/en/quick_start/timer_cam/quick_start_list" ,"kw":"ESP32 TIMER CAMERA"},
@@ -220,6 +237,7 @@
{"a":"/#/en/accessory/battery_base", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/battery_base_01.webp", "p":"M5CameraBattery", "sku":"A068" ,"kw":"BATTERY"}
],
"AI-Cameras": [
{"id":"ai-cameras"},
{"a":"/#/en/unit/unitv", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unit-v-01.webp", "p":"UNIT-V(OV2640)", "sku":"U078", "qs":"/#/en/quick_start/unitv/unitv_quick_start" ,"kw":"K210 CAMERA OV2640", "category":"AI-Cameras"},
{"a":"/#/en/unit/unitv_ov7740", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/unit/unitv_ov7740.webp", "p":"UNIT-V(OV7740)", "sku":"U078-C", "qs":"/#/zh_CN/quick_start/unitv/unitv_quick_start" ,"kw":"K210 CAMERA OV7740"},
{"a":"/#/en/core/m5stickv", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/core/m5stickv_01.webp", "p":"M5StickV", "sku":"K027" , "qs":"/#/en/quick_start/m5stickv/m5stickv_quick_start", "kw":"K210 CAMERA AXP192 MPU6886"}
@@ -227,6 +245,7 @@
},
"Kits": {
"Kits": [
{"id":"kits"},
{"a":"/#/en/app/bala2", "img":"https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/app/bala2.webp", "p":"BALA2", "sku":"K014-C" ,"kw":"BALA2 ROBOT", "category":"Kits"},
{"a":"/#/en/app/lidarbot", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/app/app_lidarbot_01.webp", "p":"LidarBOT", "sku":"K017" ,"kw":"ROBOT"},
{"a":"/#/en/app/piano", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/app/app_piano_01.webp", "p":"PIANO", "sku":"A047" ,"kw":"MUSIC"},
@@ -243,10 +262,12 @@
},
"Accessories": {
"Servos": [
{"id":"servos"},
{"a":"/#/en/accessory/sg90_servo", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/servo_01.webp", "p":"SG90 servo", "sku":"A076" ,"kw":"180 SERVO", "category":"Servos"},
{"a":"/#/en/accessory/servo_kit", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/servo_kit_01.webp", "p":"Servo Kit 180°/360°", "sku":"A076-B&A076-C" ,"kw":"180 360 SERVO Kit"}
],
"Cables": [
{"id":"cables"},
{"a":"/#/en/accessory/cable/24awg_cable", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/24awg_cable_01.webp", "p":"Shielded twisted pair", "sku":"A088" ,"kw":"cable rs485 can uart", "category":"Cables"},
{"a":"/#/en/accessory/converter/grove_t", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/grove_t_01.webp", "p":"Grove-T", "sku":"U039" ,"kw":"CONNECTOR"},
{"a":"/#/en/accessory/cable/grove_cable", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/grove_cable_01.webp", "p":"Grove Cable", "sku":"A034" ,"kw":"CABLE"},
@@ -254,6 +275,7 @@
{"a":"/#/en/accessory/cable/lego_cable", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/lego_cable.webp", "p":"LEGO Cable", "sku":"A030" ,"kw":"CABLE"}
],
"Other": [
{"id":"other"},
{"a":"/#/en/accessory/screw", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/screw_p1.webp", "p":"SCREW", "sku":"A050" ,"kw":"TOOL", "category":"Other"},
{"a":"/#/en/accessory/bus_socket", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/acs_bus_socket_01.webp", "p":"BUS-Socket", "sku":"A001" ,"kw":"CONNECTOR"},
{"a":"/#/en/accessory/frame", "img":"https://static-cdn.m5stack.com/image/m5-docs_homepage/accessory/frame_01.webp", "p":"Frame", "sku":"A013" ,"kw":"CONNECTOR"},
docs/en/uiflow/uiflow_home_page.md
+6 -4
View File
@@ -1,4 +1,4 @@
<div class="container uiflow_banner">
<div class="uiflow_banner">
<div>
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/home_page/uiflow_home_page.webp">
</div>
@@ -13,7 +13,7 @@
<div id='uiflow_home_page'>
<el-card class="box-card" v-for="(item,index) in list" :key="index" style="margin-bottom:20px">
<el-card class="box-card" v-for="(item,index) in list" :key="index" style="margin-bottom:20px" :id="item.id">
<div slot="header" class="clearfix">
<span>{{item.title}}</span>
<i class="el-icon-s-management" style="float: right;"></i>
@@ -36,7 +36,8 @@ const quickstart = {
'M5Stick':'#/en/quick_start/m5stick/m5stick_quick_start_with_uiflow',
'ATOM Echo':'#/en/quick_start/atom/atom_echo_quick_start',
'ATOM Lite / Matrix':'#/en/quick_start/atom/atom_quick_start_uiflow'
}
},
"id":"quickstart"
};
const hardware = {
@@ -46,7 +47,8 @@ const hardware = {
'Speaker':'#/en/uiflow/hardware?id=speaker',
'IMU':'#/en/uiflow/hardware?id=imu',
'POWER':'#/en/uiflow/hardware?id=power-m5stack'
}
},
"id":"blockly"
};
docs/index.html
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/index.md
+7 -3
View File
@@ -9,12 +9,16 @@
for(let key1 in data[key]){
anthor.expand.push({
"name":key1,
"id": data[key][key1][0]["id"],
"icon": icon_list.MODULE
});
$(".product_page").append(`<div id=${key1.toLowerCase()}></div>`);
$(".product_page").append(`<div id=${data[key][key1][0]["id"].toLowerCase()}></div>`);
data[key][key1].forEach((productInfo)=>{
if(productInfo.id != undefined){
return;
}
if(productInfo.category != undefined){
$("#"+key1.toLowerCase()).append(`<p><strong>${productInfo.category}</strong></p>`);
$("#"+data[key][key1][0]["id"]).append(`<p><strong>${productInfo.category}</strong></p>`);
}
let qsBtn = '';
if(productInfo.qs != undefined){
@@ -29,7 +33,7 @@
</a>
${qsBtn}
</div> `;
$("#"+key1.toLowerCase()).append(html);
$("#"+data[key][key1][0]["id"].toLowerCase()).append(html);
})
}
anthors.push(anthor);
docs/index_source.html
+119 -100
View File
File diff suppressed because one or more lines are too long
docs/zh_CN/README.md
+7 -3
View File
@@ -9,12 +9,16 @@
for(let key1 in data[key]){
anthor.expand.push({
"name":key1,
"id": data[key][key1][0]["id"],
"icon": icon_list.MODULE
});
$(".product_page").append(`<div id=${key1.toLowerCase()}></div>`);
$(".product_page").append(`<div id=${data[key][key1][0]["id"].toLowerCase()}></div>`);
data[key][key1].forEach((productInfo)=>{
if(productInfo.id != undefined){
return;
}
if(productInfo.category != undefined){
$("#"+key1.toLowerCase()).append(`<p><strong>${productInfo.category}</strong></p>`);
$("#"+data[key][key1][0]["id"]).append(`<p><strong>${productInfo.category}</strong></p>`);
}
let qsBtn = '';
if(productInfo.qs != undefined){
@@ -29,7 +33,7 @@
</a>
${qsBtn}
</div> `;
$("#"+key1.toLowerCase()).append(html);
$("#"+data[key][key1][0]["id"].toLowerCase()).append(html);
})
}
anthors.push(anthor);
docs/zh_CN/arduino/arduino_home_page.md
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="container uiflow_banner">
<div class="uiflow_banner">
<div>
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/home_page/arduino_home_page.webp">
</div>
docs/zh_CN/atom/atom_motion.md
+1
View File
@@ -80,6 +80,7 @@
<div><img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/easyloader_intro.webp"></div>
<div class="easyloader-btn">
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/Windows/ATOM_BASE/EasyLoader_Atom_Motion.exe">Windows</a>
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/MacOS/ATOM_BASE/EasyLoader_ATOM_Motion.dmg">MacOS</a>
</div>
</div>
<div>
docs/zh_CN/atom/atom_socket.md
+128
View File
@@ -0,0 +1,128 @@
# ATOM Socket
<el-tag effect="plain">SKU:K052</el-tag>
<div class="product_pic"><img src="assets/img/product_pics/atom_base/atom_poe/atom_poe_01.webp"></div>
## 描述
**ATOM Socket** 是一款适配ATOM主控的智能电源插座。内嵌HLW8032高精度电能计量IC，通过串口通信能够读取插座进电的相关电气参数(线电压，电流，有功功率，视在功率和功率因素)。内部集成单路继电器(AC-220V@10A)用于控制插座电源通断，搭配集成WIFI&蓝牙模块的ATOM主控，该电源插座能够轻松接入网络，实现远程控制与电能计量。
## 产品特性
- HLW8032高精度电能计量IC
- 支持电压电流检测功率计算,1000：1的动态范围内：
- 有功功率的测量误差达到0.2%
- 有效电流的测量误差达到0.5%
- 有效电压的测量误差达到0.5%
- 单路继电器控制插座电源通断(220V@10A)
- UART通讯(baud:4800)
- ∑-Δ型ADC,高精度的电能计量内核
## 包含
- 1x ATOM Socket
- 1x ATOM LITE
- 1x TYPE-C USB 线缆（20cm)
## 应用
- 计量插座
- 智能WIFI插座
- 智能家电控制
## 规格参数
<table>
<tr style="font-weight:bold">
<td>规格</td>
<td>参数</td>
</tr>
<tr>
<td>HLW8032串口通信波特率</td>
<td>4800</td>
</tr>
<tr>
<td>继电器参数</td>
<td>AC-220V@10A</td>
</tr>
<tr>
<td>净重</td>
<td>104g</td>
</tr>
<tr>
<td>毛重</td>
<td>116.6g</td>
</tr>
<tr>
<td>产品尺寸</td>
<td>90*42*55mm</td>
</tr>
<tr>
<td>包装尺寸</td>
<td>92*62*42mm</td>
</tr>
</table>
>M5体系同类型产品比较
<table>
<tr><td>产品</td><td>电源测量方案</td><td>兼容设备</td><td>通信方式</td></tr>
<tr><td>AC Socket</td><td>无</td><td>CORE</td><td>RS485</td></tr>
<tr><td>ATOM Socket</td><td>HLW8032电能计量IC(串口通信)</td><td>ATOM</td><td>IO控制继电器/UART读取电能信息</td></tr>
</table>
## EasyLoader
>EasyLoader是一个简洁快速的程序烧录器，其内置了一个产品相关的案例程序，通过简单步骤将其烧录至主控，即可进行一系列的功能验证。
<div class="easyloader-box">
<div style="background-color:white;">
<div><img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/easyloader_intro.webp"></div>
<div class="easyloader-btn">
<a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/EasyLoader/Windows/ATOM_BASE/EasyLoader_Atom_Socket.exe">Windows</a>
</div>
</div>
<div>
<video id="example_video" controls>
<source src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/video/Product_example_video/AtomBase/ATOM_Socket.mp4" type="video/mp4">
</video>
<div class="easyloader-mask">
<a>
<svg id="play-btn" t="1583228776634" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4152" width="75" height="75"><path d="M512 0C229.216 0 0 229.216 0 512s229.216 512 512 512 512-229.216 512-512S794.784 0 512 0z m0 928C282.24 928 96 741.76 96 512S282.24 96 512 96s416 186.24 416 416-186.24 416-416 416zM384 288l384 224-384 224z" p-id="4153" fill="#007aff"></path></svg></a>
<p>案例描述:</p>
<p>远程控制ATOM Socket通断电源，并且监测电源状态</p>
</div>
</div>
</div>
## 相关链接
- **Datasheet**
- [HLW8032](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/atombase/atom_socket/DS_HLW8032_CN.pdf)
### 管脚映射
<table>
<tr><td>ATOM</td><td>G22</td><td>G23</td></tr>
<tr><td>ATOM Socket</td><td>RX</td><td>Relay</td></tr>
</table>
## 原理图
<img src="assets/img/product_pics/atom_base/atom_socket/atom_socket_sch_01.webp">
<img src="assets/img/product_pics/atom_base/atom_socket/atom_socket_sch_02.webp">
## 案例程序
- [Arduino代码示例](https://github.com/m5stack/M5Atom/tree/master/examples/ATOM_BASE/ATOM_Socket)
<script>
var purchase_link = 'https://m5stack.com/products/atom-motion-kit-with-motor-and-servo-driver-stm32f0';
anchor_search(purchase_link);
scrollFunc();
</script>

Some files were not shown because too many files have changed in this diff Show More