From 3fe424ab6d5962e224ff4cb777e5f8bf03e96ea7 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Thu, 27 Jun 2019 19:42:48 +0800 Subject: [PATCH 01/14] add navigation and HAT video --- docs/en/faq.md | 4 +- docs/en/unit/accel.md | 2 +- docs/index.html | 16 +- docs/sidebar.md | 290 ++++++++++++++++++++++------------ docs/zh_CN/faq.md | 3 +- docs/zh_CN/hat/hat-ncir.md | 11 +- docs/zh_CN/hat/hat-proto.md | 8 +- docs/zh_CN/hat/hat-thermal.md | 17 +- docs/zh_CN/sidebar.md | 269 ++++++++++++++++++++++++++++++- docs/zh_CN/unit/accel.md | 2 +- 10 files changed, 497 insertions(+), 125 deletions(-) diff --git a/docs/en/faq.md b/docs/en/faq.md index d5fe1e60..e98ac5f3 100644 --- a/docs/en/faq.md +++ b/docs/en/faq.md @@ -116,7 +116,9 @@
- There is one way to bring the device back to live: 1, Connect G0 to 3V3. 2. Plug in the USB cable. 3, The screen will light up and leave the USB to charge the device.
+
+ There is one way to bring the device back to live: 1, Connect G0 to 3V3. 2. Plug in the USB cable. 3, The screen will light up and leave the USB to charge the device.
+
**[EasyLoader](#EasyLoader)**
+:memo:**[Description](#Description)** :electric_plug:**[Schematic](#Schematic)** :octocat:**[Code](#Code)** 🛒**[Purchase](https://m5stack.com/products/3-axis-digital-accelerometer-unit-adxl345)**
**[EasyLoader](#EasyLoader)**
## Description
diff --git a/docs/index.html b/docs/index.html
index dc14ae7a..ba5a0268 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -78,24 +78,20 @@
-
+
@@ -30,10 +32,10 @@
window.$docsify = {
// GENERAL
// -----------------------------------------------------------------
- name : 'M5Stack docs',
- repo : 'https://github.com/m5stack/m5-docs',
- homepage : 'index.md',
- loadNavbar : 'navbar.md',
+ name: 'M5Stack docs',
+ repo: 'https://github.com/m5stack/m5-docs',
+ homepage: 'index.md',
+ loadNavbar: 'navbar.md',
loadSidebar: 'sidebar.md',
autoHeader: true,
mergeNavbar: true, // for mobile device
@@ -53,21 +55,41 @@
'/.*/navbar.md': '/navbar.md',
'/en/': '/',
},
- auto2top : true,
+ auto2top: false,
mergeNavbar: true,
maxLevel: 4,
subMaxLevel: 3,
basePath: '/',
formatUpdated: '{MM}/{DD} {HH}:{mm}',
executeScript: true,
- ga : 'UA-131246469-2',
+ ga: 'UA-131246469-2'
};
+
@@ -85,31 +107,8 @@
-->
diff --git a/docs/sidebar.md b/docs/sidebar.md index dc642165..1f43217e 100644 --- a/docs/sidebar.md +++ b/docs/sidebar.md @@ -1,4 +1,4 @@ -- [Product Documents](en/) + - - +- [@M5Stack](https://www.facebook.com/M5Stack) \ No newline at end of file diff --git a/docs/zh_CN/faq.md b/docs/zh_CN/faq.md index 5f89d172..2c4bbc55 100644 --- a/docs/zh_CN/faq.md +++ b/docs/zh_CN/faq.md @@ -109,7 +109,8 @@
- 以下操作能够使设备恢复正常:1,将G0短接到3V3。 2.插入USB线。 3,屏幕亮起后停止短接,USB继续为设备充电.
+
+ 以下操作能够使设备恢复正常:1,将G0短接到3V3。 2.插入USB线。 3,屏幕亮起后停止短接,USB继续为设备充电.
diff --git a/docs/zh_CN/hat/hat-ncir.md b/docs/zh_CN/hat/hat-ncir.md
index 3f7e63d9..6db5015c 100644
--- a/docs/zh_CN/hat/hat-ncir.md
+++ b/docs/zh_CN/hat/hat-ncir.md
@@ -48,7 +48,7 @@ IIC(0x5A)
-
+
>1.EasyLoader是一个简洁快速的程序烧录器,每一个产品页面里的EasyLoader都提供了一个与产品相关的案例程序.
@@ -59,4 +59,11 @@ IIC(0x5A)
| M5StickC | GPIO0 | GPIO26 | 3.3V | GND |
| HAT NCIR | SDA | SCL | 3.3V | GND |
\ No newline at end of file + + + +## 相关视频 + + diff --git a/docs/zh_CN/hat/hat-proto.md b/docs/zh_CN/hat/hat-proto.md index 5f13c92c..45f9675c 100644 --- a/docs/zh_CN/hat/hat-proto.md +++ b/docs/zh_CN/hat/hat-proto.md @@ -21,9 +21,6 @@ - 1x PROTO Hat -## 应用 - -- MP4/MP3 ## 原理图 @@ -38,3 +35,8 @@ - **[官方论坛](http://forum.m5stack.com/)** +## 相关视频 + + \ No newline at end of file diff --git a/docs/zh_CN/hat/hat-thermal.md b/docs/zh_CN/hat/hat-thermal.md index 8a5dc30d..9c3ba994 100644 --- a/docs/zh_CN/hat/hat-thermal.md +++ b/docs/zh_CN/hat/hat-thermal.md @@ -48,21 +48,28 @@ - **[官方论坛](http://forum.m5stack.com/)** -- **[PAM8303 数据手册](https://pdf1.alldatasheet.com/datasheet-pdf/view/790820/DIODES/PAM8303C.html)** +- **[MLX90640 数据手册](https://github.com/m5stack/M5-Schematic/blob/master/datasheet/MLX90640-Datasheet-Melexis.pdf)** - +>2.下载软件后,双击运行应用程序,将M5设备通过数据线连接至电脑,选择端口参数,点击 **"Burn"** 即可开始烧录 ### 管脚映射
| M5StickC | GPIO0 | GPIO26 | 3.3V | GND |
| HAT Thermal | SDA | SCL- | 3.3V | GND |
\ No newline at end of file + + + +## 相关视频 + + \ No newline at end of file diff --git a/docs/zh_CN/sidebar.md b/docs/zh_CN/sidebar.md index 376011cd..c7a35123 100644 --- a/docs/zh_CN/sidebar.md +++ b/docs/zh_CN/sidebar.md @@ -1,8 +1,273 @@ -- [产品列表](zh_CN/) + + +
+
+
+
- **Links**
diff --git a/docs/zh_CN/unit/accel.md b/docs/zh_CN/unit/accel.md
index 4d25ea8a..bcfec5b3 100644
--- a/docs/zh_CN/unit/accel.md
+++ b/docs/zh_CN/unit/accel.md
@@ -4,7 +4,7 @@
***
-:memo:**[描述](#描述)** :octocat:**[例程](#例程)** :electric_plug:**[原理图](#原理图)** 🛒**[购买链接](https://m5stack.com/collections/m5-unit/products/3-axis-analog-accelerometer-unitadx345)**
**[EasyLoader](#EasyLoader)**
+:memo:**[描述](#描述)** :octocat:**[例程](#例程)** :electric_plug:**[原理图](#原理图)** 🛒**[购买链接](https://m5stack.com/products/3-axis-digital-accelerometer-unit-adxl345)**
**[EasyLoader](#EasyLoader)**
## 描述
From fefe62c7d17b553fff35d64cee7e90d1206ce558 Mon Sep 17 00:00:00 2001
From: shaoxiang <1026025056@qq.com>
Date: Thu, 27 Jun 2019 20:56:54 +0800
Subject: [PATCH 02/14] change some word
---
docs/index.html | 71 ++++++++++++++++++++++++-------------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index ba5a0268..fa4ca3a0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,10 +1,12 @@
+
- +
@@ -15,13 +17,13 @@ - + - + - + - +
- -