diff --git a/_static/getting_started_pics/m5stack_core/incompatible.jpg b/_static/getting_started_pics/m5stack_core/incompatible.jpg new file mode 100644 index 00000000..854a85fc Binary files /dev/null and b/_static/getting_started_pics/m5stack_core/incompatible.jpg differ diff --git a/_static/getting_started_pics/m5stack_core/select_m5stack_core_board.jpg b/_static/getting_started_pics/m5stack_core/select_m5stack_core_board.jpg new file mode 100644 index 00000000..7de5cc92 Binary files /dev/null and b/_static/getting_started_pics/m5stack_core/select_m5stack_core_board.jpg differ diff --git a/en/get-started/how_to_burn_firmware_en.rst b/en/get-started/how_to_burn_firmware_en.rst index 8a90b96c..7cd83ba9 100644 --- a/en/get-started/how_to_burn_firmware_en.rst +++ b/en/get-started/how_to_burn_firmware_en.rst @@ -43,7 +43,9 @@ a. Choice a right firmware a. select ``M5Flow-vx.x`` option(the lastest version), if you want to program with `M5Flow `__ -b. select ``M5Cam-vx.x (/M5Cam-psram)`` option, if you own a ESP32CAM (/ +b. select ``M5GO-vx.x`` option(the lastest version), if you own a M5GO Kit + +c. select ``M5Cam-vx.x (/M5Cam-psram)`` option, if you own a ESP32CAM (/ M5CAMERA) b. Click Erase diff --git a/en/get-started/m5stack_core_get_started_Arduino_Windows.rst b/en/get-started/m5stack_core_get_started_Arduino_Windows.rst index 2a28038c..5c9fe68c 100644 --- a/en/get-started/m5stack_core_get_started_Arduino_Windows.rst +++ b/en/get-started/m5stack_core_get_started_Arduino_Windows.rst @@ -109,6 +109,18 @@ upload .. image:: ../../_static/screenshots/select_demo.png +.. note:: + + If you got a situation which appears ``INCOMPATIBLE`` when opening a M5Stack example as shown below. + + .. image:: ../../_static/getting_started_pics/m5stack_core/incompatible.jpg + + + Please select ``Tools -> Boards -> M5Stack-Core-ESP32`` + + .. image:: ../../_static/getting_started_pics/m5stack_core/select_m5stack_core_board.jpg + + Comfire your board name, baudrate, the specified serial port: M5Stack-Core-ESP32、921600、COM3 diff --git a/en/get-started/m5stack_core_get_started_MicroPython_Windows.md b/en/get-started/m5stack_core_get_started_MicroPython_Windows.md index b2f5ad60..5f887c35 100644 --- a/en/get-started/m5stack_core_get_started_MicroPython_Windows.md +++ b/en/get-started/m5stack_core_get_started_MicroPython_Windows.md @@ -14,18 +14,21 @@ 4. [Coding MicroPython](#coding-micropython) +#### Note: +*Before setting the development environment, we suggest you confirm whether the USB driver has installed. If not, please visit this link `establish serial connection`.* ### Burn Firmware -#### 1. Download Firmware -https://github.com/m5stack/M5Cloud/tree/master/firmwares -Now, the M5Cloud firmware I downloaded named `m5cloud-20180516-v0.4.0.bin` -and it saved at `~/smbshare` +If you do not sure your device has been burnt with `M5Flow` firmware, please view this article `How to burn firmware`. + +#### Burn to M5Stack + +After resetting your device, your device will beep and then press the third button(C button) on the device, and choice `Link Server: flow`. + +At that moment, the device creates an access AP and prompt you to connect to it. + +![image](../../_static/getting_started_pics/m5stack_core/get_started_with_uiflow/5.jpg) -#### 2. Burn to M5Stack -![image](../../_static/windows-logo.png) | ![image](../../_static/linux-logo.png) | ![image](../../_static/macos-logo.png) ----|---|--- -Windows | Linux | MacOS ***Windows*** diff --git a/en/index.rst b/en/index.rst index aae6ac94..b22f909c 100644 --- a/en/index.rst +++ b/en/index.rst @@ -26,7 +26,7 @@ If you want to get our products, access our `store`_ please. .. _Official Website: http://www.m5stack.com -.. _Email: http://tech@m5stack.com +.. _Email: tech@m5stack.com .. _Forum: http://forum.m5stack.com .. _store: http://www.aliexpress.com/store/all-wholesale-products/3226069.html?spm=2114.12010108.100004.3.7e3a5379KoyhDo diff --git a/en/m5stack-faq/M5Stack-Module/index.rst b/en/m5stack-faq/M5Stack-Module/index.rst index b64e31a4..18797adf 100644 --- a/en/m5stack-faq/M5Stack-Module/index.rst +++ b/en/m5stack-faq/M5Stack-Module/index.rst @@ -7,5 +7,3 @@ Thank you for being interested in our products and services, Please contact us b .. _tech support email: http://tech@m5stack.com .. _forum: http://forum.m5stack.com - - diff --git a/en/m5stack-faq/m5stack-module/index.rst b/en/m5stack-faq/m5stack-module/index.rst index b64e31a4..18797adf 100644 --- a/en/m5stack-faq/m5stack-module/index.rst +++ b/en/m5stack-faq/m5stack-module/index.rst @@ -7,5 +7,3 @@ Thank you for being interested in our products and services, Please contact us b .. _tech support email: http://tech@m5stack.com .. _forum: http://forum.m5stack.com - - diff --git a/en/m5stack-faq/m5stack-module/m5stack_module.md b/en/m5stack-faq/m5stack-module/m5stack_module.md new file mode 100644 index 00000000..1232c440 --- /dev/null +++ b/en/m5stack-faq/m5stack-module/m5stack_module.md @@ -0,0 +1,11 @@ +####Q1. The screen of PLC module displays as shown below +``` +OSError: [Errno 2] ENOENT +MicroPython v1.8.6-1089-g1365f7f-dirty on 2017-05-16; ESP32 module with ESP32 +Type "help()" for more information. +``` + +A1. `ENOENT` means os does not find `main.py` file + + +####Q2. PLC module displays as shown below diff --git a/en/product-documents/units/m5go_unit_makey.rst b/en/product-documents/units/m5go_unit_makey.rst index fe44dfe3..d3c51865 100644 --- a/en/product-documents/units/m5go_unit_makey.rst +++ b/en/product-documents/units/m5go_unit_makey.rst @@ -4,45 +4,26 @@ Unit makey DESCRIPTION ----------- -The Unit makey is a makey unit with 16 touchable pins. - -camera module contains thermopile sensors named MLX90640. the MLX90640 contains a 32x64 piexls IR array. It communicates with M5GO Core via GROVE which actually is a I2C interfacel. -As the images show you can detect surface temperatures from many feet away with an accuracy of ±1.5°C (best case). -After burn the firmware of the module's demostatrion to M5GO Core via `M5Burner`, the module will be running. Then you can program it via Arduino IDE. +The Unit makey is a makey unit with 16 touchable pins.The Unit makey is based on Arduino Uno Mega328p chip.It communicates with M5Stack Core via GROVE(I2C).It's I2C address is 0x51. FEATURES -------- -- 32x24 piexls -- Target temperature -40°C - 300°C +- Arduino Mega328p Controller +- 16 Keys(PD0-7 & PB0-5), 1 NeoPixel pin(PC2) and 1 Buzzer pin(PC3) - GROVE interface - Two Lego installation holes APPLICATION ------------ -- High precision non-contact temperature measurements -- Intrusion / Movement detection -- Visual IR thermometers -- Temperature sensing element for intelligent building air conditioning +- Makey Application +- RGB Application with Adafruit Library DOCUMENTS --------- -- GitHub - - + `Arduino GitHub `__ - - + `MLX90640 Drive GitHub `__ - -- Datasheet - - + `MLX90640 `__ - -- `QuickStart`_ - -.. _QuickStart: ../../get-started/M5GO/get_started_M5GO_makeyCam.html .. image:: ../../../_static/product_pics/units/M5GO_Unit_makey.png .. image:: ../../../_static/product_pics/units/M5GO_Unit_makey_interface.png diff --git a/en/product-documents/units/m5go_unit_rgb.rst b/en/product-documents/units/m5go_unit_rgb.rst index 5dbc327a..3bf30b64 100644 --- a/en/product-documents/units/m5go_unit_rgb.rst +++ b/en/product-documents/units/m5go_unit_rgb.rst @@ -17,4 +17,3 @@ DOCUMENTS --------- - `WebSite `__ -- `GitHub `__