From 0798fd96294b33e5d131206fc153acac9fe0ab41 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Fri, 11 Oct 2019 13:54:27 +0800 Subject: [PATCH 1/2] change faq m5stickC issues --- docs/en/faq.md | 5 +---- docs/zh_CN/faq.md | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/en/faq.md b/docs/en/faq.md index 50a40e67..51d375c2 100644 --- a/docs/en/faq.md +++ b/docs/en/faq.md @@ -114,12 +114,9 @@
- - 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.
diff --git a/docs/zh_CN/faq.md b/docs/zh_CN/faq.md index 124eb0a1..4c1eef73 100644 --- a/docs/zh_CN/faq.md +++ b/docs/zh_CN/faq.md @@ -108,11 +108,9 @@
- - M5StickC存在一个问题，即电池处于低电量情况下，容易发生无法开机的现象。 + 以下操作能够使设备恢复正常：1，将BAT短接到GND。 2.插入USB线。 3，屏幕亮起后停止短接，USB继续为设备充电. - 以下操作能够使设备恢复正常：1，将G0短接到3V3。 2.插入USB线。 3，屏幕亮起后停止短接，USB继续为设备充电。
From bb236cee276503c0592710cc53be0d5d9a205bc9 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Fri, 11 Oct 2019 19:22:28 +0800 Subject: [PATCH 2/2] add I2C table product comparison pdf links and fix LoRaWAN datasheet links --- docs/assets/css/main.css | 50 ++++++++-- docs/en/module/lorawan.md | 2 +- docs/index.md | 166 +++++++++++---------------------- docs/zh_CN/README.md | 172 ++++++++++++----------------------- docs/zh_CN/module/lorawan.md | 2 +- 5 files changed, 154 insertions(+), 238 deletions(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index b1cdb670..af695c20 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -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 { diff --git a/docs/en/module/lorawan.md b/docs/en/module/lorawan.md index 287dd567..457609a7 100644 --- a/docs/en/module/lorawan.md +++ b/docs/en/module/lorawan.md @@ -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)** diff --git a/docs/index.md b/docs/index.md index df20d27b..1fd0a338 100644 --- a/docs/index.md +++ b/docs/index.md @@ -22,12 +22,17 @@ + +
+ +
+ I2C Address Table + Product Comparison +
-
- Core -
+
Core
@@ -68,10 +82,9 @@ **M5Core** - M5Core QuickStart     + - M5Core comparison » + M5Core comparison » -->
@@ -98,10 +111,10 @@ **M5Stick** - M5Stick QuickStart     + @@ -130,8 +143,8 @@ **M5GO/FACES Kit** - M5GO QuickStart     - FACES-kit QuickStart » +
@@ -162,7 +175,7 @@
-I2C AddressTable     + **Communication Modules** @@ -425,9 +438,9 @@
- Camera QuickStart     + **Camera class** @@ -1159,134 +1172,57 @@
- - - - - - -
- - - - - - - - - - -
- -