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

docs/assets/css/main.css

@@ -835,7 +835,7 @@ mark {
 
 
 .faq-title::before {
-    background-color: #00b8ee;
+    background-color: #007bff;
     content: "";
     width: 20px;
     height: 20px;

docs/en/core/fire.md

@@ -257,7 +257,7 @@ For more information about Pin assignment and Pin Remapping, Please refer to EPS
 
 ## Include
 
--  1x Fire
+-  1x FIRE
 -  1x M5GO CHG Base
 -  2x LEGO block
 -  5x LEGO connector

docs/en/faq.md

@@ -278,6 +278,20 @@
     </div>
 </div>
 
+
+<div class="faq-item">
+    <h5 class="faq-title">Q13:After the MacOS version is upgraded to a higher version, the M5StickC cannot be programmed normally.<p class="faq-button"></p></h5>
+    <div class="faq-answer">
+      <div>
+        <span>
+        After upgrading MacOS v10.15 on some Mac computers, M5StickC cannot program properly.
+        <br>
+        Solution: When programming, short the G0 to GND using the DuPont line.
+        </span>
+      </div>
+    </div>
+</div>
+
 </div>
 
 

docs/index.html

@@ -140,33 +140,21 @@
             //     $('.dropdown-menu div[data-bind="leave1"]').on('mouseleave', Leave);
             // }, 600);
         };
-
         function product_search(onEnter_content){
+            $("#search_note").css("display","block");
             var p = $(".item p");
-            temp_product_name = [];
-            all_product_name = [];
             for (var i=0; i<p.length; i++ ) {
-                temp_product_name.push(p[i].textContent.toLowerCase());
-                var match1 = temp_product_name.filter(item => item.startsWith(onEnter_content));
-                all_product_name.push(p[i].textContent.toLowerCase());
-                var match2 = all_product_name.filter(item => item.startsWith(onEnter_content));
-                if( match1.length > 0){
+                if(p[i].textContent.toLocaleLowerCase().indexOf(onEnter_content) != -1){
                     $(".item").eq(i).css("display","inline-block");
                     $(".item").eq(i).parent().children("p").css("display","block");
                     $(".item").eq(i).parent().next("hr").css("display","block");
+                    $("#search_note").css("display","none");
                 }
                 else{   
                     $(".item").eq(i).css("display","none");
                     $(".item").parent().children("p").css("display","none");
                     $(".item").eq(i).parent().next("hr").css("display","none");
                 }
-                if((match2.length == 0)){
-                    $("#search_note").css("display","block");
-                }
-                else{  
-                    $("#search_note").css("display","none");
-                }
-                temp_product_name.shift();
             }
         }
 
@@ -185,21 +173,7 @@
                 }
             }   
         }
-        function case_search(onEnter_content){
-            // $(".search-tips").css("display","block");
-            // $(".faq-class").css("display","none");
-            // var faq_title = $(".faq-item h5");
-            // for (var i=0; i<faq_title.length; i++ ) {
-            //     if(faq_title[i].textContent.toLocaleLowerCase().indexOf(onEnter_content) != -1){
-            //         $(".faq-item").eq(i).css("display","block");
-            //         $(".search-tips").css("display","none");
-            //         $(".faq-item").eq(i).prev(".faq-class").css("display","block");
-            //     }
-            //     else{
-            //         $(".faq-item").eq(i).css("display","none");
-            //     }
-            // }   
-        }
+
         function onEnter(event){
             timer = setTimeout(function () {
                 var onEnter_content = event.target.value.toLowerCase();
@@ -217,9 +191,6 @@
             if(link.slice(-4) == "/faq"){
                 faq_search(onEnter_content);
             }
-            if(link.slice(-5) == "/case"){
-                case_search(onEnter_content);
-            }
         }
         // function keyup_submit(e){ 
         //     var evt = window.event || e; 

docs/zh_CN/core/fire.md

@@ -258,7 +258,7 @@ Fire 中的 GPIO 16 / 17 默认与PSRAM连接，因此当你在连接或是堆
 
 ## 包含
 
--  1x Fire
+-  1x FIRE
 -  1x M5GO 充电底座
 -  2x LEGO积木
 -  5x LEGO连接件

docs/zh_CN/core/m5stickv.md

@@ -55,7 +55,7 @@ M5stickV AI 摄像头具备机器视觉能力，支持多种视觉识别能力
     - 六轴IMU传感器:  MPU6886 
     - 接口:  CONNEXT.
 
-
+   
 ### 包含
 
 -  1x M5StickV

docs/zh_CN/faq.md

@@ -279,6 +279,20 @@
     </div>
 </div>
 
+
+<div class="faq-item">
+    <h5 class="faq-title">Q13: MacOS版本升级高版本后，M5StickC无法正常烧录程序。<p class="faq-button"></p></h5>
+    <div class="faq-answer">
+      <div>
+        <span>
+        部分Mac电脑在升级MacOS v10.15版本后，M5StickC无法正常烧录程序。
+        <br>
+        解决方案：烧录时，使用杜邦线短接G0至GND。
+        </span>
+      </div>
+    </div>
+</div>
+
 </div>