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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
vany5921
2019-10-11 19:32:14 +08:00
parent f112b69653 bb236cee27
commit 6e298d4af0
7 changed files with 156 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/main.css
+44 -6
View File
@@ -170,12 +170,12 @@ figure.thumbnails img {
}
/* .mask {
.mask {
position: absolute;
top: 0;
left: 0;
width: 150px;
height: 150px;
height: 206px;
background: rgba(0, 0, 0, 0.7);
color: #ffffff;
opacity: 0;
@@ -187,7 +187,20 @@ figure.thumbnails img {
.item a:hover .mask {
opacity: 1;
} */
}
.mask-btn1 {
position:relative;
top:60px;
left:30px;
}
.mask-btn2 {
position:relative;
top:87px;
left:30px;
}
.product_list div.btn-group-vertical {
display: none;
@@ -209,7 +222,7 @@ main>.content {
margin: 0px;
}
.banner {
/* .banner {
width: 300px;
margin-right: 10px;
margin-left: 20px;
@@ -220,7 +233,7 @@ main>.content {
box-shadow: 5px 5px 5px #888888;
cursor: pointer;
transition: all 0.1s;
}
} */
div.card-img-overlay {
background-color: rgba(0, 0, 0, 0.6);
@@ -231,7 +244,7 @@ div.card-img-overlay:hover {
color: blue !important;
}
.banner div.card-img-overlay h4 {
/* .banner div.card-img-overlay h4 {
font-size: 3em;
color: #fff;
}
@@ -243,8 +256,17 @@ div.card-img-overlay:hover {
.banner:hover {
transform: scale(1.1);
z-index: 1;
} */
.banner {
width: 100%;
height: 300px;
background-color: #fffbff;
}
.d-flex {
z-index: 1000;
position: fixed;
@@ -450,6 +472,22 @@ body[data-page="zh_CN/README.md"] .search {
z-index: 1001;
top: 92%;
}
.mask {
display: none;
width: 130px;
height: 186px;
}
.mask-btn1 {
position:relative;
top:50px;
left:23px;
}
.mask-btn2 {
position:relative;
top:75px;
left:23px;
}
}
#loading {
docs/en/faq.md
+1 -4
View File
@@ -114,12 +114,9 @@
<div class="container">
<button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#Q9">answer</button>
<div id="Q9" class="collapse">
<img src="assets/img/faq/m5stickc_05.jpg" width="50%" height="50%">
One issue commonly exists on M5Stick-C, which happens when the battery is at a low level. In this case, some of the devices will have problem powering on, this is probably caused by a chaos timing sequence of power-on of ESP32, some component is involved, such as AXP192, 552, ESP32
There is one way to bring the device back to live: 1. Connect G0 and 3V3 with a 680 ohm resisto. 2. Plug in the USB cable. 3. The screen will light up and leave the USB to charge the device.
The following operations can restore the device to normal: 1. Short the BAT to GND. 2. Insert the USB cable. 3. After the screen is lit, stop shorting and USB continues to charge the device.
</div>
</div>
docs/en/module/lorawan.md
+1 -1
View File
@@ -77,7 +77,7 @@ By default, the UART configuration: "9600, 8, n, 1"(8 bits data, no parity, 1 st
- **[Forum](http://forum.m5stack.com/)**
- **[LoRaWAN Datasheet](http://wiki.ai-thinker.com/sx127x-052) (LoRaWAN)**
- **[LoRaWAN Datasheet](https://wiki.ai-thinker.com/_media/lora/docs/ai-thinker_ds_rhf-76-052_v03.pdf) (LoRaWAN)**
- **[LoRaWAN User Manual](http://wiki.ai-thinker.com/_media/lora/docs/rhf76-052_ho_to_use_ai-thinker_s_lorawan_modem.pdf)**
docs/index.md
+51 -115
View File
@@ -22,12 +22,17 @@
<button id="aluminium-btn" type="button" class="btn btn-light" onclick="select(this)">Aluminium</button>
</div>
</div>
<hr>
<div class="btn-group-vertical" style="width: 160px;">
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" role="button" style="color:white;text-decoration:none" target="view_window">I2C Address Table</a>
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" role="button" style="color:white;text-decoration:none" target="view_window">Product Comparison</a>
</div>
</div>
<div class="navbar-toggler mb-navigation" data-toggle="collapse" data-target="#thetarget">
Core
</div>
<div class="navbar-toggler mb-navigation dropdown-toggle" data-toggle="collapse" data-target="#thetarget">Core</div>
<div class="collapse navbar-collapse" id="thetarget">
<nav class="navbar-expand-sm bg-light navbar-dark nav-content">
<ul class="navbar-nav">
@@ -53,6 +58,15 @@
<a class="dropdown-item" onclick="select(this)">Aluminium</a>
</li>
</ul>
<hr>
<ul class="navbar-nav">
<li class="nav-item active">
<a class="dropdown-item" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" target="view_window">I2C Address Table</a>
</li>
<li class="nav-item">
<a class="dropdown-item" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" target="view_window">Product Comparison</a>
</li>
</ul>
</nav>
</div>
@@ -68,10 +82,9 @@
**M5Core**
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Core/hardware_difference_between_cores.md" role="button" style="color:white;text-decoration:none">Cores comparison »</a> -->
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_Compare">M5Core comparison »</a>
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_Compare">M5Core comparison »</a> -->
<div class="item">
@@ -98,10 +111,10 @@
**M5Stick**
<a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a>
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
@@ -130,8 +143,8 @@
**M5GO/FACES Kit**
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a>
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
<div class="item">
<a href="/#/en/core/m5go_lite">
@@ -162,7 +175,7 @@
<div id="module" >
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Module_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Module_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp; -->
**Communication Modules**
@@ -425,9 +438,9 @@
<div id="unit" >
<a class="btn btn btn-primary" href="#en/quick_start/m5camera/m5camera_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">Camera QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5camera/m5camera_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">Camera QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Unit_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Units/m5camera/CameraComparison_en.md" role="button" style="color:white;margin-top:10px;text-decoration:none">Cameras comparison »</a>
<a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Units/m5camera/CameraComparison_en.md" role="button" style="color:white;margin-top:10px;text-decoration:none">Cameras comparison »</a> -->
**Camera class**
@@ -1165,134 +1178,57 @@
</div>
<!-- <script>
$(document).ready(function(){
$("div.item a").append(`<div class="mask">
<img class="logo" src="//cdn.shopify.com/s/files/1/0056/7689/2250/t/2/assets/magnifier.png?14592" style="position: absolute; top: 50px; left: 50px;">
</div>`);
});
</script> -->
<div class="container">
<div class="modal fade" id="Core_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/core_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Module_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/module_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Unit_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/unit_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Core_Compare">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content" style="width: 145%">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/core_compare.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Stick_Compare">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content" style="width: 145%">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/stick_compare.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
</div>
<script>
// $(document).ready(function(){
// $("#core div.item a").append(`<div class="mask">
// <img class="logo" src="//cdn.shopify.com/s/files/1/0056/7689/2250/t/2/assets/magnifier.png?14592" style="position: absolute; top: 50px; left: 50px;">
// </div>`);
// });
$(document).ready(function(){
var mask_html = `<div class="mask"><a href="#" style="color:white;text-decoration:none" ><button type="button" class="btn-sm btn-primary mask-btn1">QuickStart</button></a><button type="button" class="btn-sm btn-primary mask-btn2">Document</button></div>`
$("#core div.item a").append(mask_html);
$("#unit div.item a:lt(4)").append(mask_html);
$("#core .mask a").attr("href", "#en/quick_start/m5core/m5stack_core_quick_start");
$("#core .mask a").eq(3).attr("href", "#en/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(4).attr("href", "#en/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(5).attr("href", "#en/quick_start/m5stickv/m5stickv_quick_start");
$("#unit .mask a").attr("href", "#en/quick_start/m5camera/m5camera_quick_start");
});
var scrollFunc = function (e) {
e = e || window.event;
// if (e.wheelDelta) { //判断浏览器IE，谷歌滑轮事件
var test = window.location.href;
if(((test.slice(-4) == "/en/")||(test.slice(-4)== "/zh_CN/"))||((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1))){
$(".btn-group-vertical button").addClass("btn-light");
$(".btn-group-vertical .btn-group button").addClass("btn-light");
if((core.getBoundingClientRect().top + core.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Core');
$(".mb-navigation").text(' Core');
$("#core-btn").removeClass("btn-light");
$("#core-btn").addClass("btn-primary");
}else if((module.getBoundingClientRect().top + module.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Module');
$(".mb-navigation").text(' Module');
$("#module-btn").removeClass("btn-light");
$("#module-btn").addClass("btn-primary");
}else if((base.getBoundingClientRect().top + base.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Base');
$(".mb-navigation").text(' Base');
$("#base-btn").removeClass("btn-light");
$("#base-btn").addClass("btn-primary");
}else if((unit.getBoundingClientRect().top + unit.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Unit');
$(".mb-navigation").text(' Unit');
$("#unit-btn").removeClass("btn-light");
$("#unit-btn").addClass("btn-primary");
}else if((application.getBoundingClientRect().top + application.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Application');
$(".mb-navigation").text(' Application');
$("#application-btn").removeClass("btn-light");
$("#application-btn").addClass("btn-primary");
}else if((accessory.getBoundingClientRect().top + accessory.getBoundingClientRect().height) > 700){
$(".mb-navigation").text('Accessory');
$(".mb-navigation").text(' Accessory');
$("#accessory-btn").removeClass("btn-light");
$("#accessory-btn").addClass("btn-primary");
}else if((aluminium.getBoundingClientRect().top + aluminium.getBoundingClientRect().height) > 600){
$(".mb-navigation").text('Aluminium');
$(".mb-navigation").text(' Aluminium');
$("#aluminium-btn").removeClass("btn-light");
$("#aluminium-btn").addClass("btn-primary");
}
docs/zh_CN/README.md
+57 -115
View File
@@ -22,12 +22,17 @@
<button id="aluminium-btn" type="button" class="btn btn-light" onclick="select(this)">Aluminium</button>
</div>
</div>
<hr>
<div class="btn-group-vertical" style="width: 160px;">
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" role="button" style="color:white;text-decoration:none" target="view_window">I2C地址表格</a>
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" role="button" style="color:white;text-decoration:none" target="view_window">产品参数表格</a>
</div>
</div>
</div>
<div class="navbar-toggler mb-navigation" data-toggle="collapse" data-target="#thetarget">
Core
</div>
<div class="navbar-toggler mb-navigation dropdown-toggle" data-toggle="collapse" data-target="#thetarget">Core</div>
<div class="collapse navbar-collapse" id="thetarget">
<nav class="navbar-expand-sm bg-light navbar-dark nav-content">
<ul class="navbar-nav">
@@ -53,14 +58,27 @@
<a class="dropdown-item" onclick="select(this)">Aluminium</a>
</li>
</ul>
<hr>
<ul class="navbar-nav">
<li class="nav-item active">
<a class="dropdown-item" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" target="view_window">I2C地址表格</a>
</li>
<li class="nav-item">
<a class="dropdown-item" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" target="view_window">产品参数表格</a>
</li>
</ul>
</nav>
</div>
<div class="product_page">
<div id="search_note" style="display:none;position:fixed;top:30%">
<h3>not obtained the content, please enter the first letter of the product and search again.</h3>
<h3>没有搜索到相关信息，请输入产品首字母，重新进行搜索.</h3>
</div>
@@ -68,10 +86,9 @@
**M5Core**
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Core/hardware_difference_between_cores.md" role="button" style="color:white;text-decoration:none">Cores comparison »</a> -->
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_Compare">M5Core comparison »</a>
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_Compare">M5Core comparison »</a> -->
<div class="item">
@@ -98,10 +115,10 @@
**M5Stick**
<a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a>
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
@@ -130,8 +147,8 @@
**M5GO/FACES Kit**
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a>
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
<div class="item">
<a href="/#/zh_CN/core/m5go_lite">
@@ -162,7 +179,7 @@
<div id="module" >
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Module_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Module_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp; -->
**Communication Modules**
@@ -425,9 +442,9 @@
<div id="unit" >
<a class="btn btn btn-primary" href="#en/quick_start/m5camera/m5camera_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">Camera QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5camera/m5camera_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">Camera QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Unit_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Units/m5camera/CameraComparison_en.md" role="button" style="color:white;margin-top:10px;text-decoration:none">Cameras comparison »</a>
<a class="btn btn btn-primary" href="https://github.com/m5stack/M5-Schematic/blob/master/Units/m5camera/CameraComparison_en.md" role="button" style="color:white;margin-top:10px;text-decoration:none">Cameras comparison »</a> -->
**Camera class**
@@ -1165,133 +1182,58 @@
<!-- <script>
$(document).ready(function(){
$("div.item a").append(`<div class="mask">
<img class="logo" src="//cdn.shopify.com/s/files/1/0056/7689/2250/t/2/assets/magnifier.png?14592" style="position: absolute; top: 50px; left: 50px;">
</div>`);
});
</script> -->
<div class="container">
<div class="modal fade" id="Core_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/core_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Module_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/module_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Unit_I2C">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/unit_i2c.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Core_Compare">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content" style="width: 145%">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/core_compare.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="Stick_Compare">
<div class="modal-dialog modal-lg" style="margin-top:5%">
<div class="modal-content" style="width: 145%">
<div class="modal-body">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/stick_compare.jpg" data-no-zoom>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
</div>
</div>
<script>
// $(document).ready(function(){
// $("#core div.item a").append(`<div class="mask">
// <img class="logo" src="//cdn.shopify.com/s/files/1/0056/7689/2250/t/2/assets/magnifier.png?14592" style="position: absolute; top: 50px; left: 50px;">
// </div>`);
// });
$(document).ready(function(){
var mask_html = `<div class="mask"><a href="#" style="color:white;text-decoration:none" ><button type="button" class="btn-sm btn-primary mask-btn1">快速上手 »</button></a><button type="button" class="btn-sm btn-primary mask-btn2">产品文档 »</button></div>`
$("#core div.item a").append(mask_html);
$("#unit div.item a:lt(4)").append(mask_html);
$("#core .mask a").attr("href", "#zh_CN/quick_start/m5core/m5stack_core_quick_start");
$("#core .mask a").eq(3).attr("href", "#zh_CN/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(4).attr("href", "#zh_CN/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(5).attr("href", "#zh_CN/quick_start/m5stickv/m5stickv_quick_start");
$("#unit .mask a").attr("href", "#zh_CN/quick_start/m5camera/m5camera_quick_start");
});
var scrollFunc = function (e) {
e = e || window.event;
// if (e.wheelDelta) { //判断浏览器IE，谷歌滑轮事件
// if (e.wheelDelta) { //判断浏览器IE，谷歌滑轮事件
console.log(1);
var test = window.location.href;
if(((test.slice(-4) == "/en/")||(test.slice(-7)== "/zh_CN/"))||((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1))){
$(".btn-group-vertical button").addClass("btn-light");
if((core.getBoundingClientRect().top + core.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Core');
$(".mb-navigation").text(' Core');
$("#core-btn").removeClass("btn-light");
$("#core-btn").addClass("btn-primary");
}else if((module.getBoundingClientRect().top + module.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Module');
$(".mb-navigation").text(' Module');
$("#module-btn").removeClass("btn-light");
$("#module-btn").addClass("btn-primary");
}else if((base.getBoundingClientRect().top + base.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Base');
$(".mb-navigation").text(' Base');
$("#base-btn").removeClass("btn-light");
$("#base-btn").addClass("btn-primary");
}else if((unit.getBoundingClientRect().top + unit.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Unit');
$(".mb-navigation").text(' Unit');
$("#unit-btn").removeClass("btn-light");
$("#unit-btn").addClass("btn-primary");
}else if((application.getBoundingClientRect().top + application.getBoundingClientRect().height) > 200){
$(".mb-navigation").text('Application');
$(".mb-navigation").text(' Application');
$("#application-btn").removeClass("btn-light");
$("#application-btn").addClass("btn-primary");
}else if((accessory.getBoundingClientRect().top + accessory.getBoundingClientRect().height) > 700){
$(".mb-navigation").text('Accessory');
$(".mb-navigation").text(' Accessory');
$("#accessory-btn").removeClass("btn-light");
$("#accessory-btn").addClass("btn-primary");
}else if((aluminium.getBoundingClientRect().top + aluminium.getBoundingClientRect().height) > 600){
$(".mb-navigation").text('Aluminium');
$(".mb-navigation").text(' Aluminium');
$("#aluminium-btn").removeClass("btn-light");
$("#aluminium-btn").addClass("btn-primary");
}
docs/zh_CN/faq.md
+1 -3
View File
@@ -108,11 +108,9 @@
<div class="container">
<button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#Q9">查看解答</button>
<div id="Q9" class="collapse">
<img src="assets/img/faq/m5stickc_05.jpg" width="50%" height="50%">
M5StickC存在一个问题，即电池处于低电量情况下，容易发生无法开机的现象。
以下操作能够使设备恢复正常：1，将BAT短接到GND。 2.插入USB线。 3，屏幕亮起后停止短接，USB继续为设备充电.
以下操作能够使设备恢复正常：1，将G0短接到3V3。 2.插入USB线。 3，屏幕亮起后停止短接，USB继续为设备充电。
</div>
</div>
docs/zh_CN/module/lorawan.md
+1 -1
View File
@@ -75,7 +75,7 @@ LoRaWAN默认的串口配置： 波特率为9600，8位数据位,无校验位,1
- **[官方论坛](http://forum.m5stack.com/)**
- **[LoRaWAN 模组信息](http://wiki.ai-thinker.com/sx127x-052) (LoRaWAN)**
- **[LoRaWAN 数据手册](https://wiki.ai-thinker.com/_media/lora/docs/rhf76-052datasheet_v0.2.pdf) (LoRaWAN)**
- **[LoRaWAN 使用手册](http://wiki.ai-thinker.com/_media/lora/docs/rhf76-052_ho_to_use_ai-thinker_s_lorawan_modem_-_cn.pdf)**