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 https://github.com/m5stack/m5-docs

Browse Source
This commit is contained in:
vany5921
2019-10-30 00:34:42 +08:00
parent 7fd6c70064 52bde32d5f
commit ee1bcb071e
16 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/main.css
+6 -6
View File
@@ -90,7 +90,7 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section {
position: fixed;
top:20%;
right: 100px;
right: 4%;
z-index: 9999;
}
@@ -475,11 +475,6 @@ body[data-page="zh_CN/README.md"] .search {
margin-right: 0px;
width: 130px;
}
.back_top {
position: fixed;
right: 10px;
bottom: 150px;
}
.item {
width: 130px;
margin-right: 10px;
@@ -781,4 +776,9 @@ body[data-page="zh_CN/README.md"] .search {
mark {
background-color: #007bff;
color:white;
}
#_hj_feedback_container{
display: none;
}
docs/en/app/demo-board.md
+2 -6
View File
@@ -4,7 +4,7 @@
***
:memo:**[Description](#Description)**    :electric_plug:**[Schematic](#Schematic)**    :bulb:**[Quick Start](#Quick-Start)**    :octocat:**[Example](#Example)**    🛒**[Purchase](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**      
:memo:**[Description](#Description)**    :electric_plug:**[Schematic](#Schematic)**    :bulb:**[Manual](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_en.pdf)**    :octocat:**[Example](#Example)**    🛒**[Purchase](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**      
@@ -28,7 +28,7 @@
- step motor with four-phase five-wire
- Radio frequency identification Reader
- RS-458，RS232 series communication
<img src="assets/img/product_pics/app/Demo-Board/Demo-Board_03.jpg" width="250" height="250">
## Include
@@ -43,10 +43,6 @@
<img src="assets/img/product_pics/app/Demo-Board/Demo-Board_04.jpg" width="250" height="250">
<h1 id="quick-start"><a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_en.pdf" data-id="quick-start" ><span>Quick-Start</span></a></h1>
## EasyLoader
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/EasyLoader_logo.png" width="100px" style="margin-top:20px">
docs/en/case.md
-4
View File
@@ -1,9 +1,5 @@
# M5Stack Cases {docsify-ignore-all}
## STEM Education Cases
## M5Stack Awesome
* [M5Stack-SD-Updater](https://github.com/tobozo/M5Stack-SD-Updater) - Customizable menu system for M5Stack - loads apps from the Micro SD card
docs/en/core/basic.md
+2 -2
View File
@@ -165,8 +165,8 @@ The newly-produced M5Core replaces the screen with better display performance an
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>Speaker</td>
docs/en/core/fire.md
+2 -2
View File
@@ -213,8 +213,8 @@ The GPIO 16 / 17 in Fire is connected to the PSRAM by default, so when you conne
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>Speaker</td>
docs/en/core/gray.md
+2 -2
View File
@@ -204,8 +204,8 @@ The newly-produced M5Core replaces the screen with better display performance an
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>Speaker</td>
docs/en/core/m5go.md
+2 -2
View File
@@ -199,8 +199,8 @@ The newly-produced M5Core replaces the screen with better display performance an
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>Speaker</td>
docs/en/core/m5go_lite.md
+2 -2
View File
@@ -196,8 +196,8 @@ The newly-produced M5Core replaces the screen with better display performance an
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS Screen</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>Speaker</td>
docs/index.html
+14 -2
View File
@@ -68,7 +68,7 @@
<a class="dropdown-item" href="https://github.com/m5stack/UIFlow-Code/wiki">MicroPython API</a>
</div>
</div>
<a id="cases" class="p-2 text-dark" href="#/en/case">M5Stack Cases</a>
<a id="cases" class="p-2 text-dark" href="#/en/case">Cases</a>
<a id="uiflow" class="p-2 text-dark" href="#/en/uiflow/uiflow_home_page">UIFlow</a>
<a id="related" class="p-2 text-dark" href="#/en/related_documents">Software Tutorial</a>
<a id="faq" class="p-2 text-dark" href="#/en/faq" style="margin-right: 70px;">FAQ</a>
@@ -217,7 +217,7 @@
$("#product").attr("href", "#");
$("#arduino").text("Arduino API");
$("#arduino").attr("href", "#/en/api");
$("#cases").text("M5Stack Cases");
$("#cases").text("Cases");
$("#cases").attr("href", "#/en/case");
$("#related").text("Software Tutorial");
$("#related").attr("href", "#/en/related_documents");
@@ -300,4 +300,16 @@
gtag('config', 'UA-138139529-2');
</script>
<!-- Hotjar Tracking Code for https://docs.m5stack.com/#/ -->
<script>
(function(h,o,t,j,a,r){
h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
h._hjSettings={hjid:1546100,hjsv:6};
a=o.getElementsByTagName('head')[0];
r=o.createElement('script');r.async=1;
r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
a.appendChild(r);
})(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
</script>
</html>
docs/zh_CN/app/demo-board.md
+1 -7
View File
@@ -4,7 +4,7 @@
* * *
:memo:**[描述](#描述)**&nbsp;&nbsp;&nbsp;:electric_plug:**[原理图](#原理图)**&nbsp;&nbsp;&nbsp;:bulb:**[上手指南](#上手指南)**&nbsp;&nbsp;&nbsp;:octocat:**[例程](#例程)**&nbsp;&nbsp;&nbsp;🛒**[购买链接](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
:memo:**[描述](#描述)**&nbsp;&nbsp;&nbsp;:electric_plug:**[原理图](#原理图)**&nbsp;&nbsp;&nbsp;:bulb:**[上手指南](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_cn.pdf)**&nbsp;&nbsp;&nbsp;:octocat:**[例程](#例程)**&nbsp;&nbsp;&nbsp;🛒**[购买链接](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
## 描述
@@ -48,12 +48,6 @@
<img src="assets/img/product_pics/app/Demo-Board/Demo-Board_04.jpg" width="250" height="250">
<!-- ## 上手指南
?>[点击此处，查看上手指南](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_cn.pdf) -->
<h1 id="上手指南"><a href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_cn.pdf" data-id="quick-start" ><span>上手指南</span></a></h1>
## EasyLoader
docs/zh_CN/case.md
-2
View File
@@ -1,7 +1,5 @@
# M5Stack案例 {docsify-ignore-all}
## STEM Education案例
## M5Stack优秀作品
* [M5Stack-SD-Updater](https://github.com/tobozo/M5Stack-SD-Updater) - Customizable menu system for M5Stack - loads apps from the Micro SD card
docs/zh_CN/core/basic.md
+2 -2
View File
@@ -163,8 +163,8 @@ M5Stack Basic 由两个可分离部分堆叠组成. 顶部放置了电路板，
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>喇叭</td>
docs/zh_CN/core/fire.md
+2 -2
View File
@@ -210,8 +210,8 @@ Fire 中的 GPIO 16 / 17 默认与PSRAM连接，因此当你在连接或是堆
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>喇叭</td>
docs/zh_CN/core/gray.md
+2 -2
View File
@@ -195,8 +195,8 @@
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>喇叭</td>
docs/zh_CN/core/m5go.md
+2 -2
View File
@@ -194,8 +194,8 @@
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>喇叭</td>
docs/zh_CN/core/m5go_lite.md
+2 -2
View File
@@ -197,8 +197,8 @@
<td>TypeC x 1, GROVE(I2C+I/0+UART) x 1</td>
</tr>
<tr>
<td>LCD屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9341</td>
<td>IPS屏幕</td>
<td>2 inch, 320x240 Colorful TFT LCD, ILI9342C</td>
</tr>
<tr>
<td>喇叭</td>