diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index 46a36cc8..04782377 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -23,6 +23,7 @@ body[data-page="index.md"] article.markdown-section .item { width: 150px; margin-right: 10px; margin-top: 10px; + margin-bottom: 10px; display: inline-block; position:relative; box-shadow: 5px 5px 5px #888888; @@ -41,6 +42,7 @@ body[data-page="zh_CN/README.md"] article.markdown-section .item { width: 150px; margin-right: 10px; margin-top: 10px; + margin-bottom: 10px; display: inline-block; position:relative; box-shadow: 5px 5px 5px #888888; diff --git a/docs/assets/img/product_pics/1515/6060-push/6060_push_01.jpg b/docs/assets/img/product_pics/1515/6060-push/6060_push_01.jpg new file mode 100644 index 00000000..ec4262aa Binary files /dev/null and b/docs/assets/img/product_pics/1515/6060-push/6060_push_01.jpg differ diff --git a/docs/assets/img/product_pics/1515/6060-push/6060_push_02.jpg b/docs/assets/img/product_pics/1515/6060-push/6060_push_02.jpg new file mode 100644 index 00000000..fc787332 Binary files /dev/null and b/docs/assets/img/product_pics/1515/6060-push/6060_push_02.jpg differ diff --git a/docs/assets/img/product_pics/1515/6060-push/6060_push_03.jpg b/docs/assets/img/product_pics/1515/6060-push/6060_push_03.jpg new file mode 100644 index 00000000..de785e24 Binary files /dev/null and b/docs/assets/img/product_pics/1515/6060-push/6060_push_03.jpg differ diff --git a/docs/assets/img/product_pics/module/gsm/gsm_01.jpg b/docs/assets/img/product_pics/module/gsm/gsm_01.jpg new file mode 100644 index 00000000..961f7beb Binary files /dev/null and b/docs/assets/img/product_pics/module/gsm/gsm_01.jpg differ diff --git a/docs/assets/img/product_pics/module/gsm/gsm_02.jpg b/docs/assets/img/product_pics/module/gsm/gsm_02.jpg new file mode 100644 index 00000000..d6db3c21 Binary files /dev/null and b/docs/assets/img/product_pics/module/gsm/gsm_02.jpg differ diff --git a/docs/assets/img/product_pics/module/gsm/gsm_03.jpg b/docs/assets/img/product_pics/module/gsm/gsm_03.jpg new file mode 100644 index 00000000..83dfcf00 Binary files /dev/null and b/docs/assets/img/product_pics/module/gsm/gsm_03.jpg differ diff --git a/docs/assets/img/product_pics/module/gsm/gsm_04.jpg b/docs/assets/img/product_pics/module/gsm/gsm_04.jpg new file mode 100644 index 00000000..8202ca1c Binary files /dev/null and b/docs/assets/img/product_pics/module/gsm/gsm_04.jpg differ diff --git a/docs/assets/img/product_pics/module/lte/lte_01.jpg b/docs/assets/img/product_pics/module/lte/lte_01.jpg new file mode 100644 index 00000000..432a5f88 Binary files /dev/null and b/docs/assets/img/product_pics/module/lte/lte_01.jpg differ diff --git a/docs/assets/img/product_pics/module/lte/lte_02.jpg b/docs/assets/img/product_pics/module/lte/lte_02.jpg new file mode 100644 index 00000000..d0df6f7a Binary files /dev/null and b/docs/assets/img/product_pics/module/lte/lte_02.jpg differ diff --git a/docs/assets/img/product_pics/module/lte/lte_03.jpg b/docs/assets/img/product_pics/module/lte/lte_03.jpg new file mode 100644 index 00000000..414fe1ee Binary files /dev/null and b/docs/assets/img/product_pics/module/lte/lte_03.jpg differ diff --git a/docs/assets/img/product_pics/module/nb-iot/nb_iot_01.jpg b/docs/assets/img/product_pics/module/nb-iot/nb_iot_01.jpg new file mode 100644 index 00000000..85ab6b39 Binary files /dev/null and b/docs/assets/img/product_pics/module/nb-iot/nb_iot_01.jpg differ diff --git a/docs/assets/img/product_pics/module/nb-iot/nb_iot_02.jpg b/docs/assets/img/product_pics/module/nb-iot/nb_iot_02.jpg new file mode 100644 index 00000000..982cb3a6 Binary files /dev/null and b/docs/assets/img/product_pics/module/nb-iot/nb_iot_02.jpg differ diff --git a/docs/assets/img/product_pics/module/nb-iot/nb_iot_03.jpg b/docs/assets/img/product_pics/module/nb-iot/nb_iot_03.jpg new file mode 100644 index 00000000..2ec7b448 Binary files /dev/null and b/docs/assets/img/product_pics/module/nb-iot/nb_iot_03.jpg differ diff --git a/docs/assets/img/product_pics/module/nb-iot/nb_iot_04.jpg b/docs/assets/img/product_pics/module/nb-iot/nb_iot_04.jpg new file mode 100644 index 00000000..1695934e Binary files /dev/null and b/docs/assets/img/product_pics/module/nb-iot/nb_iot_04.jpg differ diff --git a/docs/index.md b/docs/index.md index edeab120..e8998304 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,10 +9,10 @@ Core - M5Core QuickStart     - IIC AddressTable     + M5Core QuickStart     + IIC AddressTable     - M5Core comparison » + M5Core comparison » **M5Core** @@ -40,10 +40,10 @@ **M5Stick** - M5Stick QuickStart     - M5StickC QuickStart     - M5StickV QuickStart     - M5Stick comparison » + M5Stick QuickStart     + M5StickC QuickStart     + M5StickV QuickStart     + M5Stick comparison » @@ -76,8 +76,8 @@ **M5GO/FACES Kit** - M5GO QuickStart     - FACES-kit QuickStart » + M5GO QuickStart     + FACES-kit QuickStart »
@@ -110,7 +110,7 @@
-IIC AddressTable     +IIC AddressTable     ## GPS ## LORA @@ -1076,6 +1076,13 @@ +
+ + + +

6060-PUSH

+
+ *** # Tools diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index a9e5030b..e989ed55 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -66,10 +66,10 @@ **M5Stick** - M5Stick上手指南     - M5StickC上手指南     - M5StickV上手指南     - M5Stick硬件区别 » + M5Stick上手指南     + M5StickC上手指南     + M5StickV上手指南     + M5Stick硬件区别 » @@ -104,8 +104,8 @@ **M5GO/FACES 套件** - M5GO上手指南     - FACES-kit上手指南 » + M5GO上手指南     + FACES-kit上手指南 »
@@ -142,7 +142,7 @@ -IIC地址表     +IIC地址表     **通讯模块** @@ -1013,6 +1013,13 @@

Aluminium-Profile

+
+ + + +

6060-PUSH

+
+ *** # Tools diff --git a/docs/zh_CN/module/gsm.md b/docs/zh_CN/module/gsm.md index c8f40675..5616aef8 100644 --- a/docs/zh_CN/module/gsm.md +++ b/docs/zh_CN/module/gsm.md @@ -15,6 +15,7 @@ - SIM卡类型: Nano - 状态信号:两路LED指示灯 - 板载麦克风 +- 串行通信:Uart2 16/17 - 板载双路扬声器信号输出: SPK1扬声器信号输出接口 SPK2扬声器信号输出到主机 @@ -37,6 +38,12 @@ + +## 包含 + +- 1x GSM 模块 + + ## 应用 - 无线通信系统 diff --git a/docs/zh_CN/module/lte.md b/docs/zh_CN/module/lte.md index 7a89d925..1e7e1518 100644 --- a/docs/zh_CN/module/lte.md +++ b/docs/zh_CN/module/lte.md @@ -52,6 +52,13 @@ + +## 包含 + +- 1x 天线 +- 1x LTE 模块 + + ## 应用 - 安防路由 diff --git a/docs/zh_CN/module/nb-iot.md b/docs/zh_CN/module/nb-iot.md index 997cd14e..f35096c1 100644 --- a/docs/zh_CN/module/nb-iot.md +++ b/docs/zh_CN/module/nb-iot.md @@ -19,12 +19,13 @@ - 状态信号:两路LED指示灯 - 单路开关机按钮 - 板载天线可选:默认板载弹簧天线(或通过跳线切换至IPEX座) +- 串行通信:Uart2 16/17 - 工作温度范围:-40°C 至+ 85°C - NB-IoT: 支持 LTE Cat NB2* - 频段: B3/B5/B8 - 数据传输: - LTE Cat NB1 速率 (kbps): + -LTE Cat NB1 速率 (kbps): Single Tone:15.625(UL)/21.25(DL) Multi Tone:62.5(UL)/21.25(DL) SMS: 支持 PDU/TEXT 模式 @@ -50,9 +51,17 @@ -114dBm( 无重传 ) -130dBm( 开启重传 ) - + +## 包含 + +- 1x Nano IoT SIM卡 +- 1x NB-IoT 模块 + + + + ## 应用 - 智能表计 @@ -61,7 +70,6 @@ - ## 原理图 - **[原理图](https://github.com/m5stack/M5-Schematic/blob/master/Modules/module_nb_iot_sch.pdf)**