diff --git a/docs/en/arduino/arduino_development.md b/docs/en/arduino/arduino_development.md index d681b9ca..80290ffa 100644 --- a/docs/en/arduino/arduino_development.md +++ b/docs/en/arduino/arduino_development.md @@ -77,7 +77,9 @@ Note: M5StickC / M5StickT / ATOM Matrix / ATOM Lite support can be used without ### For Atom Matrix/ Atom Lite - +>The ATOM series has not yet updated the board options. You can choose M5StickC or ESP32 Pico KIT as the board configuration. (Note: When ESP32-Pico is selected as the board configuration, please use 115200 for the baud rate) + + ## M5Stack Library diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index 49876817..84d1b27c 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -8,7 +8,7 @@ **M5Stack BASIC Kit**, like its namesake, is a starter kit among the M5Stack development kit series. It’s a modular, stackable, scalable, and portable device which is powered with an ESP-32 core, which makes it open source, low cost, full-function, and easy for developers to handle new product development on all stages including circuit design, PCB design, software, mold design and production. This Basic kit provides a friendly price and full-featured resources which makes it a good starter kit for you to explore IoT. -If you want to explore the fastest way of IoT prototyping, M5Stack development board is the perfect solution. Not like others, M5Stack development board is highly efficient, covered with industrial grade case and **ESP32-based** development board. It integrates with Wi-Fi & Bluetooth modules and contains a dual-core and 4MB of SPI Flash . Together with 30+ M5Stack stackable modules , 40+ extendable units and different levels of program language, you can create and verify your IoT product in a very short time. +If you want to explore the fastest way of IoT prototyping, M5Stack development board is the perfect solution. Not like others, M5Stack development board is highly efficient, covered with industrial grade case and **ESP32-based** development board. It integrates with Wi-Fi & Bluetooth modules and contains a dual-core and 16MB of SPI Flash . Together with 30+ M5Stack stackable modules , 40+ extendable units and different levels of program language, you can create and verify your IoT product in a very short time. Supportive development platforms and programming languages: Arduino, Blockly language with [UIFlow](http://flow.m5stack.com), Micropython. Regardless of what level programming skill you have, M5Stack would guide you in every step of the way to realize your idea as well as to the final productlization. e @@ -65,7 +65,7 @@ M5Stack Basic is consist with two separable parts. The upside part has all kinds Flash Memory - 4MB + 16MB Power Input @@ -373,6 +373,11 @@ For more information about Pin assignment and Pin Remapping, Please refer to [ES Battery capacity changed from 150mAh to 110mAh / + + 2020.6 + Flash size changed from 4MB to 16MB + / + diff --git a/docs/en/core/m5stickv.md b/docs/en/core/m5stickv.md index 571b37da..868fd108 100644 --- a/docs/en/core/m5stickv.md +++ b/docs/en/core/m5stickv.md @@ -20,6 +20,7 @@ It is able to perform convolutional neural network calculations at low power con * Power off :Short press power button for 6 seconds ## Product Features + - Dual-Core 64-bit RISC-V RV64IMAFDC (RV64GC) CPU / 400Mhz(Normal) - Dual Independent Double Precision FPU - Neural Network Processor(KPU) / 0.8Tops diff --git a/docs/en/quick_start/atom/atom_quick_start.md b/docs/en/quick_start/atom/atom_quick_start.md index 35444af3..60382042 100644 --- a/docs/en/quick_start/atom/atom_quick_start.md +++ b/docs/en/quick_start/atom/atom_quick_start.md @@ -1,89 +1,19 @@ -# Atom UIFlow Quick Start {docsify-ignore-all} - -## UIFlow Online Mode - -1 . Download and Setup [M5Bunner_Beta](https://m5stack.com/pages/download) and flash UIFlow firmware referring to this instruction [UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction_atom). - - -2 . (If you have entered the SSID and password when burning the firmware, you can skip the WiFi configuration step) Press and hold the middle button while powering on (or restarting), do not release it until the Yellow breathing light is displayed. At this time, yellow light is always on and the device has entered into WIFI configuration mode. - - - -In WIFI configuration mode, the device will work as WIFI hotspot, such as M5Stack-XXXX. Connect to this WIFI, open the browser and enter to 192.168.4.1(WIFI setup page). (Pls record the letters M5FLOW-XXXXXXXX, which will be needed in next step). Enter SSID and password to connect to the network. LEDs would change from breathing red-light to breathing green-light, it indicates that both WIFI and UIFlow server is connected well. - - - -If WIFI is connected but Atom can not access to UIFlow server (steady blue-light). - - - -Or WIFI connection fails (steady red-light), please restart the device ; - - - - - -3 . Refer to [this page](https://docs.m5stack.com/#/en/uiflow/introduction_atom) to check APIKey by M5Burn. - - - -4 . Now you can program in [UIFlow online mode](http://flow.m5stack.com).Refer to [this page](https://docs.m5stack.com/#/en/uiflow/uiflow_home_page) for the manual of UIFlow - - - - -## UIFlow Desktop Mode - -1 . Download and Setup [M5Bunner](https://m5stack.com/pages/download) and flash UIFlow firmware by referring to this instruction [UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction). - - -2 . Press and hold the middle button while powering on (or when restarting), and do not release it unit LED color change to blue. Now the device enters UIFlow desktop mode.Refer to [this page](https://docs.m5stack.com/#/en/uiflow/introduction) to use UIFlow desktop IDE mode. - - - - - -## Menu option introduction - -Press and hold the middle key to turn on the power will enter the menu. In this mode, LED will cyclically change the color. Different colors represent for different options. - - - -- GREEN Light Enter UIFlow Online mode -- BLUE Light Enter UIFlow desktop IDE Program -- YELLOW Light Enter WIFI Configuration mode -- PURPLE Light Run the Last Downloaded Program - -### UIFlow Example - -- [Atom Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) - - - -- [Atom Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite) - - - - \ No newline at end of file +
+
+ +
+
+ + +

UIFlow

+
+
+
+
+ + +

Arduino IDE

+
+
+
+
diff --git a/docs/en/quick_start/atom/atom_quick_start_uiflow.md b/docs/en/quick_start/atom/atom_quick_start_uiflow.md new file mode 100644 index 00000000..35444af3 --- /dev/null +++ b/docs/en/quick_start/atom/atom_quick_start_uiflow.md @@ -0,0 +1,89 @@ +# Atom UIFlow Quick Start {docsify-ignore-all} + +## UIFlow Online Mode + +1 . Download and Setup [M5Bunner_Beta](https://m5stack.com/pages/download) and flash UIFlow firmware referring to this instruction [UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction_atom). + + +2 . (If you have entered the SSID and password when burning the firmware, you can skip the WiFi configuration step) Press and hold the middle button while powering on (or restarting), do not release it until the Yellow breathing light is displayed. At this time, yellow light is always on and the device has entered into WIFI configuration mode. + + + +In WIFI configuration mode, the device will work as WIFI hotspot, such as M5Stack-XXXX. Connect to this WIFI, open the browser and enter to 192.168.4.1(WIFI setup page). (Pls record the letters M5FLOW-XXXXXXXX, which will be needed in next step). Enter SSID and password to connect to the network. LEDs would change from breathing red-light to breathing green-light, it indicates that both WIFI and UIFlow server is connected well. + + + +If WIFI is connected but Atom can not access to UIFlow server (steady blue-light). + + + +Or WIFI connection fails (steady red-light), please restart the device ; + + + + + +3 . Refer to [this page](https://docs.m5stack.com/#/en/uiflow/introduction_atom) to check APIKey by M5Burn. + + + +4 . Now you can program in [UIFlow online mode](http://flow.m5stack.com).Refer to [this page](https://docs.m5stack.com/#/en/uiflow/uiflow_home_page) for the manual of UIFlow + + + + +## UIFlow Desktop Mode + +1 . Download and Setup [M5Bunner](https://m5stack.com/pages/download) and flash UIFlow firmware by referring to this instruction [UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction). + + +2 . Press and hold the middle button while powering on (or when restarting), and do not release it unit LED color change to blue. Now the device enters UIFlow desktop mode.Refer to [this page](https://docs.m5stack.com/#/en/uiflow/introduction) to use UIFlow desktop IDE mode. + + + + + +## Menu option introduction + +Press and hold the middle key to turn on the power will enter the menu. In this mode, LED will cyclically change the color. Different colors represent for different options. + + + +- GREEN Light Enter UIFlow Online mode +- BLUE Light Enter UIFlow desktop IDE Program +- YELLOW Light Enter WIFI Configuration mode +- PURPLE Light Run the Last Downloaded Program + +### UIFlow Example + +- [Atom Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) + + + +- [Atom Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite) + + + + \ No newline at end of file diff --git a/docs/zh_CN/arduino/arduino_development.md b/docs/zh_CN/arduino/arduino_development.md index 84a2cafa..a76ac61b 100644 --- a/docs/zh_CN/arduino/arduino_development.md +++ b/docs/zh_CN/arduino/arduino_development.md @@ -75,7 +75,9 @@ ### For Atom Matrix/Lite - +>ATOM系列目前还未更新板选项,您可以选用M5StickC或ESP32 Pico KIT作为板配置。(注意:选用ESP32-Pico作为板配置时,波特率请采用115200) + + ## 相关库 diff --git a/docs/zh_CN/core/basic.md b/docs/zh_CN/core/basic.md index 97924d38..6475a2ff 100644 --- a/docs/zh_CN/core/basic.md +++ b/docs/zh_CN/core/basic.md @@ -8,7 +8,7 @@ **M5Stack BASIC** 是M5Stack开发套件系列中的一款,拥有超高性价比与丰富案例资源的入门级开发套件.对于开发新手来说, Basic 是不二之选. -快速成型,超低门槛,直达产品级,M5Stack 开发板会是你物联网开发的不二之选.传统开发板只能用作验证和学习,M5的出现赋予了开发板更多的可能性,M5Stack 开发板采用了工业级外壳,再加上精致的外观设计,整体性能稳定,除了验证和学习的功能之外,还可以加速开发和产品化的进程.采用**ESP32**物联网芯片.集成Wi-Fi和蓝牙模块,拥有 4MB 的 SPI 闪存,双核低功耗的它在多种应用场景中有着非凡表现.由 30 多个 M5Stack 可堆叠模块,40 多个可扩展单元组成的硬件拓展体系,能够快速的帮助你搭建和验证你的物联网产品. +快速成型,超低门槛,直达产品级,M5Stack 开发板会是你物联网开发的不二之选.传统开发板只能用作验证和学习,M5的出现赋予了开发板更多的可能性,M5Stack 开发板采用了工业级外壳,再加上精致的外观设计,整体性能稳定,除了验证和学习的功能之外,还可以加速开发和产品化的进程.采用**ESP32**物联网芯片.集成Wi-Fi和蓝牙模块,拥有 16MB 的 SPI 闪存,双核低功耗的它在多种应用场景中有着非凡表现.由 30 多个 M5Stack 可堆叠模块,40 多个可扩展单元组成的硬件拓展体系,能够快速的帮助你搭建和验证你的物联网产品. 支持的开发平台和程序语言:Arduino,[UIFlow](http://flow.m5stack.com) (采用Blockly ,MicroPython语言). 无论你的开发和编程能力处在何种水平,M5Stack 都将协助你,逐步的将想法变为现实. @@ -64,7 +64,7 @@ M5Stack Basic 由两个可分离部分堆叠组成. 顶部放置了电路板, Flash - 4MB + 16MB 输入电压 @@ -311,6 +311,11 @@ TF 卡最大支持 16GB 电池容量150mAh变更为110mAh / + + 2020.6 + flash大小由4MB变更为16MB + / + diff --git a/docs/zh_CN/quick_start/atom/atom_quick_start.md b/docs/zh_CN/quick_start/atom/atom_quick_start.md index 65df25c2..49a3fc84 100644 --- a/docs/zh_CN/quick_start/atom/atom_quick_start.md +++ b/docs/zh_CN/quick_start/atom/atom_quick_start.md @@ -1,116 +1,19 @@ -# Atom UIFlow上手指南 {docsify-ignore-all} - -## UIFlow 在线编程模式 - -1. 下载[M5Bunner_Beta](https://m5stack.com/pages/download),并按照[该页面](https://docs.m5stack.com/#/en/uiflow/introduction_atom)烧录UIFlow固件. - -2. (如果你已经在烧录时已经输入了SSID和密码可跳过该WIFI配置步骤)设备上电或重启的同时按住中间按键不放,直到显示黄色呼吸灯时松开,此时黄灯常亮即进入WIFI配置模式. - - - -在WIFI配置模式下,Atom会自动发出WIFI热点,比如M5Stack-XXXX,连接此WIFI并打开浏览器输入192.168.4.1进入WiFi配置页面,输入SSID和密码进行网络连接(此步骤记下M5FLOW-**XXXXXXXX**稍后会用到),此时红灯闪烁,连接成功后蓝灯短暂常亮(UIFlow服务器未连接)待到绿灯闪烁时表示UIFlow服务器连接正常,此时可进行在线编程。 - - - -如果WiFi已经连接入网但是没有连接上UIFlow服务器(蓝灯常亮) - - - -或者如果WiFi连接网络失败(红灯常亮),则尝试按下中间按键重新连接网络或重启设备. - - - - - - -3 . 根据[此页面](https://docs.m5stack.com/#/zh_CN/uiflow/introduction_atom)教程通过M5Burn查看APIKey. - - - -4 . 完成上述配置你已经可以正常使用[UIFlow在线编程模式](http://flow.m5stack.com). UIFlow的详细使用参考[此页面](https://docs.m5stack.com/#/zh_CN/uiflow/uiflow_home_page). - - -## UIFlow离线编程模式 - -1. 下载M5Burner[M5Bunner](https://m5stack.com/pages/download),并按照此教程烧录完UIFlow固件[UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction). - -2. 设备上电或重启的同时按住中间按键不放,直到显示蓝色呼吸灯时松开,此时蓝色灯常亮即进入UIFlow离线编程模式. - - - - -## 菜单选项介绍 - -设备上电或重启时按住中间按键不放可进入不同模式,LED灯不同颜色代表进入不同的模式,松开按键即进入相应模式. - - - - -- 绿灯 **UIFlow 在线编程模式** - -- 蓝灯 **UIFlow 离线编程模式** - -- 黄灯 **配置 WIFI 模式** - -- 紫灯 **运行最后一次下载的程序** - -
- -### UIFlow示例 - -- AtomMatrix - - - -- [Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) - -
- -- AtomLite - - - -- [Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite) - - - - - - - - \ No newline at end of file +
+ + +

Arduino IDE

+
+
+
+ diff --git a/docs/zh_CN/quick_start/atom/atom_quick_start_uiflow.md b/docs/zh_CN/quick_start/atom/atom_quick_start_uiflow.md new file mode 100644 index 00000000..013fdcbb --- /dev/null +++ b/docs/zh_CN/quick_start/atom/atom_quick_start_uiflow.md @@ -0,0 +1,96 @@ +# Atom UIFlow上手指南 {docsify-ignore-all} + +## UIFlow 在线编程模式 + +1. 下载[M5Bunner_Beta](https://m5stack.com/pages/download),并按照[该页面](https://docs.m5stack.com/#/en/uiflow/introduction_atom)烧录UIFlow固件. + +2. (如果你已经在烧录时已经输入了SSID和密码可跳过该WIFI配置步骤)设备上电或重启的同时按住中间按键不放,直到显示黄色呼吸灯时松开,此时黄灯常亮即进入WIFI配置模式. + + + +在WIFI配置模式下,Atom会自动发出WIFI热点,比如M5Stack-XXXX,连接此WIFI并打开浏览器输入192.168.4.1进入WiFi配置页面,输入SSID和密码进行网络连接(此步骤记下M5FLOW-**XXXXXXXX**稍后会用到),此时红灯闪烁,连接成功后蓝灯短暂常亮(UIFlow服务器未连接)待到绿灯闪烁时表示UIFlow服务器连接正常,此时可进行在线编程。 + + + +如果WiFi已经连接入网但是没有连接上UIFlow服务器(蓝灯常亮) + + + +或者如果WiFi连接网络失败(红灯常亮),则尝试按下中间按键重新连接网络或重启设备. + + + + + + +3 . 根据[此页面](https://docs.m5stack.com/#/zh_CN/uiflow/introduction_atom)教程通过M5Burn查看APIKey. + + + +4 . 完成上述配置你已经可以正常使用[UIFlow在线编程模式](http://flow.m5stack.com). UIFlow的详细使用参考[此页面](https://docs.m5stack.com/#/zh_CN/uiflow/uiflow_home_page). + + +## UIFlow离线编程模式 + +1. 下载M5Burner[M5Bunner](https://m5stack.com/pages/download),并按照此教程烧录完UIFlow固件[UIFlow introduction](https://docs.m5stack.com/#/en/uiflow/introduction). + +2. 设备上电或重启的同时按住中间按键不放,直到显示蓝色呼吸灯时松开,此时蓝色灯常亮即进入UIFlow离线编程模式. + + + + +## 菜单选项介绍 + +设备上电或重启时按住中间按键不放可进入不同模式,LED灯不同颜色代表进入不同的模式,松开按键即进入相应模式. + + + + +- 绿灯 **UIFlow 在线编程模式** + +- 蓝灯 **UIFlow 离线编程模式** + +- 黄灯 **配置 WIFI 模式** + +- 紫灯 **运行最后一次下载的程序** + +
+ +### UIFlow示例 + +- AtomMatrix + + + +- [Matrix Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Matrix) + +
+ +- AtomLite + + + +- [Lite Example](https://github.com/m5stack/M5-ProductExampleCodes/tree/master/Core/Atom/Atom%20Lite) + + + \ No newline at end of file diff --git a/docs/zh_CN/uiflow/blockly_custom.md b/docs/zh_CN/uiflow/blockly_custom.md index bd45f0d0..f9c593f7 100644 --- a/docs/zh_CN/uiflow/blockly_custom.md +++ b/docs/zh_CN/uiflow/blockly_custom.md @@ -65,3 +65,9 @@

+ \ No newline at end of file diff --git a/docs/zh_CN/uiflow/ui_simulator.md b/docs/zh_CN/uiflow/ui_simulator.md index 80ce303f..c02a7f05 100644 --- a/docs/zh_CN/uiflow/ui_simulator.md +++ b/docs/zh_CN/uiflow/ui_simulator.md @@ -1,8 +1,8 @@ -# 几何图形 +## UI元素 #### 功能说明 ->UIFlow提供了几种可编辑的几何图形,可以用它们去绘制一些图案 +>UIFlow提供了几种可编辑的UI元素,可以用它们去绘制一些图案或是显示文本 > @@ -42,7 +42,11 @@ > -# Emoji + + + + +## Emoji #### 功能说明 @@ -64,7 +68,7 @@ > -# Graphic绘图 +## Graphic绘图 #### 功能说明 @@ -105,7 +109,7 @@ > -# image图片显示 +## image图片显示 #### 功能说明 @@ -130,7 +134,7 @@ > -# 屏幕 +## 屏幕 #### 功能说明 @@ -150,3 +154,12 @@ * __Set screen brightness__ 设置屏幕亮度 + + + + \ No newline at end of file