diff --git a/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_10.png b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_10.png new file mode 100644 index 00000000..969ce41e Binary files /dev/null and b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_10.png differ diff --git a/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_11.png b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_11.png new file mode 100644 index 00000000..e4559a2f Binary files /dev/null and b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_11.png differ diff --git a/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_12.png b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_12.png new file mode 100644 index 00000000..877f0c8f Binary files /dev/null and b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_12.png differ diff --git a/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_13.png b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_13.png new file mode 100644 index 00000000..b132d127 Binary files /dev/null and b/docs/assets/img/getting_started_pics/how_to_burn_firmware/burn_firmware_13.png differ diff --git a/docs/assets/img/product_pics/app/flir_base_01.png b/docs/assets/img/product_pics/app/flir_base_01.png new file mode 100644 index 00000000..124f551b Binary files /dev/null and b/docs/assets/img/product_pics/app/flir_base_01.png differ diff --git a/docs/assets/img/product_pics/base/flir_base_02.png b/docs/assets/img/product_pics/app/flir_base_02.png similarity index 100% rename from docs/assets/img/product_pics/base/flir_base_02.png rename to docs/assets/img/product_pics/app/flir_base_02.png diff --git a/docs/assets/img/product_pics/base/flir_base_01.png b/docs/assets/img/product_pics/base/flir_base_01.png deleted file mode 100644 index 270178ca..00000000 Binary files a/docs/assets/img/product_pics/base/flir_base_01.png and /dev/null differ diff --git a/docs/en/module/sim800.md b/docs/en/module/sim800.md index 9910ca4b..efe8e33f 100644 --- a/docs/en/module/sim800.md +++ b/docs/en/module/sim800.md @@ -4,7 +4,9 @@ *** -:memo:**[Description](#Description)**      :octocat:**[Example](#Example)**      :electric_plug:**[Schematic](#Schematic)**      🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-In-Stock-GSM-Module-SIM800L-Stackable-IoT-Development-Board-for-Arduino-ESP32-with-MIC/3226069_32843211923.html?spm=2114.12010615.8148356.20.25e96be7xE1y22.html)** +:memo:**[Description](#Description)**      :electric_plug:**[Schematic](#Schematic)**      🛒**[Purchase](https://www.aliexpress.com/store/product/M5Stack-Official-In-Stock-GSM-Module-SIM800L-Stackable-IoT-Development-Board-for-Arduino-ESP32-with-MIC/3226069_32843211923.html?spm=2114.12010615.8148356.20.25e96be7xE1y22.html)** + + ## Description diff --git a/docs/en/related_documents/how_to_burn_firmware.md b/docs/en/related_documents/how_to_burn_firmware.md index 55cc1b72..ae7d8af9 100644 --- a/docs/en/related_documents/how_to_burn_firmware.md +++ b/docs/en/related_documents/how_to_burn_firmware.md @@ -1,12 +1,12 @@ # How to Burn Firmware +**[Windows](#Windows)**      **[MacOS](#MacOS)**      **[Linux](#Linux)** + +  + **This article will guide you how to burn a right firmware to your board via M5Burner.** -## For MacOS - -***(Coming soon...)*** - -## For Windows +## Windows ### 1. Download M5Burner @@ -56,4 +56,34 @@ b. select `M5Cam-vx.x (/M5Cam-psram)` option, if you own a ESP32CAM (/ M5CAMERA) ?> **Tip** If M5Burner means be busy after clicking `Burn`, please wait for a few minutes. It'll be normal after the firmware has been burnt successfully. -?> **Tip** If the burning procedure has been interrupted(like `M5Burner has been closed suddenly...`), it's better to burn your board again. \ No newline at end of file +?> **Tip** If the burning procedure has been interrupted(like `M5Burner has been closed suddenly...`), it's better to burn your board again. + +## MacOS + +***(Coming soon...)*** + +## Linux + +### 1. Install esptool + +Open Terminal, and enter `sudo pip install esptool` for installing `esptool`. + + + +### 2. Download the last version of M5Burner + +Access [UIFlow](http://www.m5stack.com), download the MacOS version installer `M5Burner-Flow-For-MacOS`, and unzip it. + + + +### 3. Execute + +Copy `M5Burner_MacOS/M5Burner_MacOS.app/Contents/Resources/firmware/M5Flow/` to `~/Documents` + +If you want to bun v1.1.1 version firmware, switch the current directory to the corresponding directory e.g. `cd ~/Documents/M5Flow/v1.1.1-en` + + + +Plug the M5Core in, and run `sudo ./flash.sh` + + \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 17240db0..932585db 100644 --- a/docs/index.md +++ b/docs/index.md @@ -75,7 +75,7 @@   -[![m5go_base_01.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/base/base_m5go_bottom_01.png)](en/base/m5go_base) +[![m5go_bottom_01.png](http://m5-docs.oss-cn-shenzhen.aliyuncs.com/assets/img/product_pics/homepage_picture/base/base_m5go_bottom_01.png)](en/base/m5go_bottom) diff --git a/docs/ja/module/sim800.md b/docs/ja/module/sim800.md index dce5e383..bced7695 100644 --- a/docs/ja/module/sim800.md +++ b/docs/ja/module/sim800.md @@ -4,7 +4,9 @@ *** -:memo:**[概要](#概要)**      :octocat:**[サンプルコード](#サンプルコード)**      :electric_plug:**[回路図](#回路図)**      🛒**[購入リンク](https://www.aliexpress.com/store/product/M5Stack-Official-In-Stock-GSM-Module-SIM800L-Stackable-IoT-Development-Board-for-Arduino-ESP32-with-MIC/3226069_32843211923.html?spm=2114.12010615.8148356.20.25e96be7xE1y22.html)** +:memo:**[概要](#概要)**      :electric_plug:**[回路図](#回路図)**      🛒**[購入リンク](https://www.aliexpress.com/store/product/M5Stack-Official-In-Stock-GSM-Module-SIM800L-Stackable-IoT-Development-Board-for-Arduino-ESP32-with-MIC/3226069_32843211923.html?spm=2114.12010615.8148356.20.25e96be7xE1y22.html)** + + ## 概要 diff --git a/docs/zh_CN/app/flir.md b/docs/zh_CN/app/flir.md new file mode 100644 index 00000000..e69de29b diff --git a/docs/zh_CN/module/sim800.md b/docs/zh_CN/module/sim800.md index e86e2399..9a57387c 100644 --- a/docs/zh_CN/module/sim800.md +++ b/docs/zh_CN/module/sim800.md @@ -4,7 +4,9 @@ *** -:memo:**[描述](#描述)**      :octocat:**[例程](#例程)**      :electric_plug:**[原理图](#原理图)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.1c03425emPA4gi&id=559726007780)** +:memo:**[描述](#描述)**      :electric_plug:**[原理图](#原理图)**      🛒**[购买链接](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-1172588106.10.1c03425emPA4gi&id=559726007780)** + + ## 描述 diff --git a/docs/zh_CN/related_documents/how_to_burn_firmware.md b/docs/zh_CN/related_documents/how_to_burn_firmware.md index 4631bd31..ab35f50a 100644 --- a/docs/zh_CN/related_documents/how_to_burn_firmware.md +++ b/docs/zh_CN/related_documents/how_to_burn_firmware.md @@ -1,12 +1,12 @@ # 如何通过M5Burner烧录固件 +**[Windows](#Windows)**      **[MacOS](#MacOS)**      **[Linux](#Linux)** + +  + **这个文档会介绍如何下载M5Burner，并通过M5Burner烧录固件.** -## For MacOS - -***(在编辑中...)*** - -## For Windows +## Windows ### 1. 下载最新的M5Burner @@ -61,4 +61,34 @@ b. 如果你想有ESP32CAM (或 M5CAMERA)，并且想编程它的话，请选择 ?> **提示** 如果M5Burner在点击`Burn`之后，显示`busy...`, 也就是卡顿的话，不要慌张，稍微等几分钟，软件自然就会烧录成功。 -?> **提示** 如果M5Burner在擦除或者烧录过程中被中断了(如突然关闭软件), 为了保证板子能正常工作，你最好重新擦除和烧录一遍固件. \ No newline at end of file +?> **提示** 如果M5Burner在擦除或者烧录过程中被中断了(如突然关闭软件), 为了保证板子能正常工作，你最好重新擦除和烧录一遍固件. + +## MacOS + +***(在编辑中...)*** + +## Linux + +### 1. 安装 esptool + +打开终端，输入 `sudo pip install esptool`，安装 esptool + + + +### 2. 下载最新的M5Burner + +访问[UIFlow](http://www.m5stack.com)来下载MacOS版本的M5Burner，并解压。 + + + +### 3. 执行程序 + +复制 `M5Burner_MacOS/M5Burner_MacOS.app/Contents/Resources/firmware/M5Flow/` 文件夹到 `~/Documents` + +如果您希望烧录 v1.1.1 版本的固件的话，在终端窗口中，切换当前到对应目录下，`cd ~/Documents/M5Flow/v1.1.1-en` + + + +插入 M5Core 设备，在终端执行 `sudo ./flash.sh` + + \ No newline at end of file