diff --git a/docs/en/uiflow/Modules.md b/docs/en/uiflow/Modules.md index b5cb00ed..99eec869 100644 --- a/docs/en/uiflow/Modules.md +++ b/docs/en/uiflow/Modules.md @@ -1,3 +1,24 @@ + + +
+ Contents + +
+
+ LidarBOT + SetpMotor + SERVO + Bala Motor + Bala + LEGO+ + PM2.5 + BaseX + PLUS + GoPlus + GPS +
+ + ## LidarBOT #### Feature introduction diff --git a/docs/en/uiflow/Units.md b/docs/en/uiflow/Units.md index 8fbae41a..9f64f31d 100644 --- a/docs/en/uiflow/Units.md +++ b/docs/en/uiflow/Units.md @@ -1,3 +1,41 @@ + +
+ 目录 + +
+
+ ENV + PIR + RGB LED + Joystick + MAKEY + SERVO + WEIGHT + TRACE + BUTTON + Dual-BUTTON + RGB + RELAY + ADC + DAC + NCIR + IR + EXT.IO + ANGLE + LIGHT + EARTH + ToF + COLOR + RFID + FINGER + CardKB + Pb.HUB + Pa.HUB + THERMAL + GPS +
+ + ## ENV #### Feature Introduction diff --git a/docs/en/uiflow/advanced.md b/docs/en/uiflow/advanced.md index 7c8b04de..eddaea03 100644 --- a/docs/en/uiflow/advanced.md +++ b/docs/en/uiflow/advanced.md @@ -6,7 +6,7 @@
Remote ESP-NOW - MQTT communication + MQTT WiFi P2P Easy-IO @@ -292,7 +292,7 @@ Establish a point-to-point connection,Read the Message from other M5Stacks > -## Easy I-O +## Easy IO #### Function Description diff --git a/docs/en/uiflow/data_structure.md b/docs/en/uiflow/data_structure.md index bb49e0a8..ec42c29a 100644 --- a/docs/en/uiflow/data_structure.md +++ b/docs/en/uiflow/data_structure.md @@ -15,7 +15,7 @@
-# variables +## variables #### What is a variable? @@ -35,7 +35,7 @@ -# operation +## operation #### Function Description diff --git a/docs/en/uiflow/hardware.md b/docs/en/uiflow/hardware.md index 2c7ec05d..d3a1e011 100644 --- a/docs/en/uiflow/hardware.md +++ b/docs/en/uiflow/hardware.md @@ -108,7 +108,7 @@ Get the Angular velocity from z axis > -# POWER (M5Stack) +## POWER (M5Stack) #### Feature introduction diff --git a/docs/en/uiflow/logic.md b/docs/en/uiflow/logic.md index 51533e3e..c59b9546 100644 --- a/docs/en/uiflow/logic.md +++ b/docs/en/uiflow/logic.md @@ -7,7 +7,7 @@ if Logic logic operation - loop + Repeat iteration Functions @@ -77,7 +77,7 @@ Invert the logical result of an expression, that is, notTrue=False, notFalse=Tru > -## loop +## Repeat #### Function Description diff --git a/docs/en/uiflow/ui_simulator.md b/docs/en/uiflow/ui_simulator.md index 5265d9eb..5d7fe5cf 100644 --- a/docs/en/uiflow/ui_simulator.md +++ b/docs/en/uiflow/ui_simulator.md @@ -1,3 +1,18 @@ + +
+ Contents + +
+
+ UI Elements + Unicode + Emoji + Graphic + Displaying images + screen +
+ + ## UI Elements #### Feature introduction @@ -290,11 +305,3 @@ Rotating screen with mode 0-3,default value is 1, if you change value, the scre * __Set screen brightness__ Set screen brightness - - - \ No newline at end of file diff --git a/docs/en/uiflow/uiflow_home_page.md b/docs/en/uiflow/uiflow_home_page.md index 587a0db4..e5a43bcd 100644 --- a/docs/en/uiflow/uiflow_home_page.md +++ b/docs/en/uiflow/uiflow_home_page.md @@ -43,7 +43,7 @@ const hardware = { 'item':{ 'RGB Bar':'#/en/uiflow/hardware?id=rgb', 'Speaker':'#/en/uiflow/hardware?id=speaker', - 'IMU':'#/en/uiflow/hardware?id=imu-internal-measurement-unit', + 'IMU':'#/en/uiflow/hardware?id=imu', 'POWER':'#/en/uiflow/hardware?id=power-m5stack' } }; @@ -54,6 +54,8 @@ const uielements = { 'item':{ 'UI Elements':'#/en/uiflow/ui_simulator?id=ui-elements', 'Unicode':'#/en/uiflow/ui_simulator?id=unicode', + 'Emoji':'#/en/uiflow/ui_simulator?id=emoji', + 'Graphic':'#/en/uiflow/ui_simulator?id=graphic', 'Image':'#/en/uiflow/ui_simulator?id=displaying-images', 'Screen':'#/en/uiflow/ui_simulator?id=screen' } @@ -79,7 +81,7 @@ const logic = { 'if':'#/en/uiflow/logic?id=if', 'Logic':'#/en/uiflow/logic?id=logic', 'Logic Operator':'#/en/uiflow/logic?id=logic-operation', - 'Repeat':'#/en/uiflow/logic?id=loop', + 'Repeat':'#/en/uiflow/logic?id=repeat', 'Iteration':'#/en/uiflow/logic?id=iteration', 'Functions':'#/en/uiflow/logic?id=functions' } @@ -93,14 +95,14 @@ const advanced = { 'MQTT':'#/en/uiflow/advanced?id=mqtt-communication', 'WiFi':'#/en/uiflow/advanced?id=wifi', 'P2P':'#/en/uiflow/advanced?id=p2p', - 'Easy I/O':'#/en/uiflow/advanced?id=easy-io', + 'Easy IO':'#/en/uiflow/advanced?id=easy-io', 'PIN':'#/en/uiflow/advanced?id=pin', 'PWM':'#/en/uiflow/advanced?id=pwm', 'ADC':'#/en/uiflow/advanced?id=adc', 'DAC':'#/en/uiflow/advanced?id=dac', 'UART':'#/en/uiflow/advanced?id=uart', 'I2C':'#/en/uiflow/advanced?id=i2c', - 'Excute':'#/en/uiflow/advanced?id=excute', + 'Execute':'#/en/uiflow/advanced?id=execute', 'SDCard':'#/en/uiflow/advanced?id=sdcard', 'Http':'#/en/uiflow/advanced?id=http', 'Modbus':'#/en/uiflow/advanced?id=modbus-master', diff --git a/docs/en/unit/hex.md b/docs/en/unit/hex.md index 6c20c5c2..023e8fb5 100644 --- a/docs/en/unit/hex.md +++ b/docs/en/unit/hex.md @@ -31,7 +31,7 @@ This is how LEDs layout in the panel. Pay attention to the sequence in your code RGB LED - WS2812 x 37 + SK6812 x 37 net weight diff --git a/docs/image/Modules/Bala Motor.png b/docs/image/Modules/Bala Motor.png deleted file mode 100644 index cbedd36b..00000000 Binary files a/docs/image/Modules/Bala Motor.png and /dev/null differ diff --git a/docs/image/Modules/Bala Motor.webp b/docs/image/Modules/Bala Motor.webp new file mode 100644 index 00000000..df0e8794 Binary files /dev/null and b/docs/image/Modules/Bala Motor.webp differ diff --git a/docs/zh_CN/uiflow/Modules.md b/docs/zh_CN/uiflow/Modules.md index 912190d7..90113509 100644 --- a/docs/zh_CN/uiflow/Modules.md +++ b/docs/zh_CN/uiflow/Modules.md @@ -10,7 +10,7 @@ Bala Motor Bala LEGO+ - PM2.5 + PM2.5 BaseX PLUS GoPlus diff --git a/docs/zh_CN/uiflow/Units.md b/docs/zh_CN/uiflow/Units.md index cf495a11..bf2928c0 100644 --- a/docs/zh_CN/uiflow/Units.md +++ b/docs/zh_CN/uiflow/Units.md @@ -1,3 +1,41 @@ + +
+ 目录 + +
+
+ ENV + PIR + RGB LED + Joystick + MAKEY + SERVO + WEIGHT + TRACE + BUTTON + Dual-BUTTON + RGB + RELAY + ADC + DAC + NCIR + IR + EXT.IO + ANGLE + LIGHT + EARTH + ToF + COLOR + RFID + FINGER + CardKB + Pb.HUB + Pa.HUB + THERMAL + GPS +
+ + ## ENV #### 功能说明 diff --git a/docs/zh_CN/uiflow/advanced.md b/docs/zh_CN/uiflow/advanced.md index 48b392d6..bfa414bd 100644 --- a/docs/zh_CN/uiflow/advanced.md +++ b/docs/zh_CN/uiflow/advanced.md @@ -4,14 +4,15 @@
- 远程控制 + Remote ESP-NOW - MQTT通讯 + MQTT communication WiFi P2P Easy-IO PWM - ADC/DAC + ADC + DAC UART I2C Execute @@ -20,13 +21,13 @@ EEPROM Modbus-Master Modbus-Slave - BLE UART - Blynk + BLE UART + Blynk Echo STT
-## 远程控制 +## Remote #### 功能说明 @@ -108,7 +109,7 @@ __注意：创建的变量名称不允许与形参名称一致，即不允许使 >完成程序编辑，分别运行接收端与发射端程序，即可实现ESP-NOW短程无线通信. -## MQTT通讯 +## MQTT communication #### 什么是MQTT？ @@ -127,7 +128,7 @@ __注意：创建的变量名称不允许与形参名称一致，即不允许使 > -## MQTT服务器 +## MQTT server * __选择MQTT服务__ @@ -786,11 +787,11 @@ wifi重新连接 > -## BLE UART(仅支持M5Stack Fire) +## BLE UART(support M5Stack Fire only) #### 功能说明 ->建立蓝牙连接，开启蓝牙透传服务 +>建立蓝牙连接，开启蓝牙透传服务(仅支持M5Stack Fire) > @@ -815,9 +816,9 @@ wifi重新连接 > -## Blynk(仅支持M5Stack Fire) +## Blynk(support M5Stack Fire only) ->与Blynk服务器连接，使用BLE连接Blynk App，实现手机端控制M5Stack Fire +>与Blynk服务器连接，使用BLE连接Blynk App，实现手机端控制M5Stack Fire (仅支持M5Stack Fire) > diff --git a/docs/zh_CN/uiflow/blockly_custom.md b/docs/zh_CN/uiflow/blockly_custom.md index 371c0cd6..a1b7bd54 100644 --- a/docs/zh_CN/uiflow/blockly_custom.md +++ b/docs/zh_CN/uiflow/blockly_custom.md @@ -6,15 +6,14 @@
- 创建程序块 - 程序块代码-传参 - 程序块保存-修改 - 使用程序块 + 创建程序块 + 程序块代码-传参 + 程序块保存-修改 + 使用程序块
-## 创建程序块 - +## Create block 点击程序块列表中的`Custom`选项 > `Create` ，创建一个自定义程序块 @@ -36,7 +35,7 @@ -## 程序块代码-传参 +## Code-Parameter 点击`Parameter`下方的`Add`选项，添加一条程序属性，输入程序块所显示的名称，以及选择属性类型，在`Block Code`选项框中输入自定义程序块所包含的代码. @@ -51,7 +50,7 @@ -## 程序块保存-修改 +## Save and Changes 完成程序编辑后，点击`Download`进行保存 @@ -60,7 +59,7 @@ -## 使用程序块 +## Using program block 点击程序块列表中的`Custom`选项 > `Open` ，打开一个自定义程序块 diff --git a/docs/zh_CN/uiflow/data_structure.md b/docs/zh_CN/uiflow/data_structure.md index d414add5..b7357968 100644 --- a/docs/zh_CN/uiflow/data_structure.md +++ b/docs/zh_CN/uiflow/data_structure.md @@ -1,21 +1,22 @@ +
目录
- 引入变量 - 基本运算 - 随机数 - 字典 - 引入数组 - JSON字符串 - 字符处理 + 变量 + 基本运算 + 随机数 + 字典 + 数组 + JSON + TEXT
-## 引入变量 +## variables #### 什么是变量？ @@ -33,7 +34,7 @@ > -## 基本运算 +## operation #### 功能说明 @@ -76,7 +77,7 @@ > -## 随机数 +## random #### 功能说明 @@ -98,7 +99,7 @@ > -## 字典 +## map #### 功能说明 @@ -133,7 +134,7 @@ > -## 引入数组 +## array #### 功能说明 >如果说变量是一个容器，那么数组就是由很多个容器组成的一个集合体，我们可以对数组里的任何一个变量进行赋值，获取 @@ -168,7 +169,7 @@ > -## JSON字符串 +## JSON #### 功能说明 @@ -189,7 +190,7 @@ > -## 文本 +## TEXT #### 功能描述 diff --git a/docs/zh_CN/uiflow/hardware.md b/docs/zh_CN/uiflow/hardware.md index dd3518d5..0a20befb 100644 --- a/docs/zh_CN/uiflow/hardware.md +++ b/docs/zh_CN/uiflow/hardware.md @@ -1,4 +1,3 @@ -
目录 @@ -8,7 +7,7 @@ RGB Bar Speaker IMU - 电源管理 + POWER
@@ -107,7 +106,7 @@ > -## 电源管理(M5Stack) +## POWER (M5Stack) #### 功能说明 @@ -136,7 +135,7 @@ > -## 电源管理(M5StickC) +## POWER (M5StickC) #### 功能说明 diff --git a/docs/zh_CN/uiflow/logic.md b/docs/zh_CN/uiflow/logic.md index 02722c97..0c209e5b 100644 --- a/docs/zh_CN/uiflow/logic.md +++ b/docs/zh_CN/uiflow/logic.md @@ -4,16 +4,16 @@
- if判断 - 逻辑关系式 - 逻辑运算 - 条件循环 - 数据迭代 - 函数 + if判断 + 逻辑关系式 + 逻辑运算 + 条件循环 + 数据迭代 + 函数
-## if判断 +## if #### 功能说明 @@ -38,7 +38,7 @@ > -## 逻辑关系式 +## Logic #### 功能说明 @@ -52,7 +52,7 @@ > -## 逻辑运算 +## logic operation #### 功能说明 @@ -76,7 +76,7 @@ > -## 条件循环 +## Repeat #### 功能说明 @@ -96,7 +96,7 @@ > -## 数据迭代 +## iteration #### 功能说明 @@ -119,7 +119,7 @@ > -## 函数 +## Functions #### 什么是函数？ diff --git a/docs/zh_CN/uiflow/ui_simulator.md b/docs/zh_CN/uiflow/ui_simulator.md index d8396f8b..ebe112cc 100644 --- a/docs/zh_CN/uiflow/ui_simulator.md +++ b/docs/zh_CN/uiflow/ui_simulator.md @@ -1,4 +1,19 @@ -## UI元素 + +
+ 目录 + +
+
+ UI元素 + Unicode + Emoji + Graphic + 图像显示 + 屏幕控制 +
+ + +## UI Elements #### 功能说明 @@ -189,7 +204,7 @@ https://unicode-table.com/en/blocks/miscellaneous-technical/">点击查看详情 > -## Graphic绘图 +## Graphic #### 功能说明 @@ -220,6 +235,7 @@ https://unicode-table.com/en/blocks/miscellaneous-technical/">点击查看详情 绘制矩形 #### 注意 + >M5GO的屏幕分辨率为320X240 @@ -230,7 +246,7 @@ https://unicode-table.com/en/blocks/miscellaneous-technical/">点击查看详情 > -## image图片显示 +## Displaying images #### 功能说明 @@ -255,7 +271,7 @@ https://unicode-table.com/en/blocks/miscellaneous-technical/">点击查看详情 > -## 屏幕 +## SCREEN #### 功能说明 @@ -275,12 +291,3 @@ https://unicode-table.com/en/blocks/miscellaneous-technical/">点击查看详情 * __Set screen brightness__ 设置屏幕亮度 - - - - \ No newline at end of file diff --git a/docs/zh_CN/uiflow/uiflow_home_page.md b/docs/zh_CN/uiflow/uiflow_home_page.md index 276dc290..f83ff566 100644 --- a/docs/zh_CN/uiflow/uiflow_home_page.md +++ b/docs/zh_CN/uiflow/uiflow_home_page.md @@ -29,11 +29,11 @@ const quickstart = { 'title':"快速上手", 'item':{ - 'BASIC / M5GO / FIRE / FACES':'#/zh_CN/quick_start/m5core/m5stack_core_get_started_MicroPython', - 'M5StickC':'#/zh_CN/quick_start/m5stickc/m5stickc_quick_start', - 'M5Stick':'#/zh_CN/quick_start/m5stick/m5stick_quick_start_with_uiflow', - 'ATOM Echo':'#/zh_CN/quick_start/atom/atom_echo_quick_start', - 'ATOM Lite / Matrix':'#/zh_CN/quick_start/atom/atom_quick_start_uiflow' + 'BASIC / M5GO / FIRE / FACES':'#/zh_CN//quick_start/m5core/m5stack_core_get_started_MicroPython', + 'M5StickC':'#/zh_CN//quick_start/m5stickc/m5stickc_quick_start', + 'M5Stick':'#/zh_CN//quick_start/m5stick/m5stick_quick_start_with_uiflow', + 'ATOM Echo':'#/zh_CN//quick_start/atom/atom_echo_quick_start', + 'ATOM Lite / Matrix':'#/zh_CN//quick_start/atom/atom_quick_start_uiflow' } }; @@ -43,7 +43,7 @@ const hardware = { 'RGB Bar':'#/zh_CN/uiflow/hardware?id=rgb', 'Speaker':'#/zh_CN/uiflow/hardware?id=speaker', 'IMU':'#/zh_CN/uiflow/hardware?id=imu', - 'POWER':'#/zh_CN/uiflow/hardware?id=电源管理m5stack' + 'POWER':'#/zh_CN/uiflow/hardware?id=power-m5stack' } }; @@ -53,6 +53,8 @@ const uielements = { 'item':{ 'UI Elements':'#/zh_CN/uiflow/ui_simulator?id=ui-elements', 'Unicode':'#/zh_CN/uiflow/ui_simulator?id=unicode', + 'Emoji':'#/en/uiflow/ui_simulator?id=emoji', + 'Graphic':'#/en/uiflow/ui_simulator?id=graphic', 'Image':'#/zh_CN/uiflow/ui_simulator?id=displaying-images', 'Screen':'#/zh_CN/uiflow/ui_simulator?id=screen' } @@ -62,25 +64,25 @@ const uielements = { const datastructure = { 'title':"数据类型", 'item':{ - 'variables':'#/zh_CN/uiflow/data_structure?id=introducing-variables', - 'Basic operation':'#/zh_CN/uiflow/data_structure?id=basic-operation', - 'Random':'#/zh_CN/uiflow/data_structure?id=random-number', - 'Array':'#/zh_CN/uiflow/data_structure?id=introducing-an-array', - 'Map':'#/zh_CN/uiflow/data_structure?id=introducing-a-map', - 'JSON':'#/zh_CN/uiflow/data_structure?id=introducing-json', - 'text':'#/zh_CN/uiflow/data_structure?id=introducing-text' + 'variables':'#/zh_CN/uiflow/data_structure?id=variables', + 'Basic operation':'#/zh_CN/uiflow/data_structure?id=operation', + 'Random':'#/zh_CN/uiflow/data_structure?id=random', + 'Array':'#/zh_CN/uiflow/data_structure?id=array', + 'Map':'#/zh_CN/uiflow/data_structure?id=map', + 'JSON':'#/zh_CN/uiflow/data_structure?id=json', + 'text':'#/zh_CN/uiflow/data_structure?id=text' } }; const logic = { 'title':"逻辑判断", 'item':{ - 'if':'#/zh_CN/uiflow/logic?id=if判断', - 'Logic':'#/zh_CN/uiflow/logic?id=逻辑关系式', - 'Logic Operator':'#/zh_CN/uiflow/logic?id=逻辑运算', - 'Repeat':'#/zh_CN/uiflow/logic?id=条件循环', - 'Iteration':'#/zh_CN/uiflow/logic?id=数据迭代', - 'Functions':'#/zh_CN/uiflow/logic?id=函数' + 'if':'#/zh_CN/uiflow/logic?id=if', + 'Logic':'#/zh_CN/uiflow/logic?id=logic', + 'Logic Operator':'#/zh_CN/uiflow/logic?id=logic-operation', + 'Repeat':'#/zh_CN/uiflow/logic?id=repeat', + 'Iteration':'#/zh_CN/uiflow/logic?id=iteration', + 'Functions':'#/zh_CN/uiflow/logic?id=functions' } }; @@ -92,14 +94,14 @@ const advanced = { 'MQTT':'#/zh_CN/uiflow/advanced?id=mqtt-communication', 'WiFi':'#/zh_CN/uiflow/advanced?id=wifi', 'P2P':'#/zh_CN/uiflow/advanced?id=p2p', - 'Easy I/O':'#/zh_CN/uiflow/advanced?id=easy-i%2fo', + 'Easy IO':'#/zh_CN/uiflow/advanced?id=easy-io', 'PIN':'#/zh_CN/uiflow/advanced?id=pin', 'PWM':'#/zh_CN/uiflow/advanced?id=pwm', 'ADC':'#/zh_CN/uiflow/advanced?id=adc', 'DAC':'#/zh_CN/uiflow/advanced?id=dac', 'UART':'#/zh_CN/uiflow/advanced?id=uart', 'I2C':'#/zh_CN/uiflow/advanced?id=i2c', - 'Excute':'#/zh_CN/uiflow/advanced?id=excute', + 'Execute':'#/zh_CN/uiflow/advanced?id=execute', 'SDCard':'#/zh_CN/uiflow/advanced?id=sdcard', 'Http':'#/zh_CN/uiflow/advanced?id=http', 'Modbus':'#/zh_CN/uiflow/advanced?id=modbus-master', diff --git a/docs/zh_CN/unit/hex.md b/docs/zh_CN/unit/hex.md index f6105aed..2e40c7dd 100644 --- a/docs/zh_CN/unit/hex.md +++ b/docs/zh_CN/unit/hex.md @@ -31,7 +31,7 @@ RGB LED - WS2812 x 37 + SK6812 x 37 净重