diff --git a/docs/assets/css/main-min.css b/docs/assets/css/main-min.css index e64ad8d4..ea532ae1 100644 --- a/docs/assets/css/main-min.css +++ b/docs/assets/css/main-min.css @@ -1106,3 +1106,56 @@ mark { width: 100% } } + + + +.platform-box { + display: flex; + flex-direction: row; + justify-content: center; + flex-wrap: wrap; +} + + +.platform-item { + position: relative; + overflow: hidden; + margin: 20px; + box-shadow: 0px 0px 5px 0px #dbdbdb; + border-radius: 15px; +} + +.platform-item h3 { + position: absolute; + top: 50%; + width: 100%; + text-align: center; + font-size: 20px; + font-weight: normal; + color: #fff; + z-index: 11; +} + + +.platform-tag{ + position: absolute; + top: 50%; + left: 45%; + width: 150px; + height: 150px; + margin: -60px 0 0 -60px; + background: #333; + opacity: .8; + border-radius: 50%; + z-index: 10; + -webkit-transform: scale(1, 1); + -moz-transform: scale(1, 1); + transform: scale(1, 1); + -webkit-transition: all .3s; + -moz-transition: all .3s; + transition: all .5s cubic-bezier(0.23, 0.53, 0.22, 0.93); +} + +.platform-item a:hover .platform-tag{ + transform: scale(4.3, 4.3); +} \ No newline at end of file diff --git a/docs/assets/img/arduino-card.jpg b/docs/assets/img/arduino-card.jpg new file mode 100644 index 00000000..fb5dee49 Binary files /dev/null and b/docs/assets/img/arduino-card.jpg differ diff --git a/docs/assets/img/aws-freertos-card.jpg b/docs/assets/img/aws-freertos-card.jpg new file mode 100644 index 00000000..05e3e95f Binary files /dev/null and b/docs/assets/img/aws-freertos-card.jpg differ diff --git a/docs/assets/img/uiflow-card.jpg b/docs/assets/img/uiflow-card.jpg new file mode 100644 index 00000000..9d5b1b98 Binary files /dev/null and b/docs/assets/img/uiflow-card.jpg differ diff --git a/docs/en/quick_start/m5core/m5stack_core_quick_start.md b/docs/en/quick_start/m5core/m5stack_core_quick_start.md index d71f3ce5..d541d369 100644 --- a/docs/en/quick_start/m5core/m5stack_core_quick_start.md +++ b/docs/en/quick_start/m5core/m5stack_core_quick_start.md @@ -1,31 +1,20 @@ # M5Core Get Started {docsify-ignore-all} - - ## Choose the development platform -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
\ No newline at end of file +
+
+ + +

Arduino IDE

+
+ +
+
+ + +

UIFlow

+
+ +
+
diff --git a/docs/en/quick_start/m5stickc/m5stickc_quick_start.md b/docs/en/quick_start/m5stickc/m5stickc_quick_start.md index 04ac6200..b79a4ec8 100644 --- a/docs/en/quick_start/m5stickc/m5stickc_quick_start.md +++ b/docs/en/quick_start/m5stickc/m5stickc_quick_start.md @@ -1,37 +1,27 @@ # M5StickC Quick Start {docsify-ignore-all} - - ## Choose the development platform -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
\ No newline at end of file +
+
+ + +

Arduino IDE

+
+ +
+
+ + +

UIFlow

+
+ +
+
+ + +

AWS FreeRTOS

+
+ +
+
diff --git a/docs/image/Advanced module/I2C_example.jpg b/docs/image/Advanced module/I2C_example.jpg new file mode 100644 index 00000000..d1392d53 Binary files /dev/null and b/docs/image/Advanced module/I2C_example.jpg differ diff --git a/docs/image/base/windows_logo.png b/docs/image/base/Windows_logo.png similarity index 100% rename from docs/image/base/windows_logo.png rename to docs/image/base/Windows_logo.png diff --git a/docs/index.html b/docs/index.html index 76a37575..8a729835 100755 --- a/docs/index.html +++ b/docs/index.html @@ -1,69 +1,529 @@ -M5Stack - A series of modular stackable development devices + + + + + + + + + + + + + +
+
+
+ + Search +
+
+
+
+ M5Stack Docs
+ +
+
+ + + + + +
+
+
loading...
+ + + + + + + + + + + + + + + - }else if(url.indexOf("?id=") < 0 ){ - loadingMask.style.display = 'block'; + +
Search
M5Stack Docs
loading...
\ No newline at end of file + var page_url = window.location.href; + var a = page_url.indexOf('#') + var pdf_name = page_url.slice(a+2); + pdf.save(pdf_name+".pdf"); + } + }) + $(".anchor-box").removeAttr("style"); + $(".related_links").removeAttr("style"); +} + + + \ No newline at end of file diff --git a/docs/index_source.html b/docs/index_source.html index c751b17d..4cab5701 100644 --- a/docs/index_source.html +++ b/docs/index_source.html @@ -363,6 +363,7 @@ var Label1 = ''; var Label2 = 'here is the anchor_name'; function anchor_create(anchor_name,anchor_id){ + var page_url = window.location.href; var Part_A = Label1.replace(/here is the anchor_id/, anchor_id); var Part_B = Label2.replace(/here is the anchor_name/, anchor_name.toUpperCase()); if((anchor_name == "DESCRIPTION")||(anchor_name == "描述")){ @@ -392,38 +393,37 @@ $("#example_video")[0].pause(); }) } + }else if(page_url.indexOf(/uiflow/) != -1){ + $(".anchor-box").append(Part_A+quickstart_icon+Part_B); } } function anchor_search(purchase_link="none",quickstart_link="none"){ - var page_url = window.location.href; - if((page_url.slice(-4) == "/en/")||(page_url.slice(-7)== "/zh_CN/")||(page_url.slice(-3)== "/#/")){ - $("#search_note").eq(0).after("
"); - var anchor_list= $(".product_page > div:gt(1)"); - for (var i=0; i< anchor_list.length ; i++){ - anchor_create(anchor_list[i].id.toUpperCase(), anchor_list[i].id); + var page_url = window.location.href; + if((page_url.slice(-4) == "/en/")||(page_url.slice(-7)== "/zh_CN/")||(page_url.slice(-3)== "/#/")){ + $("#search_note").eq(0).after("
"); + var anchor_list= $(".product_page > div:gt(1)"); + } + else{ + $("h2").eq(0).before("
"); + var anchor_list= $("#main h2"); } - } - else{ - $("h2").eq(0).before("
"); - var anchor_list= $("#main h2"); for (var i=0; i< anchor_list.length ; i++){ - anchor_create(anchor_list[i].id.toUpperCase(), anchor_list[i].id); - if(page_url.indexOf(/zh_CN/) != -1) { - var purchase_name = "购买链接" - var quickstart_name = "快速上手" - } - else { - var purchase_name = "PURCHASE" - var quickstart_name = "QUICK START" - } + anchor_create(anchor_list[i].id.toUpperCase(), anchor_list[i].id); + } + if(page_url.indexOf(/zh_CN/) != -1) { + var purchase_name = "购买链接" + var quickstart_name = "快速上手" + } + else { + var purchase_name = "PURCHASE" + var quickstart_name = "QUICK START" } if(purchase_link!="none"){ $(".anchor-box").append(''+purchase_icon+''+purchase_name+''+''); } if(quickstart_link!="none"){ $(".anchor-box").append(''+quickstart_icon+''+quickstart_name+''+''); - } - } + } } function anchor_scroll(anchor_name,anchor_id,anchor_length){ @@ -473,7 +473,11 @@ \ No newline at end of file diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_quick_start.md b/docs/zh_CN/quick_start/m5core/m5stack_core_quick_start.md index 8b4360a5..c97cfae3 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_quick_start.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_quick_start.md @@ -2,24 +2,19 @@ ## 选择您使用的开发平台 -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
\ No newline at end of file +
+
+ + +

Arduino IDE

+
+ +
+
+ + +

UIFlow

+
+ +
+
diff --git a/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start.md b/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start.md index 68e162de..6c2432de 100644 --- a/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start.md +++ b/docs/zh_CN/quick_start/m5stickc/m5stickc_quick_start.md @@ -1,40 +1,27 @@ # M5StickC 上手指南 {docsify-ignore-all} - - - ## 选择您使用的开发平台 -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
+
+ + +

Arduino IDE

+
+
- +
+ + +

UIFlow

+
+ +
+
+ + +

AWS FreeRTOS

+
+ +
+
diff --git a/docs/zh_CN/uiflow/introduction.md b/docs/zh_CN/uiflow/introduction.md index 8037e071..0a3e988a 100644 --- a/docs/zh_CN/uiflow/introduction.md +++ b/docs/zh_CN/uiflow/introduction.md @@ -9,7 +9,7 @@ 5. [UIFlow教程](#UIFlow教程) -## 安装UIFlow固件 +## UIFlow固件 * __下载驱动程序__ @@ -101,6 +101,7 @@ >Atom的APIKey可以通过web配网页面查看，或通过串口工具查看 +<<<<<<< HEAD > @@ -155,20 +156,18 @@ > ## UIFlow教程 +======= +## 相关教材 +>>>>>>> 3cd56af95d6b315f183720dac88d2b3e42c9401e * [M5StickC物联网入门教程](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/M5StickC_Guide.pdf) * [M5GO编程入门教程](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/UIFlow-Book-zh_cn.pdf) + \ No newline at end of file