Merge pull request #45 from watson8544/master

fixed a bug
This commit is contained in:
LiHuashen
2018-11-19 17:31:58 +08:00
committed by GitHub
7 changed files with 75 additions and 31 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

+15 -13
View File
@@ -19,9 +19,9 @@
| :------------------: |:------------------:| :--------------------:|
| [GPS](/en/product_documents/modules/module_gps) | [PROTO](/en/product_documents/modules/module_proto) | [STEPMOTOR](/en/product_documents/modules/module_stepmotor)|
| [LORA](/en/product_documents/modules/module_lora) | [BATTERY](/en/product_documents/modules/module_battery) | [SERVO](/en/product_documents/modules/module_servo) |
| / | [BTC](/en/product_documents/modules/module_btc) | / |
| [SIM800/GPRS/GSM](/en/product_documents/modules/module_sim800) | [PLUS](/en/product_documents/modules/module_plus) | [COMMU](/en/product_documents/modules/module_commu) |
| [LoRaWAN](/en/product_documents/modules/module_lorawan) | / | / |
| [SIM800/GPRS/GSM](/en/product_documents/modules/module_sim800) | [BTC](/en/product_documents/modules/module_btc) | [COMMU](/en/product_documents/modules/module_commu) |
| [LoRaWAN](/en/product_documents/modules/module_lorawan) | [PLUS](/en/product_documents/modules/module_plus) | / |
| / | / | / |
| / | / | / |
| / | / | / |
| / | / | / |
@@ -29,16 +29,17 @@
<img src='assets/img/product_pics/5.jpg'> <img src='assets/img/product_pics/bases.png'>
- [M5GO-Base](/en/file_to_diplay_null)
- [PLC-Base](/en/product_documents/modules/module_plc)
- [FACE-Base](/en/product_documents/modules/module_face)
- [LAN](/en/product_documents/bases/lan_base)
- [Node-Base](/en/product_documents/bases/node_base)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [M5GO-Base](/en/file_to_diplay_null) | [PLC-Base](/en/product_documents/modules/module_plc) | [FACE-Base](/en/product_documents/modules/module_face) |
| [LAN](/en/product_documents/bases/lan_base) | / | / |
| [Node-Base](/en/product_documents/bases/node_base) | / | / |
<img src='assets/img/product_pics/5.jpg'> <img src='assets/img/product_pics/accessory.png'>
- [LEGO-CABLE](/en/product_documents/accessorries/cables/accessory_lego_cable)
- [FRAME](/en/product_documents/accessorries/accessory_frame)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [LEGO-CABLE](en/product_documents/cables/accessory_lego_cable) | [FRAME](en/product_documents/accessory_frame) | / |
<img src='assets/img/product_pics/3.jpg'> <img src='assets/img/product_pics/unit.png'>
@@ -65,9 +66,10 @@
<img src='assets/img/product_pics/4.jpg'> <img src='assets/img/product_pics/application.png'>
- [BALA](/en/product_documents/applications/application_bala)
- [LidarBot](/en/product_documents/applications/application_lidarbot)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [BALA](/en/product_documents/applications/application_bala) | [LidarBot](/en/product_documents/applications/application_lidarbot) | / |
<img src='assets/img/product_pics/6.jpg'> <img src='assets/img/product_pics/tool.png'>
- [M5Stack USB Downloader](/en/product_documents/tools/tool_usb_downloader)
* [M5Stack USB Downloader](/en/product_documents/tools/tool_usb_downloader)
@@ -52,3 +52,11 @@ The ESP32Cam equips the ESP32 with everything necessary to program, run and deve
- **[Quick Start](/en/quick_start/m5camera/m5camera_quick_start)**
- **[Read more](https://github.com/1zlab/1ZLAB_ESP32_Wifi_Camera)**
- [ESP32Cam purchase (AliExpress)](https://www.aliexpress.com/store/product/M5Stack-Official-ESP32-Camera-Module-Development-Board-OV2640-Camera-Type-C-Grove-Port-3D-Wifi-Antenna/3226069_32881414545.html)
<figure>
<img src="assets/img/product_pics/units/m5camera.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_02.jpg">
</figure>
@@ -52,5 +52,17 @@ The M5Camera equips the ESP32 with everything necessary to program, run and deve
- **[Read more](https://github.com/1zlab/1ZLAB_ESP32_Wifi_Camera)**
<figure>
<img src="assets/img/product_pics/units/m5camera.png">
<img src="assets/img/product_pics/units/m5camera_01.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_02.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_03.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_04.jpg">
</figure>
+18 -16
View File
@@ -18,28 +18,29 @@
| 无线通信模块 | 配件模块 | 控制模块 |
| :------------------: |:------------------:| :--------------------:|
| [GPS](zh_CN/product_documents/modules/module_gps) | [PROTO](zh_CN/product_documents/modules/module_proto) | [STEPMOTOR](zh_CN/product_documents/modules/module_stepmotor)|
| [LORA](zh_CN/product_documents/modules/module_lora) | [BATTERY](zh_CN/product_documents/modules/module_battery) | [SERVO](/zh_CN/product_documents/modules/module_servo) |
| / | [BTC](zh_CN/product_documents/modules/module_btc) | / |
| [SIM800/GPRS/GSM](zh_CN/product_documents/modules/module_sim800) | [PLUS](zh_CN/product_documents/modules/module_plus) | [COMMU](zh_CN/product_documents/modules/module_commu) |
| [LoRaWAN](/zh_CN/product_documents/modules/module_lorawan) | / | / |
| [GPS](/zh_CN/product_documents/modules/module_gps) | [PROTO](/zh_CN/product_documents/modules/module_proto) | [STEPMOTOR](/zh_CN/product_documents/modules/module_stepmotor)|
| [LORA](/zh_CN/product_documents/modules/module_lora) | [BATTERY](/zh_CN/product_documents/modules/module_battery) | [SERVO](/zh_CN/product_documents/modules/module_servo) |
| [SIM800/GPRS/GSM](/zh_CN/product_documents/modules/module_sim800) | [BTC](/zh_CN/product_documents/modules/module_btc) | [COMMU](/zh_CN/product_documents/modules/module_commu) |
| [LoRaWAN](/zh_CN/product_documents/modules/module_lorawan) | [PLUS](/zh_CN/product_documents/modules/module_plus) | / |
| / | / | / |
| / | / | / |
| / | / | / |
| / | / | / |
| / | / | / |
<img src='assets/img/product_pics/5.jpg'> <img src='assets/img/product_pics/bases.png'>
- [M5GO底座](zh_CN/product_documents/bases/m5go_base)
- [PLC底座](zh_CN/product_documents/modules/module_plc)
- [FACE底座](zh_CN/product_documents/modules/module_face)
- [LAN底座](zh_CN/product_documents/bases/lan_base)
- [Node底座](zh_CN/product_documents/bases/node_base)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [M5GO底座](/zh_CN/file_to_diplay_null) | [PLC底座](/zh_CN/product_documents/modules/module_plc) | [FACE底座](/zh_CN/product_documents/modules/module_face) |
| [LAN底座](/zh_CN/product_documents/bases/lan_base) | / | / |
| [Node底座](/zh_CN/product_documents/bases/node_base) | / | / |
<img src='assets/img/product_pics/5.jpg'> <img src='assets/img/product_pics/accessory.png'>
- [LEGO-CABLE](zh_CN/product_documents/cables/accessory_lego_cable)
- [FRAME](zh_CN/product_documents/accessory_frame)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [LEGO-CABLE](zh_CN/product_documents/cables/accessory_lego_cable) | [FRAME](zh_CN/product_documents/accessory_frame) | / |
<img src='assets/img/product_pics/3.jpg'> <img src='assets/img/product_pics/unit.png'>
@@ -66,10 +67,11 @@
<img src='assets/img/product_pics/4.jpg'> <img src='assets/img/product_pics/application.png'>
- [BALA](zh_CN/product_documents/applications/application_bala)
- [LidarBot](zh_CN/product_documents/applications/application_lidarbot)
| | | |
| :------------------: |:------------------:| :--------------------:|
| [BALA](/zh_CN/product_documents/applications/application_bala) | [LidarBot](/zh_CN/product_documents/applications/application_lidarbot) | / |
<img src='assets/img/product_pics/6.jpg'> <img src='assets/img/product_pics/tool.png'>
- [M5Stack USB Downloader](zh_CN/product_documents/tools/tool_usb_downloader)
* [M5Stack USB Downloader](zh_CN/product_documents/tools/tool_usb_downloader)
@@ -50,3 +50,11 @@ The ESP32Cam equips the ESP32 with everything necessary to program, run and deve
- **[Quick Start](/en/quick_start/m5camera/m5camera_quick_start)**
- **[Read more](https://github.com/1zlab/1ZLAB_ESP32_Wifi_Camera)**
- [ESP32Cam purchase(AliExpress)](https://www.aliexpress.com/store/product/M5Stack-Official-ESP32-Camera-Module-Development-Board-OV2640-Camera-Type-C-Grove-Port-3D-Wifi-Antenna/3226069_32881414545.html)
<figure>
<img src="assets/img/product_pics/units/m5camera.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_02.jpg">
</figure>
@@ -52,5 +52,17 @@ The M5Camera equips the ESP32 with everything necessary to program, run and deve
- **[Read more](https://github.com/1zlab/1ZLAB_ESP32_Wifi_Camera)**
<figure>
<img src="assets/img/product_pics/units/m5camera.png">
<img src="assets/img/product_pics/units/m5camera_01.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_02.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_03.jpg">
</figure>
<figure>
<img src="assets/img/product_pics/units/m5camera_04.jpg">
</figure>