From 1818a36f816af3f56f5d77fcfeadc671ce55114f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A1=A9=E5=85=A5=E5=AD=94=E7=AB=A0?= Date: Fri, 30 Nov 2018 18:53:19 +0800 Subject: [PATCH 1/3] fix some files --- docs/coverpage.md | 2 +- docs/en/practice/practice_blockly.md | 2 +- docs/en/practice/practice_micropython.md | 2 +- .../m5stack-core/m5core_fire.md | 2 +- .../m5stack-core/m5core_white.md | 2 +- .../m5stack-core/m5go_iot_starter_kit.md | 2 +- .../m5stack-core/minicore_stick.md | 2 +- .../product_documents/modules/module_servo.md | 4 +- .../product_documents/units/unit_396port.md | 2 +- docs/en/product_documents/units/unit_adc.md | 2 +- docs/en/product_documents/units/unit_angle.md | 2 +- .../en/product_documents/units/unit_button.md | 2 +- .../units/unit_color_sensor.md | 2 +- docs/en/product_documents/units/unit_dac.md | 2 +- .../units/unit_dual_button.md | 2 +- docs/en/product_documents/units/unit_earth.md | 2 +- docs/en/product_documents/units/unit_env.md | 2 +- docs/en/product_documents/units/unit_hub.md | 2 +- docs/en/product_documents/units/unit_ir.md | 2 +- .../product_documents/units/unit_joystick.md | 2 +- docs/en/product_documents/units/unit_light.md | 2 +- docs/en/product_documents/units/unit_makey.md | 2 +- docs/en/product_documents/units/unit_ncir.md | 2 +- .../product_documents/units/unit_neopixel.md | 4 +- docs/en/product_documents/units/unit_pir.md | 2 +- docs/en/product_documents/units/unit_proto.md | 2 +- docs/en/product_documents/units/unit_relay.md | 2 +- docs/en/product_documents/units/unit_rgb.md | 2 +- .../product_documents/units/unit_thermal.md | 2 +- docs/en/product_documents/units/unit_tof.md | 2 +- docs/en/quick_start.md | 2 +- docs/en/quick_start/bala/bala_quick_start.md | 2 + .../faces/gameboy_burn_a_nes_game.md | 2 + .../m5camera/m5camera_quick_start.md | 2 + .../m5stack_core_get_started_Arduino_MacOS.md | 2 + ...5stack_core_get_started_Arduino_Windows.md | 2 + .../m5stack_core_get_started_MicroPython.md | 12 ++-- ...ck_core_get_started_MicroPython_m5cloud.md | 4 +- .../m5core/m5stack_core_quick_start.md | 2 + .../m5core/m5stick_get_started_arduino.md | 2 + .../related_documents/how_to_burn_firmware.md | 10 ++- .../how_to_connect_wifi_using_core.md | 4 +- ...to_connect_wifi_using_core_with_m5cloud.md | 2 +- docs/ja/faq.md | 25 +++++++- docs/ja/practice/practice_arduino.md | 4 +- docs/ja/practice/practice_blockly.md | 6 +- docs/ja/practice/practice_micropython.md | 6 +- docs/ja/product_documents/bases/lan_base.md | 4 +- docs/ja/product_documents/bases/plc_base.md | 2 + .../m5stack-core/m5core_white.md | 2 +- .../m5stack-core/m5go_iot_starter_kit.md | 2 +- .../m5stack-core/minicore_stick.md | 2 +- docs/ja/quick_start.md | 6 +- .../m5stack_core_get_started_MicroPython.md | 61 +++++++++---------- ...ck_core_get_started_MicroPython_m5cloud.md | 51 ++++++++-------- .../m5core/m5stack_core_quick_start.md | 4 +- .../m5core/m5stick_get_started_arduino.md | 12 ++-- .../how_to_connect_wifi_using_core.md | 4 +- ...to_connect_wifi_using_core_with_m5cloud.md | 31 +++++----- docs/zh_CN/practice/practice_arduino.md | 5 ++ docs/zh_CN/practice/practice_blockly.md | 5 ++ docs/zh_CN/practice/practice_micropython.md | 5 ++ .../m5stack-core/m5core_basic.md | 4 +- .../m5stack-core/m5core_fire.md | 4 +- .../m5stack-core/m5core_gray.md | 4 +- .../m5stack-core/m5go_iot_starter_kit.md | 4 +- .../m5stack-core/minicore_stick.md | 2 +- .../product_documents/modules/module_gps.md | 2 +- .../product_documents/modules/module_lora.md | 2 +- .../product_documents/modules/module_servo.md | 4 +- .../modules/module_sim800.md | 2 +- .../product_documents/units/unit_396port.md | 2 +- .../zh_CN/product_documents/units/unit_adc.md | 2 +- .../product_documents/units/unit_angle.md | 2 +- .../product_documents/units/unit_button.md | 2 +- .../zh_CN/product_documents/units/unit_dac.md | 2 +- .../units/unit_dual_button.md | 2 +- .../product_documents/units/unit_earth.md | 2 +- docs/zh_CN/product_documents/units/unit_ir.md | 2 +- .../product_documents/units/unit_joystick.md | 2 +- .../product_documents/units/unit_light.md | 2 +- .../product_documents/units/unit_makey.md | 2 +- .../product_documents/units/unit_ncir.md | 2 +- .../product_documents/units/unit_neopixel.md | 4 +- .../zh_CN/product_documents/units/unit_pir.md | 2 +- .../product_documents/units/unit_proto.md | 2 +- .../product_documents/units/unit_relay.md | 2 +- .../zh_CN/product_documents/units/unit_rgb.md | 2 +- .../product_documents/units/unit_thermal.md | 2 +- .../zh_CN/product_documents/units/unit_tof.md | 2 +- docs/zh_CN/quick_start.md | 2 +- .../quick_start/bala/bala_quick_start.md | 2 + .../faces/gameboy_burn_a_nes_game.md | 2 + .../m5camera/m5camera_quick_start.md | 2 + .../m5stack_core_get_started_Arduino_MacOS.md | 2 + ...5stack_core_get_started_Arduino_Windows.md | 2 + .../m5stack_core_get_started_MicroPython.md | 18 +++--- ...ck_core_get_started_MicroPython_m5cloud.md | 4 +- .../m5core/m5stack_core_quick_start.md | 4 +- .../m5core/m5stick_get_started_arduino.md | 2 + .../related_documents/how_to_burn_firmware.md | 10 ++- .../how_to_connect_wifi_using_core.md | 10 +-- ...to_connect_wifi_using_core_with_m5cloud.md | 2 +- 103 files changed, 287 insertions(+), 192 deletions(-) create mode 100644 docs/zh_CN/practice/practice_arduino.md create mode 100644 docs/zh_CN/practice/practice_blockly.md create mode 100644 docs/zh_CN/practice/practice_micropython.md diff --git a/docs/coverpage.md b/docs/coverpage.md index dfe75f5f..569c9df9 100644 --- a/docs/coverpage.md +++ b/docs/coverpage.md @@ -4,7 +4,7 @@ - A series of modular stackable development devices integrating WIFI/BLE - For Industry Development/STEM Education -- Programming with UIFlow(Blockly/MicroPython) +- Programming with UiFlow(Blockly/MicroPython) [Official Website](http://www.m5stack.com) [Introdction](#main) diff --git a/docs/en/practice/practice_blockly.md b/docs/en/practice/practice_blockly.md index b8a60980..6d712f33 100644 --- a/docs/en/practice/practice_blockly.md +++ b/docs/en/practice/practice_blockly.md @@ -1,4 +1,4 @@ -# Practice for M5Flow(Blockly) +# Practice for UiFlow(Blockly) [中文](/zh_CN/practice/practice_blockly) | English | [日本語](/ja/practice/practice_blockly) diff --git a/docs/en/practice/practice_micropython.md b/docs/en/practice/practice_micropython.md index 35fc9b29..2697f115 100644 --- a/docs/en/practice/practice_micropython.md +++ b/docs/en/practice/practice_micropython.md @@ -1,4 +1,4 @@ -# Practice for M5Flow(MicroPython) +# Practice for UiFlow(MicroPython) [中文](/zh_CN/practice/practice_micropython) | English | [日本語](/ja/practice/practice_micropython) diff --git a/docs/en/product_documents/m5stack-core/m5core_fire.md b/docs/en/product_documents/m5stack-core/m5core_fire.md index d7a5ac25..9da7d037 100644 --- a/docs/en/product_documents/m5stack-core/m5core_fire.md +++ b/docs/en/product_documents/m5stack-core/m5core_fire.md @@ -13,7 +13,7 @@ M5Go CHG. Base is composed of POGO pin. M5Go Base is composed of PORT B, PORT C, ## FEATURES - Programming Support - - M5Flow + - UiFlow - MicroPython - Arduino - Compatible LEGO diff --git a/docs/en/product_documents/m5stack-core/m5core_white.md b/docs/en/product_documents/m5stack-core/m5core_white.md index 4ee71fdf..07540c12 100644 --- a/docs/en/product_documents/m5stack-core/m5core_white.md +++ b/docs/en/product_documents/m5stack-core/m5core_white.md @@ -13,7 +13,7 @@ The a Bottom board on the back of M5Core. It's designed for expanding gpio on M- ## FEATURES - Programming Support - - M5Flow + - UiFlow - MicroPython - Arduino - Compatible LEGO diff --git a/docs/en/product_documents/m5stack-core/m5go_iot_starter_kit.md b/docs/en/product_documents/m5stack-core/m5go_iot_starter_kit.md index 008aa537..497a3ef9 100644 --- a/docs/en/product_documents/m5stack-core/m5go_iot_starter_kit.md +++ b/docs/en/product_documents/m5stack-core/m5go_iot_starter_kit.md @@ -6,7 +6,7 @@ **M5GO IOT Starter Kit** is a kit designed for learning IOT programming which consists of 6 units(ENV, IR, RGB, PIR, ANGLE, HUB) and one white M5Core(based on ESP32 chip). -Programming M5GO with [M5Flow](http://flow.m5stack.com) or Arduino IDE. +Programming M5GO with [UiFlow](http://flow.m5stack.com) or Arduino IDE. We also supply some courses for teaching IOT programming. If you are interesting in it, contact us through Email please. diff --git a/docs/en/product_documents/m5stack-core/minicore_stick.md b/docs/en/product_documents/m5stack-core/minicore_stick.md index e83c8d11..ceabb942 100644 --- a/docs/en/product_documents/m5stack-core/minicore_stick.md +++ b/docs/en/product_documents/m5stack-core/minicore_stick.md @@ -10,7 +10,7 @@ There are two version of it. One M5Stick does not contain MPU9250, another versi ## FEATURES -- Programming Support: Arduino, UIFlow(Blockly, MicroPython) +- Programming Support: Arduino, UiFlow(Blockly, MicroPython) - Wearable - Optional MEMS: MPU9250 diff --git a/docs/en/product_documents/modules/module_servo.md b/docs/en/product_documents/modules/module_servo.md index aa34c6fa..402662b8 100644 --- a/docs/en/product_documents/modules/module_servo.md +++ b/docs/en/product_documents/modules/module_servo.md @@ -6,7 +6,7 @@ Servo is a servo-motor driver module which can drive 12-way servo motors simultaneously. But actually, in our experiment, because of the maximum current, the maximum number of servo motor it can drive is 9. So we will publish a upgraded version soon after. -It's too easy to drive servo motors so that you can drive many servo motors after programmed 2-3 lines code in Arduino IDE or dragged 2-3 block in M5Flow. +It's too easy to drive servo motors so that you can drive many servo motors after programmed 2-3 lines code in Arduino IDE or dragged 2-3 block in UiFlow. Servo is communicated with M5Core through GROVE interface(I2C communication). The I2C address is 0x53. @@ -14,7 +14,7 @@ Servo is communicated with M5Core through GROVE interface(I2C communication). Th - Drive multi-way servo motor simultaneously - Support wide-voltage power input: 6-12V -- Support programming with Arduino IDE or M5Flow +- Support programming with Arduino IDE or UiFlow ## INCLUDES diff --git a/docs/en/product_documents/units/unit_396port.md b/docs/en/product_documents/units/unit_396port.md index de832d36..ce970b69 100644 --- a/docs/en/product_documents/units/unit_396port.md +++ b/docs/en/product_documents/units/unit_396port.md @@ -9,7 +9,7 @@ ## FEATURES - VH3.96 interface -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_adc.md b/docs/en/product_documents/units/unit_adc.md index 4dd63a5a..327b6882 100644 --- a/docs/en/product_documents/units/unit_adc.md +++ b/docs/en/product_documents/units/unit_adc.md @@ -12,7 +12,7 @@ This is a unit having self-calibrating function and 16bit analog-to-digitial cov - Programmable gain amplifier - Gain = 1, 2, 4, OR 8 - Detect 0~12V voltage Input -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_angle.md b/docs/en/product_documents/units/unit_angle.md index 5dbecc8f..68aa6a46 100644 --- a/docs/en/product_documents/units/unit_angle.md +++ b/docs/en/product_documents/units/unit_angle.md @@ -9,7 +9,7 @@ angle. ## FEATURES -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_button.md b/docs/en/product_documents/units/unit_button.md index 2895559e..21f9a629 100644 --- a/docs/en/product_documents/units/unit_button.md +++ b/docs/en/product_documents/units/unit_button.md @@ -8,7 +8,7 @@ The Unit BUTTON is a sigle-button unit that can be detected whether the button p ## FEATURES -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_color_sensor.md b/docs/en/product_documents/units/unit_color_sensor.md index 340b6b4d..40b75b07 100644 --- a/docs/en/product_documents/units/unit_color_sensor.md +++ b/docs/en/product_documents/units/unit_color_sensor.md @@ -10,7 +10,7 @@ This is a unit can detecte the color of object surface which integrates TCS3472 - High precision - Detection range: -70℃~382.2℃ -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_dac.md b/docs/en/product_documents/units/unit_dac.md index cf9780c6..b24c135d 100644 --- a/docs/en/product_documents/units/unit_dac.md +++ b/docs/en/product_documents/units/unit_dac.md @@ -12,7 +12,7 @@ This is a unit can convert digital signal to analog signal like voltage waveform - Up to 12 bits of resolution - Output 0~3.3V voltage -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_dual_button.md b/docs/en/product_documents/units/unit_dual_button.md index d5595dbf..c560a3df 100644 --- a/docs/en/product_documents/units/unit_dual_button.md +++ b/docs/en/product_documents/units/unit_dual_button.md @@ -8,7 +8,7 @@ This Unit is a dual-button unit that can be detected whether a single button pre ## FEATURES -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_earth.md b/docs/en/product_documents/units/unit_earth.md index e4acd001..71f1b9db 100644 --- a/docs/en/product_documents/units/unit_earth.md +++ b/docs/en/product_documents/units/unit_earth.md @@ -11,7 +11,7 @@ You can read the moisture in soil staright or get a digital signal(0/1) that mea - Adjustable threshold, including 10K adjustable resistor - Analog & Digital output -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_env.md b/docs/en/product_documents/units/unit_env.md index 2e4a118c..4b31709b 100644 --- a/docs/en/product_documents/units/unit_env.md +++ b/docs/en/product_documents/units/unit_env.md @@ -19,7 +19,7 @@ temperature and humidity sensor and absolute barometric pressure sensor. - Air pressure - measuring range: 300 ~ 1100hPa - resolution: ±1hPa -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_hub.md b/docs/en/product_documents/units/unit_hub.md index 9e44b131..f56b755d 100644 --- a/docs/en/product_documents/units/unit_hub.md +++ b/docs/en/product_documents/units/unit_hub.md @@ -11,7 +11,7 @@ Core at a time. ## FEATURES - Instantly Add Three 4-Pins-GROVE ports to Any Compatible Device -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_ir.md b/docs/en/product_documents/units/unit_ir.md index bd1f51a9..f32d02f4 100644 --- a/docs/en/product_documents/units/unit_ir.md +++ b/docs/en/product_documents/units/unit_ir.md @@ -18,7 +18,7 @@ same time signal output interface to output digital signal. - A pair of infrared transmitting and receiving tube - Detects the distance 2 ~ 5cm -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_joystick.md b/docs/en/product_documents/units/unit_joystick.md index c019e644..32aa90a0 100644 --- a/docs/en/product_documents/units/unit_joystick.md +++ b/docs/en/product_documents/units/unit_joystick.md @@ -8,7 +8,7 @@ This Unit is a joystick unit the same as game controller button that can be dete ## FEATURES -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_light.md b/docs/en/product_documents/units/unit_light.md index 236cc329..89aea28f 100644 --- a/docs/en/product_documents/units/unit_light.md +++ b/docs/en/product_documents/units/unit_light.md @@ -12,7 +12,7 @@ You can read analog signal(environmental light intensity) staright or get a digi - Adjustable threshold, including 10K adjustable resistor - Analog & Digital output -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_makey.md b/docs/en/product_documents/units/unit_makey.md index 1d6b266a..c1e102a0 100644 --- a/docs/en/product_documents/units/unit_makey.md +++ b/docs/en/product_documents/units/unit_makey.md @@ -11,7 +11,7 @@ The Unit makey is a makey unit with 16 touchable pins.The Unit makey is based on - Arduino Mega328p Controller - 16 Keys Fruit Piano(PD0-7 & PB0-5), 1 NeoPixel pin(PC2) and 1 Buzzer pin(PC3) - Buzzer inside -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_ncir.md b/docs/en/product_documents/units/unit_ncir.md index 13942c3d..2655d1fd 100644 --- a/docs/en/product_documents/units/unit_ncir.md +++ b/docs/en/product_documents/units/unit_ncir.md @@ -10,7 +10,7 @@ This is a unit can measure body temperature or be applicated for movement detect - High precision - Detection range: -70℃~382.2℃ -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_neopixel.md b/docs/en/product_documents/units/unit_neopixel.md index 989df00d..cfd6bd05 100644 --- a/docs/en/product_documents/units/unit_neopixel.md +++ b/docs/en/product_documents/units/unit_neopixel.md @@ -4,12 +4,12 @@ ## DESCRIPTION -This is a RGB LED Cable unit. You can program it using NeoPixel Lib supported by Adafruit or using M5Flow that will be easier. The unit comunicates with M5Core with GROVE Interface. +This is a RGB LED Cable unit. You can program it using NeoPixel Lib supported by Adafruit or using UiFlow that will be easier. The unit comunicates with M5Core with GROVE Interface. ## FEATURES - the length: 10cm/20cm/0.5m/1m/2m -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_pir.md b/docs/en/product_documents/units/unit_pir.md index 0084314c..8300f146 100644 --- a/docs/en/product_documents/units/unit_pir.md +++ b/docs/en/product_documents/units/unit_pir.md @@ -10,7 +10,7 @@ whether someone appears in front of it with M5GO Core. ## FEATURES - Detects the distance 150cm -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_proto.md b/docs/en/product_documents/units/unit_proto.md index 6e80d271..702a311e 100644 --- a/docs/en/product_documents/units/unit_proto.md +++ b/docs/en/product_documents/units/unit_proto.md @@ -12,7 +12,7 @@ that could controlled by M5GO Core as you like. - Flexible extended blank circle - 70 holes(pitch of holes: 100mil) -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_relay.md b/docs/en/product_documents/units/unit_relay.md index fc41ab7d..0921a67a 100644 --- a/docs/en/product_documents/units/unit_relay.md +++ b/docs/en/product_documents/units/unit_relay.md @@ -11,7 +11,7 @@ Only a low electrial level is sent to this unit, the relay will be close and the ## FEATURES - A single input - Up to 3A @ 24 VDC or 120 VAC -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_rgb.md b/docs/en/product_documents/units/unit_rgb.md index 56c24e6b..3e8c34b4 100644 --- a/docs/en/product_documents/units/unit_rgb.md +++ b/docs/en/product_documents/units/unit_rgb.md @@ -10,7 +10,7 @@ Arduino or MicroPython. ## FEATURES -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## DOCUMENTS diff --git a/docs/en/product_documents/units/unit_thermal.md b/docs/en/product_documents/units/unit_thermal.md index e23ffaa6..a6df5c19 100644 --- a/docs/en/product_documents/units/unit_thermal.md +++ b/docs/en/product_documents/units/unit_thermal.md @@ -13,7 +13,7 @@ After burn the firmware of the module's demostatrion to M5GO Core via `M5Burner` - 32x24 piexls - Target temperature -40°C ÷ 300°C -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/product_documents/units/unit_tof.md b/docs/en/product_documents/units/unit_tof.md index b68bea66..96418e0e 100644 --- a/docs/en/product_documents/units/unit_tof.md +++ b/docs/en/product_documents/units/unit_tof.md @@ -10,7 +10,7 @@ This is a unit can detect distance using a newest "Time-to-Flight" sensor using - High precision - Measure absolute distances up to 2m -- GROVE interface, support [M5Flow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) +- GROVE interface, support [UiFlow](http://flow.m5stack.com) and [Arduino](http://www.arduino.cc) - Two Lego installation holes ## APPLICATION diff --git a/docs/en/quick_start.md b/docs/en/quick_start.md index 09a15464..8d9d6516 100644 --- a/docs/en/quick_start.md +++ b/docs/en/quick_start.md @@ -39,7 +39,7 @@ If you have one of ESP32 development boards listed below, click the correspondin | | ---|---|--- -[Arduino](/en/practice/practice_arduino) | [M5Flow-Blockly](/en/practice/practice_blockly) | [M5Flow-MicroPython](/en/practice/practice_micropython) --> +[Arduino](/en/practice/practice_arduino) | [UiFlow-Blockly](/en/practice/practice_blockly) | [UiFlow-MicroPython](/en/practice/practice_micropython) --> ## Related Documents diff --git a/docs/en/quick_start/bala/bala_quick_start.md b/docs/en/quick_start/bala/bala_quick_start.md index ba578d81..b9544f29 100644 --- a/docs/en/quick_start/bala/bala_quick_start.md +++ b/docs/en/quick_start/bala/bala_quick_start.md @@ -1,3 +1,5 @@ # BALA Get Started +[中文](zh_CN/quick_start/bala/bala_quick_start) | English | [日本語](ja/quick_start/bala/bala_quick_start) + ## (coming soon...) \ No newline at end of file diff --git a/docs/en/quick_start/faces/gameboy_burn_a_nes_game.md b/docs/en/quick_start/faces/gameboy_burn_a_nes_game.md index c96b141d..3f2f130d 100644 --- a/docs/en/quick_start/faces/gameboy_burn_a_nes_game.md +++ b/docs/en/quick_start/faces/gameboy_burn_a_nes_game.md @@ -1,5 +1,7 @@ # Burn A NES Game +[中文](zh_CN/quick_start/faces/gameboy_burn_a_nes_game) | English | [日本語](ja/quick_start/faces/gameboy_burn_a_nes_game) + *This document will help you for burning a gameboy game(NES file) so that you can play a game with GameBoy Keyboard.* ## CONTENT diff --git a/docs/en/quick_start/m5camera/m5camera_quick_start.md b/docs/en/quick_start/m5camera/m5camera_quick_start.md index b2a9c348..a0df960b 100644 --- a/docs/en/quick_start/m5camera/m5camera_quick_start.md +++ b/docs/en/quick_start/m5camera/m5camera_quick_start.md @@ -1,5 +1,7 @@ # ESP32Cam/M5Camera Quick Start +[中文](zh_CN/quick_start/m5camera/m5camera_quick_start) | English | [日本語](ja/quick_start/m5camera/m5camera_quick_start) + ## 1. Out-of-the-box Demo It is really really out of the box. Your ESP32Cam/M5Camera will immediately run without any code after you power it. diff --git a/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md b/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md index 7239fef2..4e0e840e 100644 --- a/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md +++ b/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md @@ -1,5 +1,7 @@ # M5Core Quick Start(macOS, Arudino) +[中文](zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) | English | [日本語](ja/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) + ?> **Tip** If your OS is Windows, please click [here](/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows). ## CONTENT diff --git a/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md b/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md index de9c9722..2a998aa3 100644 --- a/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md +++ b/docs/en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md @@ -1,5 +1,7 @@ # M5Core Quick Start(Windows, Arudino) +[中文](zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows) | English | [日本語](ja/quick_start/m5core/m5stack_core_get_started_Arduino_Windows) + ?> **Tip** If your OS is MacOS, please click [here](/en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS). ## CONTENT diff --git a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md index bfa71d04..e32213ff 100644 --- a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md +++ b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython.md @@ -1,6 +1,8 @@ -# M5Flow Quick Start(Blockly/MicroPython) +# UiFlow Quick Start(Blockly/MicroPython) -?> **Tip** *a. If your M5Stack Core was not burnt with a specific firmware named `M5Flow` in advance, please visit this article [How to burn firmware](/en/related_documents/how_to_burn_firmware) for burnning). b. If it's first time to use M5Stack Core or you want to change the networkable AP that means the Core can't access [flow.m5stack.com](flow.m5stack.com), you need visit this article for setting wifi [How to connect wifi using Core](/en/related_documents/how_to_connect_wifi_using_core).* +[中文](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython) | English | [日本語](ja/quick_start/m5core/m5stack_core_get_started_MicroPython) + +?> **Tip** *a. If your M5Stack Core was not burnt with a specific firmware named `UiFlow` in advance, please visit this article [How to burn firmware](/en/related_documents/how_to_burn_firmware) for burnning). b. If it's first time to use M5Stack Core or you want to change the networkable AP that means the Core can't access [flow.m5stack.com](flow.m5stack.com), you need visit this article for setting wifi [How to connect wifi using Core](/en/related_documents/how_to_connect_wifi_using_core).* *By default, we account your M5Core has been connected with the networkable AP. And the screen shows like this figure below after you pressed the `UPLOAD` button on the left.* @@ -12,14 +14,14 @@ ## **CONTENT** -1. [Connect to M5Flow](#connect-to-m5flow) +1. [Connect to UiFlow](#connect-to-uiflow) 2. [Program with Core](#program-with-core) 3. [Play a song now](#play-a-song-now) -## **1. Connect to M5Flow** +## **1. Connect to UiFlow** 1. Now you scan the QR code with your phone or tablet to start programming on your mobile device. If you want to program the M5 from your computer, enter the url shown at the top of the screen `flow.m5stack.com`. It will show as following figure. @@ -33,7 +35,7 @@ -Then M5Flow will connect with this Core. +Then UiFlow will connect with this Core. At the moment, you can draw a UI or program it through Blockly(or Python) as shown below. diff --git a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md index 46b1794e..3e1c83d4 100644 --- a/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md +++ b/docs/en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md @@ -1,5 +1,7 @@ # M5Cloud Quick Start(MicroPython) +[中文](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) | English | [日本語](ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) + ?> **Note** *If it's first time to use M5Core or you want to change the networkable AP that means the Core can't access [http://cloud.m5stack.com](http://cloud.m5stack.com), you need visit this article for setting wifi [How to connect wifi using Core with M5Cloud](/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud).* *By default, we consider your M5Core has been connected with the networkable AP successfully. And the screen shows like this figure below.* @@ -43,7 +45,7 @@ Press `Device`->`Add` buttom on M5Cloud IDE for binding M5Stack board to your ac At the moment, you can program it through Python as shown below. -## 2. Program with Core +## 3. Program with Core ### a. New a Project 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 5aa2ac62..96232b76 100644 --- a/docs/en/quick_start/m5core/m5stack_core_quick_start.md +++ b/docs/en/quick_start/m5core/m5stack_core_quick_start.md @@ -1,5 +1,7 @@ # M5Stack Core Get Started +[中文](zh_CN/quick_start/m5core/m5stack_core_quick_start) | English | [日本語](ja/quick_start/m5core/m5stack_core_quick_start) + ## Pick up your programming mode below for getting started | diff --git a/docs/en/quick_start/m5core/m5stick_get_started_arduino.md b/docs/en/quick_start/m5core/m5stick_get_started_arduino.md index 15966630..e085dc3c 100644 --- a/docs/en/quick_start/m5core/m5stick_get_started_arduino.md +++ b/docs/en/quick_start/m5core/m5stick_get_started_arduino.md @@ -1,5 +1,7 @@ # M5Stick Quick Start(Arduino) +[中文](zh_CN/quick_start/m5core/m5stick_get_started_arduino) | English | [日本語](ja/quick_start/m5core/m5stick_get_started_arduino) + ## 1. Install `U8g2` library If you have installed `U8g2`, then just run and upload your m5stick's poject. diff --git a/docs/en/related_documents/how_to_burn_firmware.md b/docs/en/related_documents/how_to_burn_firmware.md index 251b8791..6dc7c312 100644 --- a/docs/en/related_documents/how_to_burn_firmware.md +++ b/docs/en/related_documents/how_to_burn_firmware.md @@ -24,7 +24,7 @@ Unzip the M5Burner tool which you donwloaded for official website just now, then **Then choice the `serial port` which is connected with your board and the `Baud` which is 921600 following below steps. Choice a right firmware, click `Erase` and then click `Burn`.** -?> **Tip** **a.** If you want to program with [M5Flow](http://flow.m5stack.com)(/[M5Cloud](http://cloud.m5stack.com)), select `M5Flow-vx.x`(/`M5Cloud-vx.x.x`) option(the lastest version). **b.** If you own a ESP32CAM (/ M5CAMERA), select `M5Cam-vx.x (/M5Cam-psram)` option +?> **Tip** **a.** If you want to program with [UiFlow](http://flow.m5stack.com)(/[M5Cloud](http://cloud.m5stack.com)), select `M5Flow-vx.x`(/`M5Cloud-vx.x.x`) option(the lastest version). **b.** If you own a ESP32CAM (/ M5CAMERA), select `M5Cam-vx.x (/M5Cam-psram)` option
@@ -32,6 +32,14 @@ Unzip the M5Burner tool which you donwloaded for official website just now, then !> **Notice** If it does not display any ``COMx`` port or only ``COM1`` exists at the option, you need to visit this article [establish_serial_connection](/en/related_documents/establish_serial_connection) and reinstall the USB driver. +**a. Choice a right firmware** + +a. select `M5Flow-vx.x` option(the lastest version), if you want to program with [UiFlow](http://flow.m5stack.com) + +b. select `M5Cam-vx.x (/M5Cam-psram)` option, if you own a ESP32CAM (/ M5CAMERA) + +**b. Click `Erase`** +
Screenshot of coverpage
diff --git a/docs/en/related_documents/how_to_connect_wifi_using_core.md b/docs/en/related_documents/how_to_connect_wifi_using_core.md index afb764b3..cf12da20 100644 --- a/docs/en/related_documents/how_to_connect_wifi_using_core.md +++ b/docs/en/related_documents/how_to_connect_wifi_using_core.md @@ -2,7 +2,7 @@ [中文](/zh_CN/related_documents/how_to_connect_wifi_using_core) | English | [日本語](ja/related_documents/how_to_connect_wifi_using_core) -?> **Tip** *If your M5Stack Core was not burnt with a specific firmware named `M5Flow` in advance, please visit this article [How to burn firmware](/en/related_documents/how_to_burn_firmware) for burnning)* +?> **Tip** *If your M5Stack Core was not burnt with a specific firmware named `UiFlow` in advance, please visit this article [How to burn firmware](/en/related_documents/how_to_burn_firmware) for burnning)* **After powering on Core and pressing the red button on the left hand side of the M5，you will be greeted by this screen. Let's connect to networkable AP.** @@ -45,7 +45,7 @@ ## Complete -Once you've reset M5Stack Core, pressed the upload buttom, you will arrive at a screen with a QR code. Now, you can try to program with your core following this article [Quick Start with M5Flow](/en/quick_start/m5core/m5stack_core_get_started_MicroPython) +Once you've reset M5Stack Core, pressed the upload buttom, you will arrive at a screen with a QR code. Now, you can try to program with your core following this article [Quick Start with UiFlow](/en/quick_start/m5core/m5stack_core_get_started_MicroPython)
diff --git a/docs/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md b/docs/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md index c213755f..04fc64ee 100644 --- a/docs/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md +++ b/docs/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md @@ -24,7 +24,7 @@ ## 2. Select Networkable AP -**Then open brower to login 192.168.4.1 for setting your networkable WIFI name and password. (Now, my networkable wifi is named `MasterHax_5G`)** +**Then open brower to login 192.168.4.1 for setting your networkable WIFI name and password. (Now, my networkable wifi is named `MasterHax_2.4G`)**
diff --git a/docs/ja/faq.md b/docs/ja/faq.md index 87dc014d..b6e1808c 100644 --- a/docs/ja/faq.md +++ b/docs/ja/faq.md @@ -2,4 +2,27 @@ [中文](/zh_CN/faq) | [English](/en/faq) | 日本語 -## (近日公開...) \ No newline at end of file +--- + +- Q. USB Type-C ケーブルに上下はありますか？ + - A. ありません。上下どちらでも使用可能です。 + +--- + +- Q. ArduinoでI2Cがうまく動きません。 + - A. ボードマネージャを利用して導入されるesp32ライブラリstable-1.0.0にはI2Cまわりにバグがあり、使用できない場合があります。最新のライブラリを[GitHub](https://github.com/espressif/arduino-esp32)より取得することで回避可能です。 + +--- + +- Q. UiFlowのソースは公開されていますか？ + - A. 現在公開はされていません。もしかしたら将来公開されるかもしれません。 + +--- + +- Q. XXX の使い方がわかりません。 + - A. Twitterで [@M5Stack](https://twitter.com/M5Stack) 宛てにメッセージをお送りください。 + +--- + +- Q. 買った時から XXX が壊れています。 + - A. お買い求め担ったお店にお問い合わせいただくか、またはTwitterで [@M5Stack](https://twitter.com/M5Stack) 宛てにメッセージをお送りください。 \ No newline at end of file diff --git a/docs/ja/practice/practice_arduino.md b/docs/ja/practice/practice_arduino.md index d6210c09..3a0bd50f 100644 --- a/docs/ja/practice/practice_arduino.md +++ b/docs/ja/practice/practice_arduino.md @@ -1,3 +1,5 @@ # Practice for Arduino -## (coming soon...) \ No newline at end of file +[中文](/zh_CN/practice/practice_arduino) | [English](/en/practice/practice_arduino) | 日本語 + +## (近日公開...) \ No newline at end of file diff --git a/docs/ja/practice/practice_blockly.md b/docs/ja/practice/practice_blockly.md index f00c7e32..18614617 100644 --- a/docs/ja/practice/practice_blockly.md +++ b/docs/ja/practice/practice_blockly.md @@ -1,3 +1,5 @@ -# Practice for M5Flow(Blockly) +# Practice for UiFlow(Blockly) -## (coming soon...) \ No newline at end of file +[中文](/zh_CN/practice/practice_blockly) | [English](/en/practice/practice_blockly) | 日本語 + +## (近日公開...) \ No newline at end of file diff --git a/docs/ja/practice/practice_micropython.md b/docs/ja/practice/practice_micropython.md index 0bbb18ea..db737d8e 100644 --- a/docs/ja/practice/practice_micropython.md +++ b/docs/ja/practice/practice_micropython.md @@ -1,3 +1,5 @@ -# Practice for M5Flow(MicroPython) +# Practice for UiFlow(MicroPython) -## (coming soon...) \ No newline at end of file +[中文](/zh_CN/practice/practice_micropython) | [English](/en/practice/practice_micropython) | 日本語 + +## (近日公開...) \ No newline at end of file diff --git a/docs/ja/product_documents/bases/lan_base.md b/docs/ja/product_documents/bases/lan_base.md index c9869d2f..b0ac9199 100644 --- a/docs/ja/product_documents/bases/lan_base.md +++ b/docs/ja/product_documents/bases/lan_base.md @@ -6,7 +6,7 @@ **LAN**ベースはI2Cとユーザ定義の6ピンポートによってイーサネット通信が可能なベースです。 -M5Stackの無線通信が遅かったり、無線ネットワークに繋がらない時に、このLANベースを利用して、それらの厄介な問題を解決すルことができます。 +M5Stackの無線通信が遅かったり、無線ネットワークに繋がらない時に、このLANベースを利用して、それらの厄介な問題を解決することができます。 ## 特徴 @@ -14,7 +14,7 @@ M5Stackの無線通信が遅かったり、無線ネットワークに繋がら ## パッケージ内容 -- 1x M5Stack LAN ベース(ユーザ定義 6 PIN and 1 Groveポート) +- 1x LAN ベース(ユーザ定義 6 PIN and 1 Groveポート) - 1x DINレール - 1x ステッカー diff --git a/docs/ja/product_documents/bases/plc_base.md b/docs/ja/product_documents/bases/plc_base.md index 7d85a360..8b9104e6 100644 --- a/docs/ja/product_documents/bases/plc_base.md +++ b/docs/ja/product_documents/bases/plc_base.md @@ -1,5 +1,7 @@ # PLC ベース +[中文](zh_CN/product_documents/bases/base_node) | [English](/en/product_documents/bases/base_node) | 日本語 + ## 概要 **M5Stack PLC**ベースはRS-485アダプタを含む工業向けベースです。 diff --git a/docs/ja/product_documents/m5stack-core/m5core_white.md b/docs/ja/product_documents/m5stack-core/m5core_white.md index 14bb2b68..7dc6b142 100644 --- a/docs/ja/product_documents/m5stack-core/m5core_white.md +++ b/docs/ja/product_documents/m5stack-core/m5core_white.md @@ -13,7 +13,7 @@ M5Coreの下のボトムボードには、I2Sピン(GPIO0, GPIO12, GPIO13, GPIO1 ## 特徴 - プログラミングサポート - - M5Flow + - UiFlow - MicroPython - Arduino - LEGO 互換ホール diff --git a/docs/ja/product_documents/m5stack-core/m5go_iot_starter_kit.md b/docs/ja/product_documents/m5stack-core/m5go_iot_starter_kit.md index 770b6f34..f475894d 100644 --- a/docs/ja/product_documents/m5stack-core/m5go_iot_starter_kit.md +++ b/docs/ja/product_documents/m5stack-core/m5go_iot_starter_kit.md @@ -6,7 +6,7 @@ **M5GO IoT Starter Kit**は6つのユニット(ENV, IR, RGB, PIR, ANGLE, HUB)と1つの白いM5Core(ESP32ベース)からなる、IoTプログラミング学習キットです。 -[M5Flow](http://flow.m5stack.com)や**Arduino IDE**を使用してプログラミングすることができます。 +[UiFlow](http://flow.m5stack.com)や**Arduino IDE**を使用してプログラミングすることができます。 また私たちはIoTプログラミングトレーニングコースも提供しています。 興味がある方は、電子メールまでご連絡ください。 diff --git a/docs/ja/product_documents/m5stack-core/minicore_stick.md b/docs/ja/product_documents/m5stack-core/minicore_stick.md index cb2de326..be683d4d 100644 --- a/docs/ja/product_documents/m5stack-core/minicore_stick.md +++ b/docs/ja/product_documents/m5stack-core/minicore_stick.md @@ -12,7 +12,7 @@ - サポートプログラミング - Arduino - - UIFlow (Blockly / MicroPython) + - UiFlow (Blockly / MicroPython) - ウェアラブル - MEMS IMU(MPU9250版のみ) diff --git a/docs/ja/quick_start.md b/docs/ja/quick_start.md index fe18798d..11cdf5e6 100644 --- a/docs/ja/quick_start.md +++ b/docs/ja/quick_start.md @@ -8,11 +8,11 @@ **M5Stackはモジュール積み重ねるタイプの開発デバイスです。M5Stackの名前はModuleのM、5x5cmサイズの5、積み重ねるを意味するStackからきています。** -## 必要なもの +## 開発に必要なもの M5Stackを使った開発に必要なもの: -* **PC** Windows、Mac、LinuxいずれかのOSがインストールされていること +* **PC** (Windows、Mac、LinuxいずれかのOSがインストールされていること) * **USB Type-C ケーブル** 開発環境構築の前に次の手順を行なってください。 @@ -39,7 +39,7 @@ M5Stackを使った開発に必要なもの: | | ---|---|--- -[Arduino](/en/practice/practice_arduino) | [M5Flow-Blockly](/en/practice/practice_blockly) | [M5Flow-MicroPython](/en/practice/practice_micropython) --> +[Arduino](/en/practice/practice_arduino) | [UiFlow-Blockly](/en/practice/practice_blockly) | [UiFlow-MicroPython](/en/practice/practice_micropython) --> ## 関連するドキュメント diff --git a/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython.md b/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython.md index df201d17..16828141 100644 --- a/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython.md +++ b/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython.md @@ -1,39 +1,36 @@ -# M5Flow Quick Start(Blockly/MicroPython) +# UiFlow クイックスタート(Blockly/MicroPython) [中文](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython) | [English](en/quick_start/m5core/m5stack_core_get_started_MicroPython) | 日本語 -!> **Note** *a. If it's first time to use M5Stack Core or you want to change the networkable AP that means the Core can't access [flow.m5stack.com](flow.m5stack.com), you need visit this article for setting wifi [How to connect wifi using Core](/en/related_documents/how_to_connect_wifi_using_core). b. If * +?> **Note** *初めてM5Stackを使う場合、あらかじめ指定のファームウェアを書き込む必要があります。[ファームウェアの更新方法](ja/related_documents/how_to_burn_firmware)を参照してください。また、Wi-Fi接続先を変更したい場合は、このページを参照してください。 [M5StackのWi-Fi接続方法 (M5Cloud向け)](/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud)* -### **By default, we account your M5Core has been connected with the networkable AP. And the screen shows like this figure below after you pressed the `UPLOAD` button on the left.** +M5Stackを起動したらすぐに `UPLOAD` ボタンを連打します。以下の画面に遷移しなかった場合は、M5Stack本体横の赤いリセットスイッチを押して、再起動してやり直してください。
-?> **Note** *After a few seconds if nothing is pressed the M5 will automatically run the code that was previously uploaded. If we want to upload new code we have to make sure we press the `upload` button on this menu before the M5 boots the code in it’s memory.* +?> **Note** *最初の起動では何もしないと、デモプログラムに遷移します。Wi-Fiの設定が完了していると自動的にWi-FiのAPに接続しにいきます。Wi-Fiを再設定したい場合は、`SETUP`ボタンを押してください。* -## CONTENT +## コンテンツ -1. [Connect to M5Flow](#connect-to-m5flow) +1. [UiFlowに接続](#_1-uiflowに接続) -2. [Program with Core](#program-with-core) +2. [プログラム作成](#_2-プログラム作成) -3. [Play a song now](#play-a-song-now) +3. [音楽演奏デモ](#_3-音楽演奏デモ) +## 1. UiFlowに接続 -## 1. Connect to M5Flow - -1. Now you scan the QR code with your phone or tablet to start programming on your mobile device. If you want to program the M5 from your computer, enter the url shown at the top of the screen `flow.m5stack.com` - -It will show as following figure. +1. M5Stackに表示されている二次元コードをあなたのスマートフォンやタブレットPCで読み取ってプログラムを始めることができます。もしPCでプログラムをする場合は、ブラウザで次のURLを入力してください。 `flow.m5stack.com`
-2. Whenever we want to upload code to the M5 from UI flow we need to make sure the device is paired. +1. UiFlowを利用するためには、お持ちのM5Stackをペアリングする必要があります。 -So press the little gear in the top right corner of the screen and enter the `APIKEY` which shows on the screen of M5(Now, my APIKEY is `9C6469`) and click `SAVE`. +最初にUiFlowの画面の右上にある歯車の設定を開きます。`APIKEY` の欄にM5Stack本体に表示されているAPIKEYを入力します。(写真の場合は `9C6469`) 入力が終わったら`SAVE`をクリックします。
@@ -43,15 +40,15 @@ So press the little gear in the top right corner of the screen and enter the `AP
-Then M5Flow will connect with this Core. +正しいAPIKEYが入力されるとUiFlowはあなたのM5Stackと接続します。 -At the moment, you can draw a UI or program it through Blockly(or Python) as shown below. +しばらくすると下図のように、Blockly(や Python)を用いてプログラムが可能になります。 -## 2. Program with Core +## 2. プログラム作成 -### a. Draw a UI +### a. UIデザイン -Drag 4 kinds of elements into `M5Stack Core` UI and click `Run` buttom on M5UI.Flow +4種類のUI要素が用意されており、UiFlow内のUIエディタにドラッグすることで利用できます。試しにいくつかUIオブジェクトを配置して`実行(Run)`をクリックしてみましょう。
@@ -61,9 +58,9 @@ Drag 4 kinds of elements into `M5Stack Core` UI and click `Run` buttom on M5UI.F
-### b. Program with Blockly +### b. Blocklyでプログラミング -Drag a block named `Set emoji map in0` from `Emoji` class and click `Run` buttom on M5UI.Flow +`Emoji`クラスの中にある`Set emoji map in0`ブロックをドラッグしてブロックエディタに配置し、`実行(Run)`をクリックしてみましょう。
@@ -73,9 +70,9 @@ Drag a block named `Set emoji map in0` from `Emoji` class and click `Run` buttom
-### c. Program with MicroPython +### c. MicroPythonでプログラミング -Copy the following codes, and paste them to `Python coding area`, and click `Run` button. +Blockly/MicroPython切り替えボタンを使って、MicroPythonに切り替えます。そして次のコードをコピーして`Python エディタ`に貼り付け、`実行(Run)`をクリックしてみましょう。 ```Python from m5stack import * @@ -95,13 +92,13 @@ lcd.print("Hello M5Stack")
-At that moment, the screen of M5Core will display `Hello M5Stack`. +M5Stackの画面に`Hello M5Stack`と表示されます。 -## 3. Play a song now +## 3. 音楽演奏デモ -Now, let's make a music player and play a song in a few minutes using M5Stack Core. +M5Stackを用いればたった数分でミュージックプレイヤーを作成して、音楽を演奏することができます。 -Drag a `loop`, `music` and `timer` block into the coding area from the components section. +`loop`、`music`、`timer`から下図のブロックをブロックエディタに配置します。
@@ -115,14 +112,14 @@ Drag a `loop`, `music` and `timer` block into the coding area from the component
-Then set parameters of `music block` and `timer block` as shown belown. +それから下図に示すように各ブロックのパラメータを調整します。
-Now, run it and enjoy your musical work! +完成したら、鳴らしてみましょう！！ -## Complete +## 完成 -?> **Note** *Also, For being more familiar with M5, you can contact us for a WorkShop * +?> **Note** *M5StackへのWorkShop等のお問い合わせはこちらまで→ * diff --git a/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md b/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md index 4b4f07d3..0f6365c9 100644 --- a/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md +++ b/docs/ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md @@ -1,39 +1,36 @@ -# M5Cloud Quick Start(MicroPython) +# M5Cloud クイックスタート(MicroPython) [中文](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) | [English](en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) | 日本語 -?> **Note** *If it's first time to use M5Core or you want to change the networkable AP that means the Core can't access [http://cloud.m5stack.com](http://cloud.m5stack.com), you need visit this article for setting wifi [How to connect wifi using Core with M5Cloud](/en/related_documents/how_to_connect_wifi_using_core_with_m5cloud).* +?> **Note** *初めてM5Stackを使う場合、あらかじめ指定のファームウェアを書き込む必要があります。[ファームウェアの更新方法](ja/related_documents/how_to_burn_firmware)を参照してください。また、Wi-Fi接続先を変更したい場合は、このページを参照してください。 [M5StackのWi-Fi接続方法 (M5Cloud向け)](/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud)* -*By default, we consider your M5Core has been connected with the networkable AP successfully. And the screen shows like this figure below.* +*デフォルトではM5CoreがWi-Fi接続に成功した場合、以下のような画面が表示されるはずです。*
-## CONTENT +## コンテンツ -1. [Connect to M5Cloud](#connect-to-m5cloud) +1. [M5Cloudへ接続](#M5Cloudへ接続) -2. [Binding device](#binding-device) +2. [デバイスのバインド](#デバイスのバインド) -3. [Program with Core](#program-with-Core) +3. [プログラムする](#プログラムする) +## 1. M5Cloudへ接続 -## 1. Connect to M5Cloud +PCからM5Cloudでプログミングしたい場合は `cloud.m5stack.com` へブラウザでアクセスします。 -Now If you want to program the M5 from your computer, enter the url shown at the top of the screen `cloud.m5stack.com` - -It will show as following figure. +次のように表示されるのでアカウントの登録を行います。
-Now, register a account. +## 2. デバイスのバインド -## 2. Binding device - -Press `Device`->`Add` buttom on M5Cloud IDE for binding M5Stack board to your account.(Now, my check code is `052879`) +`Device`->`Add` とクリックし、 チェックコードを入力して、M5StackをM5Cloud IDEのあなたのアカウントに紐付けます。(写真の場合はチェックコードが`052879`です)
@@ -43,21 +40,21 @@ Press `Device`->`Add` buttom on M5Cloud IDE for binding M5Stack board to your ac
-At the moment, you can program it through Python as shown below. +うまくいけば、プログラムができるようになるはずです。次のステップへ進みましょう。 -## 2. Program with Core +## 3. プログラムする -### a. New a Project +### a. 新しいプロジェクトを作成する
-### a. Code it +### b. 新しいファイルを作成する -*Now, let's get started with FACES Kit.* +*FACES Kit向けのプログラムを書いてみましょう* -After creating a new project, add a file named `faces.py` as a python module. +プロジェクトを作成したら、`faces.py`という名前のファイルを追加します。
@@ -67,7 +64,7 @@ After creating a new project, add a file named `faces.py` as a python module.
-Then copy following code into faces.py and main.py, and save they. +それから次のコードを`faces.py`に貼り付けて保存します。 ```Python """ @@ -106,6 +103,7 @@ class Faces:
+さらに以下のファイルを`main.py`に貼り付けて保存します。 ```Python """ @@ -138,18 +136,17 @@ keyboard.callback(keyboard_cb)
- -Now, upload and run it! +実行してみましょう！
-## Complete +## 完成 -The function of This demostration is that screen and serial terminal will display the value of the key you pressed. +このデモプログラムは、FACESキーボードで押された文字をM5Stackの画面に表示します。 -Now, I press the first line of QWERTY Keyboard. ("q", "w", "e", "r", "t", "y", "u", "i", "o", "p") +下図は、QWERTY キーボードで ("q", "w", "e", "r", "t", "y", "u", "i", "o", "p") と押した様子です。
diff --git a/docs/ja/quick_start/m5core/m5stack_core_quick_start.md b/docs/ja/quick_start/m5core/m5stack_core_quick_start.md index 08ccce5d..ce9487bd 100644 --- a/docs/ja/quick_start/m5core/m5stack_core_quick_start.md +++ b/docs/ja/quick_start/m5core/m5stack_core_quick_start.md @@ -1,8 +1,8 @@ -# M5Stack Core Get Started +# 今すぐ始めるM5Stack [中文](zh_CN/quick_start/m5core/m5stack_core_quick_start) | [English](en/quick_start/m5core/m5stack_core_quick_start) | 日本語 -## Pick up your programming mode below for getting started +## 好きなプログラミング言語を以下から選んでください。 | ---|--- diff --git a/docs/ja/quick_start/m5core/m5stick_get_started_arduino.md b/docs/ja/quick_start/m5core/m5stick_get_started_arduino.md index 825f0666..315aed7f 100644 --- a/docs/ja/quick_start/m5core/m5stick_get_started_arduino.md +++ b/docs/ja/quick_start/m5core/m5stick_get_started_arduino.md @@ -1,14 +1,16 @@ -# M5Stick Quick Start(Arduino) +# M5Stick クイックスタート(Arduino) [中文](zh_CN/quick_start/m5core/m5stick_get_started_arduino) | [English](en/quick_start/m5core/m5stick_get_started_arduino) | 日本語 -## 1. Install `U8g2` library +## 1. `U8g2` ライブラリをインストール -If you have installed `U8g2`, then just run and upload your m5stick's poject. -If not, then open Arduino IDE, and click `Sketch`->`Include Library`->`Manage Libraries...` for installing `U8g2` library +もしすでに `U8g2` がインストールされている場合は、M5Stickにプログラムを書き込んで、実行するだけです。 +まだの場合は、Arduino IDEのメニューから`スケッチ -> ライブラリをインクルード -> ライブラリを管理...` を選択し、`U8g2` ライブラリを検索しインストールします。
-## 2. Upload your project +## 2. プログラムをアップロード + +プログラムをコンパイルし、M5StickとPCがUSBケーブルで接続されていることを確認し、アップロードします。もしうまく行かない場合は、シリアルポートの設定を確認してください。 \ No newline at end of file diff --git a/docs/ja/related_documents/how_to_connect_wifi_using_core.md b/docs/ja/related_documents/how_to_connect_wifi_using_core.md index 2f29918d..1ab2c0ee 100644 --- a/docs/ja/related_documents/how_to_connect_wifi_using_core.md +++ b/docs/ja/related_documents/how_to_connect_wifi_using_core.md @@ -2,7 +2,7 @@ [中文](zh_CN/related_documents/how_to_connect_wifi_using_core) | [English](en/related_documents/how_to_connect_wifi_using_core) | 日本語 -?> **Tip** *もしあなたのM5Stackに`M5Flow`向けのファームウェアが書き込まれていない場合は、あらかじめ、こちらを参考にファームウェアを書き込んでください。[ファームウェアの更新方法](ja/related_documents/how_to_burn_firmware)* +?> **Tip** *もしあなたのM5Stackに`UiFlow`向けのファームウェアが書き込まれていない場合は、あらかじめ、こちらを参考にファームウェアを書き込んでください。[ファームウェアの更新方法](ja/related_documents/how_to_burn_firmware)* **M5Stackの左側にある赤いボタンを押して電源をオンにすると、この画面に遷移します。さぁ、アクセスポイントに接続しましょう！** @@ -44,7 +44,7 @@ ## 完了 -一度M5Stackをリセットして再起動したら、UPLOADボタンを押します。二次元コードが表示される画面に遷移するので、次の記事を参考にして、プログラムをしてみましょう！ [Quick Start with M5Flow](ja/quick_start/m5core/m5stack_core_get_started_MicroPython) +一度M5Stackをリセットして再起動したら、UPLOADボタンを押します。二次元コードが表示される画面に遷移するので、次の記事を参考にして、プログラムをしてみましょう！ [Quick Start with UiFlow](ja/quick_start/m5core/m5stack_core_get_started_MicroPython)
diff --git a/docs/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md b/docs/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md index 7ca8a2b3..992b4fd0 100644 --- a/docs/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md +++ b/docs/ja/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md @@ -2,29 +2,29 @@ [中文](zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud) | [English](en/related_documents/how_to_connect_wifi_using_core_with_m5cloud) | 日本語 -?> **Tip** *もしあなたのM5Stackにあらかじめ`M5Cloud`向けのファームウェアが書き込まれていない場合は、こちらを参考にファームウェアを書き込んでください。[How to burn firmware](ja/related_documents/how_to_burn_firmware)* +?> **Tip** *もしあなたのM5Stackにあらかじめ`M5Cloud`向けのファームウェアが書き込まれていない場合は、こちらを参考にファームウェアを書き込んでください。[ファームウェアの更新方法](ja/related_documents/how_to_burn_firmware)* -**After powering on Core，you will be greeted by this screen. Let's connect to networkable AP.** +**電源を入れて下図の画面に遷移したら、M5StackのWi-FiのAPにアクセスすることができます。**
-## CONTENT +## コンテンツ -1. [Connect to M5Core AP](#connect-to-m5Core-AP) +1. [APに接続](#_1-apに接続) -2. [Select Networkable AP](#select-networkable-ap) +2. [Wi-Fiネットワーク選択](#_2-Wi-Fiネットワーク選択) -3. [Reset Your Device](#reset-your-device) +3. [M5Stackをリセット](#_3-m5stackをリセット) -## 1. Connect to M5Core AP +## 1. APに接続 **Use Mobile Phone or PC for connectting to M5Core AP(like `M5Stack-a67c`)** -## 2. Select Networkable AP +## 2. Wi-Fiネットワーク選択 -**Then open brower to login 192.168.4.1 for setting your networkable WIFI name and password. (Now, my networkable wifi is named `MasterHax_5G`)** +**ブラウザから`192.168.4.1`にアクセスし、使用するWi-FiのSSIDとパスワードを入力します。(図ではWi-FiのSSIDは`MasterHax_2.4G`)**
@@ -34,21 +34,22 @@
-?> **Note** If you connect wifi unsuccessfully, repeat it again please. +?> **Note** もしWi-Fi接続が失敗した場合は、再度接続をやり直してみてください。 -## 3. Reset Your Device +## 3. M5Stackをリセット -**After connected wifi successfully, reset your core according to the prompt on `192.168.4.1`** +**Wi-Fiの設定がうまくいったら、M5Stackは自動的に再起動します。**
-?> **Note** If your device has been bound to M5Cloud's account before(means you have entered the check code on [M5Cloud](http://cloud.m5stack.com)), the screen will display as below +?> **Note** もし以前に[M5Cloud](http://cloud.m5stack.com)でチェックコードを入力したことがある場合、以下の図のように表示されます。 +
-## Complete +## 完成 -Now, you can try to program with your core following this article [Quick Start with M5Cloud](ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) +次のステップとして実際にプログラムを作成してみましょう。[M5Cloud クイックスタート(MicroPython)](ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud)を参照してください。 diff --git a/docs/zh_CN/practice/practice_arduino.md b/docs/zh_CN/practice/practice_arduino.md new file mode 100644 index 00000000..866b9a2f --- /dev/null +++ b/docs/zh_CN/practice/practice_arduino.md @@ -0,0 +1,5 @@ +# Practice for Arduino + +中文 | [English](/en/practice/practice_arduino) | [日本語](/ja/practice/practice_arduino) + +## （在编辑中...） \ No newline at end of file diff --git a/docs/zh_CN/practice/practice_blockly.md b/docs/zh_CN/practice/practice_blockly.md new file mode 100644 index 00000000..eaf508d2 --- /dev/null +++ b/docs/zh_CN/practice/practice_blockly.md @@ -0,0 +1,5 @@ +# Practice for UiFlow(Blockly) + +中文 | [English](/en/practice/practice_blockly) | [日本語](/ja/practice/practice_blockly) + +## （在编辑中...） \ No newline at end of file diff --git a/docs/zh_CN/practice/practice_micropython.md b/docs/zh_CN/practice/practice_micropython.md new file mode 100644 index 00000000..1278568f --- /dev/null +++ b/docs/zh_CN/practice/practice_micropython.md @@ -0,0 +1,5 @@ +# Practice for UiFlow(MicroPython) + +中文 | [English](/en/practice/practice_micropython) | [日本語](/ja/practice/practice_micropython) + +## （在编辑中...） \ No newline at end of file diff --git a/docs/zh_CN/product_documents/m5stack-core/m5core_basic.md b/docs/zh_CN/product_documents/m5stack-core/m5core_basic.md index aced6d6f..1aef4f27 100644 --- a/docs/zh_CN/product_documents/m5stack-core/m5core_basic.md +++ b/docs/zh_CN/product_documents/m5stack-core/m5core_basic.md @@ -4,11 +4,11 @@ ## 描述 -M5Core **BASIC**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的基础版开发板，包括黑色的主板和底座。你可以用[M5Flow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个黑色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽。底座的设计用于拓展M-Bus总线的Pin管脚出来，以方便DIY和产品设计，每个Pin脚都引出来做成了排针或排母形式，非常方便(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34这几个关于I2S功能的引脚没引出)。 +M5Core **BASIC**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的基础版开发板，包括黑色的主板和底座。你可以用[UiFlow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个黑色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽。底座的设计用于拓展M-Bus总线的Pin管脚出来，以方便DIY和产品设计，每个Pin脚都引出来做成了排针或排母形式，非常方便(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34这几个关于I2S功能的引脚没引出)。 ## 特性 -- 可编程，支持[M5Flow](http://flow.m5stack.com), MicroPython和Arduino +- 可编程，支持[UiFlow](http://flow.m5stack.com), MicroPython和Arduino - 支持外置TF卡(最大16G) ## 参数 diff --git a/docs/zh_CN/product_documents/m5stack-core/m5core_fire.md b/docs/zh_CN/product_documents/m5stack-core/m5core_fire.md index be75c87c..ec7fd2ee 100644 --- a/docs/zh_CN/product_documents/m5stack-core/m5core_fire.md +++ b/docs/zh_CN/product_documents/m5stack-core/m5core_fire.md @@ -4,7 +4,7 @@ ## 描述 -M5Core **FIRE**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的升级版开发板，包括红色的主板、M5GO底座和M5GO充电底座。你可以用[M5Flow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个红色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽、**MPU9250**。 +M5Core **FIRE**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的升级版开发板，包括红色的主板、M5GO底座和M5GO充电底座。你可以用[UiFlow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个红色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽、**MPU9250**。 M5GO底座内置PORT B, PORT C, 2个RGBLed灯条(SK6812), 一个麦克风和一个电池(550mAh)。 @@ -12,7 +12,7 @@ M5GO CHG.底座包含POGO Pin。FIRE主控通过POGO Pin与这个充电底座连 ## 特性 -- 可编程，支持[M5Flow](http://flow.m5stack.com), MicroPython和Arduino +- 可编程，支持[UiFlow](http://flow.m5stack.com), MicroPython和Arduino - 支持外置TF卡(最大16G) - 支持LEGO件 diff --git a/docs/zh_CN/product_documents/m5stack-core/m5core_gray.md b/docs/zh_CN/product_documents/m5stack-core/m5core_gray.md index ac9e1733..4b2bacd8 100644 --- a/docs/zh_CN/product_documents/m5stack-core/m5core_gray.md +++ b/docs/zh_CN/product_documents/m5stack-core/m5core_gray.md @@ -4,12 +4,12 @@ ## 描述 -M5Core **GRAY**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的灰色开发板，内置MEMS传感器(**MPU9250**)。你可以用[M5Flow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个灰色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽、九轴陀螺仪MPU9250。底座的设计用于拓展M-Bus总线的Pin管脚出来，以方便DIY和产品设计，每个Pin脚都引出来做成了排针或排母形式，非常方便(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34这几个关于I2S功能的引脚没引出)。 +M5Core **GRAY**是一款基于**ESP32**芯片(集成Wi-Fi和蓝牙)的灰色开发板，内置MEMS传感器(**MPU9250**)。你可以用[UiFlow](http://flow.m5stack.com), MicroPython或Arduino来编程它. 这个灰色主板包含3个按键、喇叭、LCD(320x240)、TF卡插槽、九轴陀螺仪MPU9250。底座的设计用于拓展M-Bus总线的Pin管脚出来，以方便DIY和产品设计，每个Pin脚都引出来做成了排针或排母形式，非常方便(GPIO0, GPIO12, GPIO13, GPIO15, GPIO34这几个关于I2S功能的引脚没引出)。 ## 特性 -- 可编程，支持[M5Flow](http://flow.m5stack.com), MicroPython和Arduino +- 可编程，支持[UiFlow](http://flow.m5stack.com), MicroPython和Arduino - 支持外置TF卡(最大16G) ## 参数 diff --git a/docs/zh_CN/product_documents/m5stack-core/m5go_iot_starter_kit.md b/docs/zh_CN/product_documents/m5stack-core/m5go_iot_starter_kit.md index fab7e02f..e9ba6e15 100644 --- a/docs/zh_CN/product_documents/m5stack-core/m5go_iot_starter_kit.md +++ b/docs/zh_CN/product_documents/m5stack-core/m5go_iot_starter_kit.md @@ -6,13 +6,13 @@ **M5GO IOT Starter Kit**是一款以白色M5Core主控为核心，附带6个units(ENV, IR, RGB, PIR, ANGLE, HUB)的物联网开发套件。 -你可以用[M5Flow](http://flow.m5stack.com)或Arduino IDE对它编程。 +你可以用[UiFlow](http://flow.m5stack.com)或Arduino IDE对它编程。 我们也提供了一些物联网开发课程方便你更快上手使用，如果你对这个感兴趣的话，欢迎给我司发邮件。 ## 特性 -- 可编程，支持[M5Flow](http://flow.m5stack.com), MicroPython和Arduino +- 可编程，支持[UiFlow](http://flow.m5stack.com), MicroPython和Arduino - 支持外置TF卡(最大16G) ## 参数 diff --git a/docs/zh_CN/product_documents/m5stack-core/minicore_stick.md b/docs/zh_CN/product_documents/m5stack-core/minicore_stick.md index ebe91869..ce376f8d 100644 --- a/docs/zh_CN/product_documents/m5stack-core/minicore_stick.md +++ b/docs/zh_CN/product_documents/m5stack-core/minicore_stick.md @@ -10,7 +10,7 @@ M5Stick有两个版本，第一个是无PSRAM的版本，另外一个是有MPU92 ## 特性 -- 支持可编程操作: Arduino, UIFlow(Blockly, MicroPython) +- 支持可编程操作: Arduino, UiFlow(Blockly, MicroPython) - 编程板可穿戴 - 可选：MEMS(MPU9250) diff --git a/docs/zh_CN/product_documents/modules/module_gps.md b/docs/zh_CN/product_documents/modules/module_gps.md index bea0a856..69505618 100644 --- a/docs/zh_CN/product_documents/modules/module_gps.md +++ b/docs/zh_CN/product_documents/modules/module_gps.md @@ -4,7 +4,7 @@ ## 描述 -GPS 模块是一款内置了GPS小模组的M5Stack系列可堆叠模块。内置的GPS小模块名字为UBLOX NEO-M8N。堆叠了M5Core之后，你可以用M5Flow、Arduino和MicroPython来编程它。它都可提供全球定位信息，即使你在室外的任何地方。 +GPS 模块是一款内置了GPS小模组的M5Stack系列可堆叠模块。内置的GPS小模块名字为UBLOX NEO-M8N。堆叠了M5Core之后，你可以用UiFlow、Arduino和MicroPython来编程它。它都可提供全球定位信息，即使你在室外的任何地方。 ## 特性 diff --git a/docs/zh_CN/product_documents/modules/module_lora.md b/docs/zh_CN/product_documents/modules/module_lora.md index f3e5c0c2..1e319b7e 100644 --- a/docs/zh_CN/product_documents/modules/module_lora.md +++ b/docs/zh_CN/product_documents/modules/module_lora.md @@ -4,7 +4,7 @@ ## 描述 -LoRa模块是内置名为Ra-02的LoRa小模组的M5Stack系列LoRa模块。堆叠了M5Core之后，你可以用M5Flow、Arduino和MicroPython来编程它。 +LoRa模块是内置名为Ra-02的LoRa小模组的M5Stack系列LoRa模块。堆叠了M5Core之后，你可以用UiFlow、Arduino和MicroPython来编程它。 M5Stack LoRa模块适用于长距离通信，结合多个LoRa模块，能组成长达1-2公里的物联网低功耗通信网络。它克服了传统物联网通信中长距离可是高功耗的难点。与蓝牙WIFI等通信技术相互弥补。 diff --git a/docs/zh_CN/product_documents/modules/module_servo.md b/docs/zh_CN/product_documents/modules/module_servo.md index 66601fcd..acfa36de 100644 --- a/docs/zh_CN/product_documents/modules/module_servo.md +++ b/docs/zh_CN/product_documents/modules/module_servo.md @@ -6,13 +6,13 @@ Servo是一个普通舵机(比如常见的9g舵机)驱动模块，它理论上可以同时驱动12路舵机。可是实际测试中，因为同时带动12路舵机时，电流很大，所以这个模块暂时能同时驱动9路舵机。过段时间，我们会推出改进升级版本，敬请期待。 -Servo模块使用起来非常简单，因为内置了MEGA328芯片来管理多路舵机，所以使用的时候，只需要M5Core与Servo模块堆叠之后，通过GRVOE接口(I2C)通信(I2C地址是0x53)。编程时，在Arduino IDE环境下，也只需2-3行即可驱动。而且还支持M5Flow编程，只需要拖拽代码块即可使用。 +Servo模块使用起来非常简单，因为内置了MEGA328芯片来管理多路舵机，所以使用的时候，只需要M5Core与Servo模块堆叠之后，通过GRVOE接口(I2C)通信(I2C地址是0x53)。编程时，在Arduino IDE环境下，也只需2-3行即可驱动。而且还支持UiFlow编程，只需要拖拽代码块即可使用。 ## 特性 - 支持同时控制多路舵机 - 支持6-24V的宽电压范围输入 -- 支持Arduino和M5Flow编程，非常简单 +- 支持Arduino和UiFlow编程，非常简单 ## 包含 diff --git a/docs/zh_CN/product_documents/modules/module_sim800.md b/docs/zh_CN/product_documents/modules/module_sim800.md index 373f4127..af080527 100644 --- a/docs/zh_CN/product_documents/modules/module_sim800.md +++ b/docs/zh_CN/product_documents/modules/module_sim800.md @@ -4,7 +4,7 @@ ## 描述 -SIM800L模块是一款内置了SIM800L GSM/GPRS小模块的M5Stack可堆叠模块堆叠了M5Core之后，你可以用M5Flow、Arduino和MicroPython来编程它。 +SIM800L模块是一款内置了SIM800L GSM/GPRS小模块的M5Stack可堆叠模块堆叠了M5Core之后，你可以用UiFlow、Arduino和MicroPython来编程它。 SIM800L是完整的支持四种频宽的GSM/GPRS解决方案。通过串口发送AT支持来控制SIM800模块 diff --git a/docs/zh_CN/product_documents/units/unit_396port.md b/docs/zh_CN/product_documents/units/unit_396port.md index fda4ef63..17137dd2 100644 --- a/docs/zh_CN/product_documents/units/unit_396port.md +++ b/docs/zh_CN/product_documents/units/unit_396port.md @@ -9,7 +9,7 @@ ## 特性 - VH3.96接口 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 文档 diff --git a/docs/zh_CN/product_documents/units/unit_adc.md b/docs/zh_CN/product_documents/units/unit_adc.md index 46c0d5d0..2974c99b 100644 --- a/docs/zh_CN/product_documents/units/unit_adc.md +++ b/docs/zh_CN/product_documents/units/unit_adc.md @@ -12,7 +12,7 @@ - ADC有16位分辨率，可以设置每秒采样8、16、32、128次以进行A/D转换 - ADC芯片内部可以产生高达8倍的放大，从而可以采集幅值更小的模拟信号 - 能测量0~12V的电压输入 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 应用 diff --git a/docs/zh_CN/product_documents/units/unit_angle.md b/docs/zh_CN/product_documents/units/unit_angle.md index 42af541b..8991e089 100644 --- a/docs/zh_CN/product_documents/units/unit_angle.md +++ b/docs/zh_CN/product_documents/units/unit_angle.md @@ -8,7 +8,7 @@ ANGLE是一个电位器Unit，通过这个Unit可以检测手动旋转的角度. ## 特性 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_button.md b/docs/zh_CN/product_documents/units/unit_button.md index 19808483..15c0ea6f 100644 --- a/docs/zh_CN/product_documents/units/unit_button.md +++ b/docs/zh_CN/product_documents/units/unit_button.md @@ -8,7 +8,7 @@ BUTTON是一个单按键unit，这个Unit能检测你是否按下了. ## 特性 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 文档 diff --git a/docs/zh_CN/product_documents/units/unit_dac.md b/docs/zh_CN/product_documents/units/unit_dac.md index c555e323..2f2c94c1 100644 --- a/docs/zh_CN/product_documents/units/unit_dac.md +++ b/docs/zh_CN/product_documents/units/unit_dac.md @@ -10,7 +10,7 @@ - 高达12位的转换精度 - 0~3.3V幅度的电压输出 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 应用 diff --git a/docs/zh_CN/product_documents/units/unit_dual_button.md b/docs/zh_CN/product_documents/units/unit_dual_button.md index 1bbdce26..14d75f18 100644 --- a/docs/zh_CN/product_documents/units/unit_dual_button.md +++ b/docs/zh_CN/product_documents/units/unit_dual_button.md @@ -8,7 +8,7 @@ ## 特性 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_earth.md b/docs/zh_CN/product_documents/units/unit_earth.md index 6be97e7f..ed493f8a 100644 --- a/docs/zh_CN/product_documents/units/unit_earth.md +++ b/docs/zh_CN/product_documents/units/unit_earth.md @@ -12,7 +12,7 @@ Unit可以输出0/1的数字信号，也可以直接输出被测物体反映的 - 可调节测量阈值(通过改变Unit上的10K可调电阻) - 数字或模拟信号输出 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_ir.md b/docs/zh_CN/product_documents/units/unit_ir.md index ab6c3d60..10dc26d5 100644 --- a/docs/zh_CN/product_documents/units/unit_ir.md +++ b/docs/zh_CN/product_documents/units/unit_ir.md @@ -10,7 +10,7 @@ - 内置一对红外发送和接收管 - 检测距离: 2 ~ 5cm -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_joystick.md b/docs/zh_CN/product_documents/units/unit_joystick.md index 28c0069d..c4b72dc9 100644 --- a/docs/zh_CN/product_documents/units/unit_joystick.md +++ b/docs/zh_CN/product_documents/units/unit_joystick.md @@ -12,7 +12,7 @@ Joystick Unit同样也是与M5Core相连之后，通过PORT A(I2C)控制，其I2 ## 特性 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_light.md b/docs/zh_CN/product_documents/units/unit_light.md index 20d80485..6ac377b4 100644 --- a/docs/zh_CN/product_documents/units/unit_light.md +++ b/docs/zh_CN/product_documents/units/unit_light.md @@ -10,7 +10,7 @@ - 10K可调电阻 - 模拟或数字信号输出 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_makey.md b/docs/zh_CN/product_documents/units/unit_makey.md index 498b64ce..1becf2cd 100644 --- a/docs/zh_CN/product_documents/units/unit_makey.md +++ b/docs/zh_CN/product_documents/units/unit_makey.md @@ -10,7 +10,7 @@ - 内置Mega328p芯片，蜂鸣器，RGBLed -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 应用 diff --git a/docs/zh_CN/product_documents/units/unit_ncir.md b/docs/zh_CN/product_documents/units/unit_ncir.md index 26929df1..9cd6388f 100644 --- a/docs/zh_CN/product_documents/units/unit_ncir.md +++ b/docs/zh_CN/product_documents/units/unit_ncir.md @@ -10,7 +10,7 @@ - 高精度 - 测量温度范围: -70℃~382.2℃ -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 应用 diff --git a/docs/zh_CN/product_documents/units/unit_neopixel.md b/docs/zh_CN/product_documents/units/unit_neopixel.md index 7d523501..f6b325c0 100644 --- a/docs/zh_CN/product_documents/units/unit_neopixel.md +++ b/docs/zh_CN/product_documents/units/unit_neopixel.md @@ -4,14 +4,14 @@ ## 描述 -NeoPixel是带GROVE接口的NeoPixel灯带，将NeoPixel Unit与M5Core相连，可以很方便地实现控制，特别是使用[M5Flow](http://flow.m5stack.com)来编程。 +NeoPixel是带GROVE接口的NeoPixel灯带，将NeoPixel Unit与M5Core相连，可以很方便地实现控制，特别是使用[UiFlow](http://flow.m5stack.com)来编程。 ?> **Tip** 注意NeoPixel Unit有输入和输出口，在接M5Core的时候，记得看清楚Unit上的箭头(顺序)方向，一定要输入口接M5Core，然后输出口还可以通过GROVE线，接下一条NeoPixel Unit，从而串联一起。 ## 特性 - 可选长度: 10cm/20cm/0.5m/1m/2m -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_pir.md b/docs/zh_CN/product_documents/units/unit_pir.md index 4612442e..49ba16b1 100644 --- a/docs/zh_CN/product_documents/units/unit_pir.md +++ b/docs/zh_CN/product_documents/units/unit_pir.md @@ -9,7 +9,7 @@ ## 特性 - 检测距离：150cm -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_proto.md b/docs/zh_CN/product_documents/units/unit_proto.md index b47a15a7..70c56d4f 100644 --- a/docs/zh_CN/product_documents/units/unit_proto.md +++ b/docs/zh_CN/product_documents/units/unit_proto.md @@ -9,7 +9,7 @@ ## 特性 - 70 孔(每个孔宽：100mil) -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_relay.md b/docs/zh_CN/product_documents/units/unit_relay.md index df2ec7d2..6961e581 100644 --- a/docs/zh_CN/product_documents/units/unit_relay.md +++ b/docs/zh_CN/product_documents/units/unit_relay.md @@ -9,7 +9,7 @@ ## 特性 - DC: 3A @ 30V; AC: 3A @ 220V -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_rgb.md b/docs/zh_CN/product_documents/units/unit_rgb.md index 05377eda..557bb153 100644 --- a/docs/zh_CN/product_documents/units/unit_rgb.md +++ b/docs/zh_CN/product_documents/units/unit_rgb.md @@ -8,7 +8,7 @@ ## 特性 -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/product_documents/units/unit_thermal.md b/docs/zh_CN/product_documents/units/unit_thermal.md index 388c7421..184ff101 100644 --- a/docs/zh_CN/product_documents/units/unit_thermal.md +++ b/docs/zh_CN/product_documents/units/unit_thermal.md @@ -15,7 +15,7 @@ - 32x24像素 - 目标温度：-40°C ÷ 300°C -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 应用 diff --git a/docs/zh_CN/product_documents/units/unit_tof.md b/docs/zh_CN/product_documents/units/unit_tof.md index 465d4678..cac50eb3 100644 --- a/docs/zh_CN/product_documents/units/unit_tof.md +++ b/docs/zh_CN/product_documents/units/unit_tof.md @@ -12,7 +12,7 @@ - 高精度 - 测量距离最大2m -- GROVE接口，支持[M5Flow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 +- GROVE接口，支持[UiFlow](http://flow.m5stack.com)编程，[Arduino](http://www.arduino.cc)编程 - Unit内置两个Lego插件孔，方便与Lego件结合 ## 相关链接 diff --git a/docs/zh_CN/quick_start.md b/docs/zh_CN/quick_start.md index 8ef6ef4f..763ebde3 100644 --- a/docs/zh_CN/quick_start.md +++ b/docs/zh_CN/quick_start.md @@ -39,7 +39,7 @@ | | ---|---|--- -[Arduino](/zh_CN/practice\practice_arduino) | [M5Flow-Blockly](/zh_CN/practice\practice_blockly) | [M5Flow-MicroPython](/zh_CN/practice\practice_micropython) --> +[Arduino](/zh_CN/practice\practice_arduino) | [UiFlow-Blockly](/zh_CN/practice\practice_blockly) | [UiFlow-MicroPython](/zh_CN/practice\practice_micropython) --> ## 相关文档(Related Documents) diff --git a/docs/zh_CN/quick_start/bala/bala_quick_start.md b/docs/zh_CN/quick_start/bala/bala_quick_start.md index ba578d81..ab35a773 100644 --- a/docs/zh_CN/quick_start/bala/bala_quick_start.md +++ b/docs/zh_CN/quick_start/bala/bala_quick_start.md @@ -1,3 +1,5 @@ # BALA Get Started +中文 | [English](en/quick_start/bala/bala_quick_start) | [日本語](ja/quick_start/bala/bala_quick_start) + ## (coming soon...) \ No newline at end of file diff --git a/docs/zh_CN/quick_start/faces/gameboy_burn_a_nes_game.md b/docs/zh_CN/quick_start/faces/gameboy_burn_a_nes_game.md index 92693ad6..f0f0f7d6 100644 --- a/docs/zh_CN/quick_start/faces/gameboy_burn_a_nes_game.md +++ b/docs/zh_CN/quick_start/faces/gameboy_burn_a_nes_game.md @@ -1,5 +1,7 @@ # 烧录GameBoy游戏 +中文 | [English](en/quick_start/faces/gameboy_burn_a_nes_game) | [日本語](ja/quick_start/faces/gameboy_burn_a_nes_game) + *这篇文档将引导你如何烧录游戏模拟器，并烧录想用的经典游戏，这样你就可以使用FACES Kit来玩GameBoy游戏。* ## 目录 diff --git a/docs/zh_CN/quick_start/m5camera/m5camera_quick_start.md b/docs/zh_CN/quick_start/m5camera/m5camera_quick_start.md index b2a9c348..dc025d8f 100644 --- a/docs/zh_CN/quick_start/m5camera/m5camera_quick_start.md +++ b/docs/zh_CN/quick_start/m5camera/m5camera_quick_start.md @@ -1,5 +1,7 @@ # ESP32Cam/M5Camera Quick Start +中文 | [English](en/quick_start/m5camera/m5camera_quick_start) | [日本語](ja/quick_start/m5camera/m5camera_quick_start) + ## 1. Out-of-the-box Demo It is really really out of the box. Your ESP32Cam/M5Camera will immediately run without any code after you power it. diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md index c462233a..ea517023 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS.md @@ -1,5 +1,7 @@ # M5Core 上手指南(macOS, Arudino) +中文 | [English](en/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) | [日本語](ja/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS) + ?> **提示** 如果你的操作系统是Windows，请点击[这里](zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows)。 ## 目录 diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md index 4f533a36..d08f32d7 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_Windows.md @@ -1,5 +1,7 @@ # M5Core 上手指南(Windows, Arudino) +中文 | [English](en/quick_start/m5core/m5stack_core_get_started_Arduino_Windows) | [日本語](ja/quick_start/m5core/m5stack_core_get_started_Arduino_Windows) + ?> **提示** 如果你的操作系统是MacOS的话，请点击[这里](zh_CN/quick_start/m5core/m5stack_core_get_started_Arduino_MacOS)。 ## 目录 diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md index 8659d90f..ad55b251 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython.md @@ -1,6 +1,8 @@ -# M5Flow 上手指南(Blockly/MicroPython) +# UiFlow 上手指南(Blockly/MicroPython) -?> **Tip** *a. 如果你的设备还没烧录M5Flow固件的话，请参考这篇文档[如果使用M5Burner烧录固件](/zh_CN/related_documents/how_to_burn_firmware).* *b. 如果你是第一次使用这个Core或者想Core连接其他可联网的热点AP的话，请参考这篇文档[如果使用Core连接WIFI和M5Flow](/zh_CN/related_documents/how_to_connect_wifi_using_core)。* +中文 | [English](en/quick_start/m5core/m5stack_core_get_started_MicroPython) | [日本語](ja/quick_start/m5core/m5stack_core_get_started_MicroPython) + +?> **Tip** *a. 如果你的设备还没烧录UiFlow固件的话，请参考这篇文档[如果使用M5Burner烧录固件](/zh_CN/related_documents/how_to_burn_firmware).* *b. 如果你是第一次使用这个Core或者想Core连接其他可联网的热点AP的话，请参考这篇文档[如果使用Core连接WIFI和UiFlow](/zh_CN/related_documents/how_to_connect_wifi_using_core)。* *这时候，你的M5Core已经连接到了可联网WIFI热点，如果按下Core上左边的按键`UPLOAD`的话，会如下图显示。* @@ -12,14 +14,14 @@ ## 目录 -1. [连接到M5Flow](#connect-to-m5flow) +1. [连接到UiFlow](#connect-to-uiflow) 2. [编程Core](#program-with-core) 3. [音乐例程](#play-a-song-now) -## 1. 连接到M5Flow +## 1. 连接到UiFlow 1. 现在用手机或者平板扫描M5Core上的二维码，或者你使用PC编程的话，在PC的浏览器上输入网址`flow.m5stack.com`。 @@ -27,13 +29,13 @@
-2. 因为每次上传代码到M5Core之前都要确保M5Flow正与手上的M5Core连接，而不是其他M5Core，所以需要点击M5Flow IDE页面右上角的齿轮，并在弹出的对话框内输入手上M5Core屏幕上显示的`APIKEY`，最后点击保存。 +2. 因为每次上传代码到M5Core之前都要确保UiFlow正与手上的M5Core连接，而不是其他M5Core，所以需要点击UiFlow IDE页面右上角的齿轮，并在弹出的对话框内输入手上M5Core屏幕上显示的`APIKEY`，最后点击保存。
-然后M5Flow就会连接到M5Core，此时M5Core屏幕右上角的小圆点就会变成绿色，不然会是一直红色。 +然后UiFlow就会连接到M5Core，此时M5Core屏幕右上角的小圆点就会变成绿色，不然会是一直红色。 现在，可以继续下面的步骤，开始M5Core编程啦！ @@ -41,7 +43,7 @@ ### a. 画一个UI -拖拽M5Flow IDE左上角的4种控件到`M5Stack Core`的UI界面，并点击页面右上角的`Run`按钮，执行效果。 +拖拽UiFlow IDE左上角的4种控件到`M5Stack Core`的UI界面，并点击页面右上角的`Run`按钮，执行效果。
@@ -99,4 +101,4 @@ lcd.print("Hello M5Stack") ## 最后 -?> **Tip** *如果你想了解更多M5Flow方面的编程的话，可以给我们发邮件，报名我们的课程.* +?> **Tip** *如果你想了解更多UiFlow方面的编程的话，可以给我们发邮件，报名我们的课程.* diff --git a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md index 7ae98147..70e7d0ad 100644 --- a/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md +++ b/docs/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud.md @@ -1,5 +1,7 @@ # M5Cloud 上手指南(MicroPython) +中文 | [English](en/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) | [日本語](ja/quick_start/m5core/m5stack_core_get_started_MicroPython_m5cloud) + ?> **Note** *如果你的设备还没烧录M5Cloud固件的话，请参考这篇文档[如果使用M5Burner烧录固件](/zh_CN/related_documents/how_to_burn_firmware).* ?> **Note** *如果你是第一次使用这个Core或者想Core连接其他可联网的热点AP的话，请参考这篇文档[如果使用Core连接WIFI和M5Cloud](/zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud).* @@ -44,7 +46,7 @@ 这时候，你可以按照下面的步骤使用Python编程Core啦！ -## 2. 编程Core +## 3. 编程Core ### a. 新建工程 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 969630f9..63b2e5ef 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 @@ -1,8 +1,10 @@ # M5Stack Core上手指南 +中文 | [English](en/quick_start/m5core/m5stack_core_quick_start) | [日本語](ja/quick_start/m5core/m5stack_core_quick_start) + ## 选择你需要的编程语言 -*使用Arduino/C++编程的话，选择Arduino；使用M5Flow/MicroPython，选择Blockly/MicroPython* +*使用Arduino/C++编程的话，选择Arduino；使用UiFlow/MicroPython，选择Blockly/MicroPython* | ---|--- diff --git a/docs/zh_CN/quick_start/m5core/m5stick_get_started_arduino.md b/docs/zh_CN/quick_start/m5core/m5stick_get_started_arduino.md index a65c733b..cd975fc1 100644 --- a/docs/zh_CN/quick_start/m5core/m5stick_get_started_arduino.md +++ b/docs/zh_CN/quick_start/m5core/m5stick_get_started_arduino.md @@ -1,5 +1,7 @@ # M5Stick 上手指南(Arduino) +中文 | [English](en/quick_start/m5core/m5stick_get_started_arduino) | [日本語](ja/quick_start/m5core/m5stick_get_started_arduino) + ## 1. 安装`U8g2`库 如果你已经安装了`U8g2`库的话，直接跳到第二步往下执行。 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 d6c7c2ff..3e4c84fd 100644 --- a/docs/zh_CN/related_documents/how_to_burn_firmware.md +++ b/docs/zh_CN/related_documents/how_to_burn_firmware.md @@ -24,7 +24,7 @@ **选择板子正与PC相连的`串口号`和`921600 波特率`, 选择合适的固件文件, 点击`Erase`, 然后等擦除固件完成，点击`Burn`** -?> **Tip** **a.** 如果你想通过[M5Flow](http://flow.m5stack.com)(/[M5Cloud](http://cloud.m5stack.com))来编程的话，请选择最新的`M5Flow-vx.x`(/`M5Cloud-vx.x.x`) **b.** 如果你想有ESP32CAM (或 M5CAMERA)，并且想编程它的话，请选择最新版的`M5Cam-vx.x (/M5Cam-psram)` +?> **Tip** **a.** 如果你想通过[UiFlow](http://flow.m5stack.com)(/[M5Cloud](http://cloud.m5stack.com))来编程的话，请选择最新的`M5Flow-vx.x`(/`M5Cloud-vx.x.x`) **b.** 如果你想有ESP32CAM (或 M5CAMERA)，并且想编程它的话，请选择最新版的`M5Cam-vx.x (/M5Cam-psram)`
@@ -32,6 +32,14 @@ !> **注意** 如何M5Burner的串口号选项框没有显示任何的`COMx`号或者只显示`COM1`, 这时候你需要参考这篇文档[建立串口通信](related_documents/establish_serial_connection)来重新安装USB驱动. +**a. 选择合适的固件文件** + +a. 如果你想通过[UiFlow](http://flow.m5stack.com)来编程的话，请选择最新的`M5Flow-vx.x` + +b. 如果你想有ESP32CAM (或 M5CAMERA)，并且想编程它的话，请选择最新版的`M5Cam-vx.x (/M5Cam-psram)` + +**b. 点击`Erase`** +
Screenshot of coverpage
diff --git a/docs/zh_CN/related_documents/how_to_connect_wifi_using_core.md b/docs/zh_CN/related_documents/how_to_connect_wifi_using_core.md index c0bcfd16..91c94326 100644 --- a/docs/zh_CN/related_documents/how_to_connect_wifi_using_core.md +++ b/docs/zh_CN/related_documents/how_to_connect_wifi_using_core.md @@ -1,10 +1,10 @@ -# 连接Wi-Fi(For M5Flow) +# 连接Wi-Fi(For UiFlow) 中文 | [English](/en/related_documents/how_to_connect_wifi_using_core) | [日本語](ja/related_documents/how_to_connect_wifi_using_core) -?> **Tip** *如果你的M5Core还没预先烧录了M5Flow固件的话，参考这篇文章[如何使用M5Burner烧录固件](zh_CN/related_documents/how_to_burn_firmware))* +?> **Tip** *如果你的M5Core还没预先烧录了UiFlow固件的话，参考这篇文章[如何使用M5Burner烧录固件](zh_CN/related_documents/how_to_burn_firmware))* -**烧录了M5Flow的固件，并重启M5Core之后，你会看到如下的欢迎界面，然后我们开始连接Wi-Fi.** +**烧录了UiFlow的固件，并重启M5Core之后，你会看到如下的欢迎界面，然后我们开始连接Wi-Fi.**
@@ -45,7 +45,7 @@ ## 完成 -重启M5Core之后，按`upload`按键，这时候，看到下图带二维码的界面。这很好我们就可以跟着这篇文章[M5Flow编程](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython)学习M5Flow的编程啦！ +重启M5Core之后，按`upload`按键，这时候，看到下图带二维码的界面。这很好我们就可以跟着这篇文章[UiFlow编程](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython)学习UiFlow的编程啦！
@@ -60,4 +60,4 @@ ## 最后 -现在，你可以阅读这篇文章开始使用M5Flow编程啦！[M5Flow上手指南](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython) \ No newline at end of file +现在，你可以阅读这篇文章开始使用UiFlow编程啦！[UiFlow上手指南](zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython) \ No newline at end of file diff --git a/docs/zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md b/docs/zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md index c7413568..025bed1a 100644 --- a/docs/zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md +++ b/docs/zh_CN/related_documents/how_to_connect_wifi_using_core_with_m5cloud.md @@ -24,7 +24,7 @@ ## 2. 选择可联网的WIFI热点 -**打开浏览器并输入网址`192.168.4.1`，然后选择可联网的WIFI，并输入其密码(如下图，我的WIFI名字是`MasterHax_5G`)** +**打开浏览器并输入网址`192.168.4.1`，然后选择可联网的WIFI，并输入其密码(如下图，我的WIFI名字是`MasterHax_2.4G`)**
From 6acd0ff39f3429b66ff4858d8b0d35e7b355a1df Mon Sep 17 00:00:00 2001 From: LiHuashen <854410664@qq.com> Date: Sat, 1 Dec 2018 00:03:49 +0800 Subject: [PATCH 2/3] Update module_lorawan.md --- docs/en/product_documents/modules/module_lorawan.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/product_documents/modules/module_lorawan.md b/docs/en/product_documents/modules/module_lorawan.md index e9169941..cab55e9e 100644 --- a/docs/en/product_documents/modules/module_lorawan.md +++ b/docs/en/product_documents/modules/module_lorawan.md @@ -1,6 +1,6 @@ # LoRaWAN -[中文](/zh_CN/product_documents/modules/module_btc) | English | [日本語](ja/product_documents/modules/module_btc) +[中文](/zh_CN/product_documents/modules/module_lorawan) | English | [日本語](ja/product_documents/modules/module_lorawan) ## DESCRIPTION @@ -48,4 +48,4 @@ By default, the UART configuration: "9600, 8, n, 1"(8 bits data, no parity, 1 st
-
\ No newline at end of file +
From 55812a50fd9e051472e0994fa0384f3783d8f6e9 Mon Sep 17 00:00:00 2001 From: LiHuashen <854410664@qq.com> Date: Sat, 1 Dec 2018 00:05:18 +0800 Subject: [PATCH 3/3] Update module_lorawan.md --- docs/en/product_documents/modules/module_lorawan.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/en/product_documents/modules/module_lorawan.md b/docs/en/product_documents/modules/module_lorawan.md index cab55e9e..4fea929b 100644 --- a/docs/en/product_documents/modules/module_lorawan.md +++ b/docs/en/product_documents/modules/module_lorawan.md @@ -37,7 +37,6 @@ By default, the UART configuration: "9600, 8, n, 1"(8 bits data, no parity, 1 st ## DOCUMENTS -- **[Example](en/file_to_display_null)** - **[LoRaWAN Info](http://wiki.ai-thinker.com/sx127x-052) (LoRaWAN)** - **[AT command for LoRaWAN](http://wiki.ai-thinker.com/_media/rhf-ps01509_lorawan_class_ac_at_command_specification_-_v4.4.pdf)** - **[Purchase](https://www.aliexpress.com/store/product/M5Stack-New-LoRaWAN-Module-433-470Mhz-868-915MHz-with-Internal-Antenna-and-MCX-External-Antenna-Port/3226069_32953098569.html?spm=a2g1y.12024536.productList_5885011.pic_2)**