diff --git a/docs/en/api/axp192_m5stickc.md b/docs/en/api/axp192_m5stickc.md index 9faa61b1..46c465c6 100644 --- a/docs/en/api/axp192_m5stickc.md +++ b/docs/en/api/axp192_m5stickc.md @@ -149,7 +149,7 @@ void loop() { | parameter | description | | --- | --- | -| brightness | TFT backlight brightness (range: 7~15) | +| brightness | TFT backlight brightness (range: 7~12) | **Example:** @@ -164,7 +164,7 @@ void setup() { } void loop() { M5.Axp.ScreenBreath(i++); - if (i > 15) i = 7; + if (i > 12) i = 7; delay(1000); } ``` @@ -223,4 +223,174 @@ void loop() { M5.Lcd.printf("icharge:%dmA\r\n", charge); delay(500); } +``` + +## GetPowerbatData() + +**Syntax:** + +uint32_t GetPowerbatData(void); + +**Description: Get Current Power.** + +**Example:** + +```arduino +#include + +int bat; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); + M5.Axp.ScreenBreath(7); +} + +void loop() { + bat = M5.Axp.GetPowerbatData()*1.1*0.5/1000; + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("battery power:%dmW\r\n", bat); + delay(500); +} +``` + +## GetVapsData() + +**Syntax:** + +uint16_t GetVapsData(void); + +**Description: Get battery capacity.** + +**Example:** + +```arduino +#include + +int Vaps; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); +} + +void loop() { + Vaps = M5.Axp.GetVapsData(); + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("battery capacity :%dmW\r\n", Vaps); + delay(500); +} +``` + +## GetTempData() + +**Syntax:** + +uint16_t GetTempData(void); + +**Description: Get battery capacity.** + +**Example:** + +```arduino +#include + +int temp; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); +} + +void loop() { + temp = M5.Axp.GetTempData()*0.1-144.7; + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("tempurature:%d\r\n", temp); + delay(500); +} +``` + +## GetIinData() + +**Syntax:** + +uint16_t GetTempData(void); + +**Description: Get battery capacity.** + +**Example:** + +```arduino +#include + +int temp; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); +} + +void loop() { + temp = M5.Axp.GetTempData()*0.1-144.7; + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("tempurature:%d\r\n", temp); + delay(500); +} +``` + + +## GetIinData() + +**Syntax:** + +uint16_t GetIdischargeData(void); + +**Description: Get battery output current.** + +**Example:** + +```arduino +#include + +int disCharge; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); +} + +void loop() { + disCharge = M5.Axp.GetIdischargeData() / 2; + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("disCharge:%dma\r\n", disCharge); + delay(500); +} +``` + +## GetIusbinData() + +**Syntax:** + +uint16_t GetIusbinData(void); + +**Description: Get USB vin current.** + +**Example:** + +```arduino +#include + +int Iusb; + +void setup() { + M5.begin(); //By default, "M5.begin()" will initialize AXP192 chip + M5.Lcd.fillScreen(BLACK); +} + +void loop() { + Iusb = M5.Axp.GetIdischargeData() * 0.375; + M5.Lcd.setCursor(0, 0, 1); + M5.Lcd.printf("Iusbin:%da\r\n", Iusb); + delay(500); +} ``` \ No newline at end of file diff --git a/docs/en/api/lcd.md b/docs/en/api/lcd.md index a24f2ba9..c5d43e77 100644 --- a/docs/en/api/lcd.md +++ b/docs/en/api/lcd.md @@ -797,7 +797,7 @@ Draw a vertical line from X to Y. M5.Lcd.drawFastHLine(0, 0, 12, TFT_GREEN); ``` -## drawFastVLine() +## drawFastHLine() **Description:** diff --git a/docs/en/uiflow/advanced.md b/docs/en/uiflow/advanced.md index c39ab858..e189a9dc 100644 --- a/docs/en/uiflow/advanced.md +++ b/docs/en/uiflow/advanced.md @@ -69,13 +69,13 @@ _________________________________ -* __MQTT function __ +* __MQTT fuction__ > In the advanced functions of UIFlow, you can find the MQTT function block. We can simply understand the MQTT protocol as two links, "Publish" and "Subscribe". > When the publisher posts a message, the subscriber will get this information to enable communication between devices -> +> diff --git a/docs/en/uiflow/data_structure.md b/docs/en/uiflow/data_structure.md index cfd61a70..3d7ea4ce 100644 --- a/docs/en/uiflow/data_structure.md +++ b/docs/en/uiflow/data_structure.md @@ -26,7 +26,7 @@ __________________________ >There are some basic arithmetic blocks in Math, such as "addition, subtraction, multiplication and division". -> +> >* __constant__ Fill in any number and connect to other objects for assignment @@ -43,6 +43,19 @@ Add a value to set whether the judgment is true (for example, whether it is odd >* __Array calculation__ Summing an array, calculating the maximum or minimum, the average, etc. +>* __round__ +Rounding off decimals or going to the bottom + +>* __advance operation__ +Find trigonometric functions, absolute values, etc. + +>* __convert to int__ +Convert the value to an integer + +>* __convert to float__ +Convert values to floating point numbers + + #### Instructions @@ -79,7 +92,7 @@ Specify a random range, each time it is executed, randomly generate an integer i __________________________ #### Function Description >If the variable is a container, the array is a collection of many containers. We can assign values to any of the variables in the array. -> +> >* __length of__ Measure the length of the array (ie the number of elements in the array) >* __X is empty__ @@ -90,7 +103,18 @@ Array index, indexed positive or reverse specified element Add a value to set whether the judgment is true (for example, whether it is odd or even or prime), if it is true, it is True, otherwise it is False. >* __create list with__ Customize an array - +>* __in list get__ +Get the index value of an index element +>* __in list get sub-list from__ +Intercepting an element from an array as a new array +>* __icreat list with item repeated times__ +Create an array and use the element to repeat a certain number of times to fill +>* __reverse__ +Array in reverse order +>* __in list set as__ +Set an index to the specified value in the array +>* __make list from text with delimiter__ +Create an array from text, using a separator #### Instructions >Add a create list to create an array, add some elements to the array, call iteratively or otherwise diff --git a/docs/en/uiflow/hardware.md b/docs/en/uiflow/hardware.md index c9e3a063..3d51f75c 100644 --- a/docs/en/uiflow/hardware.md +++ b/docs/en/uiflow/hardware.md @@ -44,15 +44,15 @@ Control the speaker volume >* __play.tone__ Play a specific musical note for a set duration of beats -#### Attention +#### Attentino >The average human can only hear frequencies within the 20Hz~20KHz range，therefore frequencies set outside of this range will not be audible -#### Usage +#### Usag >The Speaker can be used to output melodies or sounds for notification purposes -> +> # IMU (Internal Measurement Unit) @@ -63,17 +63,33 @@ __________________________ >The IMU Blocks get data from the M5GOs accelerometer and magnetometer.The blocks are set to recieve force data in the X，Y and Z directions. These blocks can also sense what orientation the M5 device is in and its acceleration. -> +> >* __Get X__ -Get the accelerometers x position +Get the Roll position >* __Get Y__ +Get the Pitch position + +>* __Get X ACC__ +Get the accelerometers x position + +>* __Get Y ACC__ Get the accelerometers y position ->* __Get Z__ +>* __Get Z ACC__ Get the accelerometers z position +>* __Get X Gyr__ +Get the Angular velocity x position + +>* __Get Y Gyr__ +Get the Angular velocity y position + +>* __Get Z Gyr__ +Get the Angular velocity z position + + #### Usage diff --git a/docs/en/uiflow/introduction.md b/docs/en/uiflow/introduction.md index 9e90a5ef..aec67fea 100644 --- a/docs/en/uiflow/introduction.md +++ b/docs/en/uiflow/introduction.md @@ -9,7 +9,7 @@ _________________________________ >Go to[m5stack.com](http://m5stack.com/)and download the driver for your OS[CP210X driver](http://m5stack.com/download/Driver/CP210x_VCP_Windows.zip) -> +> * __Installing the driver__ @@ -22,9 +22,9 @@ _________________________________ * __Download M5Burner__ ->Go to[flow.m5stack.com](http://flow.m5stack.com/)and click the gear in the top right corner. From the settings panel choose the M5burner for your system[M5Burner tool](http://flow.m5stack.com/download/M5Burner-flow-only.zip) +>Go to[flow.m5stack.com](http://flow.m5stack.com/)and click the gear in the top right corner. From the settings panel choose the M5burner for your system[M5Burner](https://m5stack.com/pages/download) -> +> * __Burning process__ @@ -67,7 +67,7 @@ ______________________ >Once you have opened the UIflow website you can to connect to the web platform by clicking the gear icon in the top right corner, enter your API key and select your device and preferred language. Once you have entered the API Key click OK to confirm**** -> +> # Run，Download program ______________________ @@ -83,7 +83,7 @@ ______________________ >Whats the difference between running and downloading a program? The play button puts our code into the volatile memory of your M5stack. Which means it will be lost once you turn off the M5stack. The download function however will store your program in the flash memory of your device which will not be erased on reboot. Each time you turn on the M5stack after downloading a program, that program will run automatically, and you can also select it from the app list which is accessed by pressing the center button on boot up. -> +> # UIFlow interface _______________________________________ @@ -91,7 +91,7 @@ _______________________________________ ### UIFlow's interface is seperated into 5 main sections -> +> * __Coding area__ >Drag code blocks from the blocks list into the coding area and connect them together to create a program @@ -156,6 +156,9 @@ Directly controlled by physical buttons on the M5GO panel >* __passive Button__ The button can be triggered by the program, and more functions can be realized with the active Button. +>* __obtain Button__ +The button can be triggered by the program only once, if you keep pressing it, it won’t happen unless released. + #### Instructions >Put the program that needs to be run after pressing the button, put it in the Button Block, and modify the corresponding button position. @@ -173,7 +176,12 @@ _____________________________ > >* __Wait__ -Modify the number in the data frame to change the time of the Wait delay +Modify the number in the data frame to change the time of the Wait delay. + +>* __Get ticks ms__ +Get current system run time. + + #### Instructions diff --git a/docs/en/uiflow/logic.md b/docs/en/uiflow/logic.md index a2b3b3a0..05279868 100644 --- a/docs/en/uiflow/logic.md +++ b/docs/en/uiflow/logic.md @@ -94,7 +94,7 @@ __________________________ >Simply put, data iteration is to assign a number of numbers, one after the other, to the same variable, and once for each assignment, run the contents of do once. -> +> >* __for each item i in list__ Iterate over the contents of an array onto the variable __i__ and run the contents of do once per iteration. @@ -118,7 +118,7 @@ ________________________ >Functions are a tool that help us wrap our code into one neat package that we can give a name, and then call that name anywhere in our program and it will run the code contained within it. Functions can help to keep our code neat and concise and avoid repeating the same things over and over. -> +> #### Create a function diff --git a/docs/en/uiflow/ui_simulator.md b/docs/en/uiflow/ui_simulator.md index b1d2c04b..a37fb21e 100644 --- a/docs/en/uiflow/ui_simulator.md +++ b/docs/en/uiflow/ui_simulator.md @@ -27,22 +27,22 @@ Display an image that has been uploaded to the M5 device >Add an element -> +> >Remove an element -> +> #### Programming UI elements >Method 1：After placing an element on the screen, single press it to display the parameters window. From here you can adjust the elements color,size,position and layer -> +> >Method 2：After adding an element to the screen, its equivalent blocks will appear in the UI section of the blocks menu. Using blocks you can program all of the parameters of the element within your program. -> +> # Emoji __________________________ @@ -52,7 +52,7 @@ __________________________ >UIFlow has a Block that makes the creation of simple images on the screen a walk in the park. By clicking the squares on the emoji grid we can draw a picture and use the color swatch to set the color of the pixels -> +> >* __Set emoji map in__ >Click on the squares of the grid to set which pixels will be filled with color on the pixel grid @@ -67,7 +67,7 @@ __________________________ >When the grid has been filled and you have uploaded your code you will see the picture appear on the M5 screen -> +> # Graphic @@ -77,7 +77,7 @@ __________________________ >Apart from the circle and rectangle provided in the UI designer, there are other shapes and elements we can program with the graphic blocks -> +> >* __LCD clear__ @@ -119,9 +119,9 @@ Draw a polygon at the x/y origin with a set radius and amount of sides #### Example ->Create a triangle and set it's color to blue +>Create a triangle and set it's color to red -> +> # Displaying images @@ -135,16 +135,16 @@ __________________________ >Connect to UIflow with your API key，Select the cloud file icon in the top right，select the image tab，click Add image and browse for an image，choose your image and upload, its name will appear in the list if it has successfully been uploaded. -> +> #### Display the image >In the UI designer grab an image placeholder and set it in the middle of the screen. Click on the image placeholder，choose your image name from the drop down list -> +> #### Image manipulation >After uploading an image and assigning it to the place holder, you can manipulate it with the image blocks in the UI blocks section. You can choose whether to show or hide the image and set its position on the screen. -> \ No newline at end of file +> \ No newline at end of file diff --git a/docs/image/Display/Emoji.jpg b/docs/image/Display/Emoji.jpg deleted file mode 100644 index 1ba62a30..00000000 Binary files a/docs/image/Display/Emoji.jpg and /dev/null differ diff --git a/docs/image/Display/Emoji.png b/docs/image/Display/Emoji.png new file mode 100644 index 00000000..b547a4c2 Binary files /dev/null and b/docs/image/Display/Emoji.png differ diff --git a/docs/image/Display/Emoji_user.gif b/docs/image/Display/Emoji_user.gif index 3f5a1b6b..40532b5b 100644 Binary files a/docs/image/Display/Emoji_user.gif and b/docs/image/Display/Emoji_user.gif differ diff --git a/docs/image/Display/Graphic_Block.jpg b/docs/image/Display/Graphic_Block.jpg deleted file mode 100644 index 38c30ab4..00000000 Binary files a/docs/image/Display/Graphic_Block.jpg and /dev/null differ diff --git a/docs/image/Display/Graphic_Block.png b/docs/image/Display/Graphic_Block.png new file mode 100644 index 00000000..ed4efc6f Binary files /dev/null and b/docs/image/Display/Graphic_Block.png differ diff --git a/docs/image/Display/Graphic_user.gif b/docs/image/Display/Graphic_user.gif index c88441eb..5fd859a7 100644 Binary files a/docs/image/Display/Graphic_user.gif and b/docs/image/Display/Graphic_user.gif differ diff --git a/docs/image/Display/UI_user1.gif b/docs/image/Display/UI_user1.gif index 053bec50..9c49ea19 100644 Binary files a/docs/image/Display/UI_user1.gif and b/docs/image/Display/UI_user1.gif differ diff --git a/docs/image/Display/UI_user2.gif b/docs/image/Display/UI_user2.gif index b2917bf6..c3d04975 100644 Binary files a/docs/image/Display/UI_user2.gif and b/docs/image/Display/UI_user2.gif differ diff --git a/docs/image/Display/UI_user3.gif b/docs/image/Display/UI_user3.gif index ddf8b926..604ea5b4 100644 Binary files a/docs/image/Display/UI_user3.gif and b/docs/image/Display/UI_user3.gif differ diff --git a/docs/image/Display/UI_user4.gif b/docs/image/Display/UI_user4.gif index 3bcdb281..a2489a0c 100644 Binary files a/docs/image/Display/UI_user4.gif and b/docs/image/Display/UI_user4.gif differ diff --git a/docs/image/Display/image_user1.gif b/docs/image/Display/image_user1.gif index faaccf41..8252a41a 100644 Binary files a/docs/image/Display/image_user1.gif and b/docs/image/Display/image_user1.gif differ diff --git a/docs/image/Display/image_user2.gif b/docs/image/Display/image_user2.gif index 5f3a314a..1f52ba64 100644 Binary files a/docs/image/Display/image_user2.gif and b/docs/image/Display/image_user2.gif differ diff --git a/docs/image/Display/image_user3.gif b/docs/image/Display/image_user3.gif index e9222624..6cb79679 100644 Binary files a/docs/image/Display/image_user3.gif and b/docs/image/Display/image_user3.gif differ diff --git a/docs/image/Display/triangle.gif b/docs/image/Display/triangle.gif new file mode 100644 index 00000000..4a876df4 Binary files /dev/null and b/docs/image/Display/triangle.gif differ diff --git a/docs/image/Functions/Functions.jpg b/docs/image/Functions/Functions.jpg deleted file mode 100644 index 85f4fd1a..00000000 Binary files a/docs/image/Functions/Functions.jpg and /dev/null differ diff --git a/docs/image/Functions/Functions.png b/docs/image/Functions/Functions.png new file mode 100644 index 00000000..7f192b4f Binary files /dev/null and b/docs/image/Functions/Functions.png differ diff --git a/docs/image/Functions/Functions_user1.gif b/docs/image/Functions/Functions_user1.gif index cc2512ea..8813b471 100644 Binary files a/docs/image/Functions/Functions_user1.gif and b/docs/image/Functions/Functions_user1.gif differ diff --git a/docs/image/Functions/Functions_user2.gif b/docs/image/Functions/Functions_user2.gif index 09ce7f3c..88cfd827 100644 Binary files a/docs/image/Functions/Functions_user2.gif and b/docs/image/Functions/Functions_user2.gif differ diff --git a/docs/image/Hardwares/IMU.jpg b/docs/image/Hardwares/IMU.jpg deleted file mode 100644 index f066c73b..00000000 Binary files a/docs/image/Hardwares/IMU.jpg and /dev/null differ diff --git a/docs/image/Hardwares/IMU.png b/docs/image/Hardwares/IMU.png new file mode 100644 index 00000000..f191b6fa Binary files /dev/null and b/docs/image/Hardwares/IMU.png differ diff --git a/docs/image/Hardwares/IMU_user.gif b/docs/image/Hardwares/IMU_user.gif index 7a2b4f12..104767c0 100644 Binary files a/docs/image/Hardwares/IMU_user.gif and b/docs/image/Hardwares/IMU_user.gif differ diff --git a/docs/image/Hardwares/RGB_user.gif b/docs/image/Hardwares/RGB_user.gif index 87c0655b..a3d4909b 100644 Binary files a/docs/image/Hardwares/RGB_user.gif and b/docs/image/Hardwares/RGB_user.gif differ diff --git a/docs/image/Hardwares/Speaker_user.gif b/docs/image/Hardwares/Speaker_user.gif deleted file mode 100644 index 108f42a0..00000000 Binary files a/docs/image/Hardwares/Speaker_user.gif and /dev/null differ diff --git a/docs/image/Hardwares/Speaker_user.png b/docs/image/Hardwares/Speaker_user.png new file mode 100644 index 00000000..ea4675fb Binary files /dev/null and b/docs/image/Hardwares/Speaker_user.png differ diff --git a/docs/image/Logic/IF_user.gif b/docs/image/Logic/IF_user.gif index 697bdec9..8c154c90 100644 Binary files a/docs/image/Logic/IF_user.gif and b/docs/image/Logic/IF_user.gif differ diff --git a/docs/image/Logic/LogicA_user.gif b/docs/image/Logic/LogicA_user.gif index aa9af445..c6dfb423 100644 Binary files a/docs/image/Logic/LogicA_user.gif and b/docs/image/Logic/LogicA_user.gif differ diff --git a/docs/image/Logic/LogicB_user.gif b/docs/image/Logic/LogicB_user.gif index 1ea11086..2ae3079a 100644 Binary files a/docs/image/Logic/LogicB_user.gif and b/docs/image/Logic/LogicB_user.gif differ diff --git a/docs/image/Loops/Range_user.gif b/docs/image/Loops/Range_user.gif index 427e8f96..1e6622de 100644 Binary files a/docs/image/Loops/Range_user.gif and b/docs/image/Loops/Range_user.gif differ diff --git a/docs/image/Loops/Repeat_user.gif b/docs/image/Loops/Repeat_user.gif index 0c342336..bb326a4a 100644 Binary files a/docs/image/Loops/Repeat_user.gif and b/docs/image/Loops/Repeat_user.gif differ diff --git a/docs/image/MQTT/UIFlow_MQTT.png b/docs/image/MQTT/UIFlow_MQTT.png new file mode 100644 index 00000000..0424e037 Binary files /dev/null and b/docs/image/MQTT/UIFlow_MQTT.png differ diff --git a/docs/image/MQTT/UIFlow_MQTT2.jpg b/docs/image/MQTT/UIFlow_MQTT2.jpg deleted file mode 100644 index 36718728..00000000 Binary files a/docs/image/MQTT/UIFlow_MQTT2.jpg and /dev/null differ diff --git a/docs/image/Operation/Block_connect.gif b/docs/image/Operation/Block_connect.gif new file mode 100644 index 00000000..7912b9fd Binary files /dev/null and b/docs/image/Operation/Block_connect.gif differ diff --git a/docs/image/Operation/List.jpg b/docs/image/Operation/List.jpg deleted file mode 100644 index 3c08a7be..00000000 Binary files a/docs/image/Operation/List.jpg and /dev/null differ diff --git a/docs/image/Operation/List.png b/docs/image/Operation/List.png new file mode 100644 index 00000000..4fdde99a Binary files /dev/null and b/docs/image/Operation/List.png differ diff --git a/docs/image/Operation/Math.jpg b/docs/image/Operation/Math.jpg deleted file mode 100644 index a85ce019..00000000 Binary files a/docs/image/Operation/Math.jpg and /dev/null differ diff --git a/docs/image/Operation/Math.png b/docs/image/Operation/Math.png new file mode 100644 index 00000000..4e4e222b Binary files /dev/null and b/docs/image/Operation/Math.png differ diff --git a/docs/image/Operation/Variables_user1.gif b/docs/image/Operation/Variables_user1.gif index 9fced754..6acb2835 100644 Binary files a/docs/image/Operation/Variables_user1.gif and b/docs/image/Operation/Variables_user1.gif differ diff --git a/docs/image/Operation/Variables_user2.gif b/docs/image/Operation/Variables_user2.gif index 4490c1ca..c72fb308 100644 Binary files a/docs/image/Operation/Variables_user2.gif and b/docs/image/Operation/Variables_user2.gif differ diff --git a/docs/image/Program_structure/Button.png b/docs/image/Program_structure/Button.png index 1e06052c..c2688702 100644 Binary files a/docs/image/Program_structure/Button.png and b/docs/image/Program_structure/Button.png differ diff --git a/docs/image/Program_structure/Button_connect.gif b/docs/image/Program_structure/Button_connect.gif index c7368f22..479c484b 100644 Binary files a/docs/image/Program_structure/Button_connect.gif and b/docs/image/Program_structure/Button_connect.gif differ diff --git a/docs/image/Program_structure/Wait.png b/docs/image/Program_structure/Wait.png index 54149f58..53450255 100644 Binary files a/docs/image/Program_structure/Wait.png and b/docs/image/Program_structure/Wait.png differ diff --git a/docs/image/Program_structure/Wait_user.gif b/docs/image/Program_structure/Wait_user.gif index 8428ac2b..5c097059 100644 Binary files a/docs/image/Program_structure/Wait_user.gif and b/docs/image/Program_structure/Wait_user.gif differ diff --git a/docs/image/base/APIKey_user1.gif b/docs/image/base/APIKey_user1.gif deleted file mode 100644 index f7967b22..00000000 Binary files a/docs/image/base/APIKey_user1.gif and /dev/null differ diff --git a/docs/image/base/APIkey_userpair1.png b/docs/image/base/APIkey_userpair1.png new file mode 100644 index 00000000..f512d8a0 Binary files /dev/null and b/docs/image/base/APIkey_userpair1.png differ diff --git a/docs/image/base/APIkey_userpair2.png b/docs/image/base/APIkey_userpair2.png new file mode 100644 index 00000000..9764de80 Binary files /dev/null and b/docs/image/base/APIkey_userpair2.png differ diff --git a/docs/image/base/Burner_DL.gif b/docs/image/base/Burner_DL.gif deleted file mode 100644 index 92b0a265..00000000 Binary files a/docs/image/base/Burner_DL.gif and /dev/null differ diff --git a/docs/image/base/Burner_DL.png b/docs/image/base/Burner_DL.png new file mode 100644 index 00000000..ed4547ad Binary files /dev/null and b/docs/image/base/Burner_DL.png differ diff --git a/docs/image/base/Burner_user.gif b/docs/image/base/Burner_user.gif index d239f38f..137747cd 100644 Binary files a/docs/image/base/Burner_user.gif and b/docs/image/base/Burner_user.gif differ diff --git a/docs/image/base/CP210X_DL.gif b/docs/image/base/CP210X_DL.gif index 938e17dc..661b2389 100644 Binary files a/docs/image/base/CP210X_DL.gif and b/docs/image/base/CP210X_DL.gif differ diff --git a/docs/image/base/CP210x_driver.png b/docs/image/base/CP210x_driver.png new file mode 100644 index 00000000..a0b89d32 Binary files /dev/null and b/docs/image/base/CP210x_driver.png differ diff --git a/docs/image/base/DL_program.gif b/docs/image/base/DL_program.gif deleted file mode 100644 index 192af7ea..00000000 Binary files a/docs/image/base/DL_program.gif and /dev/null differ diff --git a/docs/image/base/DL_program.png b/docs/image/base/DL_program.png new file mode 100644 index 00000000..97ce97ff Binary files /dev/null and b/docs/image/base/DL_program.png differ diff --git a/docs/image/base/M5bunner_FWdownload.png b/docs/image/base/M5bunner_FWdownload.png new file mode 100644 index 00000000..047b60b2 Binary files /dev/null and b/docs/image/base/M5bunner_FWdownload.png differ diff --git a/docs/image/base/Run_program.gif b/docs/image/base/Run_program.gif index f4c3168b..7912b9fd 100644 Binary files a/docs/image/base/Run_program.gif and b/docs/image/base/Run_program.gif differ diff --git a/docs/image/base/UIFLOW_interface.png b/docs/image/base/UIFLOW_interface.png new file mode 100644 index 00000000..99e79782 Binary files /dev/null and b/docs/image/base/UIFLOW_interface.png differ diff --git a/docs/image/base/UIFlow_web.png b/docs/image/base/UIFlow_web.png deleted file mode 100644 index c8d2e4a1..00000000 Binary files a/docs/image/base/UIFlow_web.png and /dev/null differ diff --git a/docs/image/base/burn_progress.png b/docs/image/base/burn_progress.png new file mode 100644 index 00000000..986d9111 Binary files /dev/null and b/docs/image/base/burn_progress.png differ diff --git a/docs/image/base/downpage.png b/docs/image/base/downpage.png new file mode 100644 index 00000000..5524ecb6 Binary files /dev/null and b/docs/image/base/downpage.png differ diff --git a/docs/image/base/wait.png b/docs/image/base/wait.png new file mode 100644 index 00000000..6df6c130 Binary files /dev/null and b/docs/image/base/wait.png differ diff --git a/docs/zh_CN/uiflow/advanced.md b/docs/zh_CN/uiflow/advanced.md index 1c543b02..991542a8 100644 --- a/docs/zh_CN/uiflow/advanced.md +++ b/docs/zh_CN/uiflow/advanced.md @@ -75,7 +75,7 @@ _________________________________ >当发布者发布消息后，订阅者将获取这一信息，从而实现设备之间的通讯 -> + diff --git a/docs/zh_CN/uiflow/data_structure.md b/docs/zh_CN/uiflow/data_structure.md index a0d7f202..23afdcb1 100644 --- a/docs/zh_CN/uiflow/data_structure.md +++ b/docs/zh_CN/uiflow/data_structure.md @@ -26,7 +26,7 @@ __________________________ >Math中有一些基本的运算Block，像是“加减乘除幂运算”等 -> +> >* __常量__ 填写任意数字，然后连接到其他的对象上用作赋值 @@ -43,6 +43,18 @@ __________________________ >* __数组计算__ 对一个数组进行求和，求最大值或最小值，平均数等计算 +>* __舍入__ +对小数进行四舍五入或者上舍下舍 + +>* __高级数学计算__ +求三角函数、绝对值等运算 + +>* __转换为整数__ +将数值转为整数 + +>* __转换为浮点数__ +将数值转为浮点数 + #### 使用方法 @@ -80,7 +92,7 @@ __________________________ #### 功能说明 >如果说变量是一个容器，那么数组就是由很多个容器组成的一个集合体，我们可以对数组里的任何一个变量进行赋值，获取 -> +> >* __length of__ 测量数组的长度（即数组中元素的个数） >* __X is empty__ @@ -91,7 +103,18 @@ __________________________ 添加一个数值，设定判断是否为成立（例如判断是否为奇数或偶数或质数），符合时为True，否则为False >* __create list with__ 自定义一个数组 - +>* __in list get__ +获取数组某个索引元素值 +>* __in list get sub-list from__ +从数组中截获元素作为新数组 +>* __icreat list with item repeated times__ +建立一个数组，使用元素重复一定次数进行填充 +>* __reverse__ +数组倒序排列 +>* __in list set as__ +在数组中设置某个索引为指定值 +>* __make list from text with delimiter__ +从文本建立数组，使用分隔符 #### 使用方法 >添加一个create list创建数组，添加一些元素到数组中，通过迭代或是其他方式调用 diff --git a/docs/zh_CN/uiflow/hardware.md b/docs/zh_CN/uiflow/hardware.md index 04f91ca1..eefc7f11 100644 --- a/docs/zh_CN/uiflow/hardware.md +++ b/docs/zh_CN/uiflow/hardware.md @@ -21,7 +21,7 @@ __________________________ #### 使用方法 ->将所需的Speaker Block添加到程序中，当程序执行到它时，则会运行对应的功能 +>将所需的RGB Block添加到程序中，当程序执行到它时，则会运行对应的功能 > @@ -52,7 +52,7 @@ __________________________ >将所需的Speaker Block添加到程序中，修改属性或参数，使M5GO发出不同的声音 -> +> # IMU @@ -62,16 +62,31 @@ __________________________ >IMU Block是M5GO的陀螺仪姿态数据采集，它会分别采集X，Y，Z三个坐标轴的坐标数据，通过数据可以编程当M5GO处于不同姿态时，实现不同的功能 -> +> >* __Get X__ -获取陀螺仪的X坐标数据 +获取横滚数据 >* __Get Y__ -获取陀螺仪的Y坐标数据 +获取俯仰数据 ->* __Get Z__ -获取陀螺仪的Z坐标数据 +>* __Get X ACC__ +获取X轴加速度数据 + +>* __Get Y ACC__ +获取Y轴加速度数据 + +>* __Get Z ACC__ +获取Z轴加速度数据 + +>* __Get X Gyr__ +获取X方向角速度 + +>* __Get Y Gyr__ +获取Y方向角速度 + +>* __Get Z Gyr__ +获取Z方向角速度 #### 使用方法 diff --git a/docs/zh_CN/uiflow/introduction.md b/docs/zh_CN/uiflow/introduction.md index 0ee4c674..26186196 100644 --- a/docs/zh_CN/uiflow/introduction.md +++ b/docs/zh_CN/uiflow/introduction.md @@ -23,7 +23,7 @@ _________________________________ >访问[flow.m5stack.com](http://flow.m5stack.com/)下载最新的固件包和[M5Burner烧录工具](http://flow.m5stack.com/download/M5Burner-flow-only.zip) -> +> * __开始烧录__ @@ -67,7 +67,8 @@ ______________________ >进入UIFlow后，点击页面右上角的菜单栏中的设置按钮，输入对应M5GO上的API Key，点击OK保存，等待提示连接成功 -> +> +> # 运行，下载程序 ______________________ @@ -82,7 +83,7 @@ ______________________ >下载程序与运行程序的区别在于，下载会将程序保存到M5GO的程序库中，并且在开机时默认运行，而运行程序只是单次，一旦重启就没有了，就像是一次测试，在实际编程中，会经常使用运行来检测的程序的效果 -> +> # UIFlow布局 _______________________________________ @@ -90,7 +91,7 @@ _______________________________________ ### UIFlow的布局主要分为5大版块 -> +> * __编程区域__ >拖动列表里的Block到右边区域中进行拼接，即可搭建程序 @@ -173,6 +174,9 @@ _____________________________ >* __Wait__ 修改数据框中的数字，更改Wait延时的时间 +>* __Get ticks ms__ +获取系统运行时间 + #### 使用方法 >将Wait Block添加到需要延时的程序之间并设定时间，在程序执行到它时，就会发挥延时作用 diff --git a/docs/zh_CN/uiflow/logic.md b/docs/zh_CN/uiflow/logic.md index a76adc1a..ef672ccb 100644 --- a/docs/zh_CN/uiflow/logic.md +++ b/docs/zh_CN/uiflow/logic.md @@ -92,7 +92,7 @@ __________________________ >简单的说，数据迭代就是将许多数字，一个接一个有顺序的，赋值给同一个变量，并且每赋值一次，运行do的内容一次 -> +> >* __for each item i in list__ 将一个数组的内容顺序迭代到变量 __i__ 上,并且每迭代一次，运行do的内容一次 @@ -116,7 +116,7 @@ ________________________ >函数就像是一个包裹，我们可以给函数取一个名字，在函数里放入程序，当函数被调用时，它就运行它包含在内的程序，在有多段程序重复的时候，使用函数可以节省程序的长度，同时使程序更加的简洁明了，同时方便修改 -> +> #### 创建函数 diff --git a/docs/zh_CN/uiflow/ui_simulator.md b/docs/zh_CN/uiflow/ui_simulator.md index ee44a9ff..f0ac983a 100644 --- a/docs/zh_CN/uiflow/ui_simulator.md +++ b/docs/zh_CN/uiflow/ui_simulator.md @@ -27,17 +27,17 @@ __________________________ >添加元素 -> +> >删除元素 -> +> #### 编辑元素 >方法一：在往屏幕中添加元素后，单击元素，在弹出的属性框中，可以设定初始参数（坐标，颜色，长宽等） -> +> >方法二：在往屏幕中添加元素后，点击UI选项，使用对应的程序Block，可以在程序中对元素进行操作 @@ -51,7 +51,7 @@ __________________________ >UIFlow提供可以快速绘制图案的像素点编辑Block，通过拼凑像素点的形式可以绘制各种各样的图案 -> +> >* __Set emoji map in__ 设置方阵像素点，勾选方阵中的小方格对应显示对应的像素点 @@ -74,7 +74,7 @@ __________________________ >除了几种可以直接使用的几何图形，还可以使用Graphic绘制一些复杂的图形 -> +> >* __LCD clear__ @@ -104,7 +104,7 @@ __________________________ #### 使用案例 ->使用Graphic功能，绘制一个三角形,并修改颜色为蓝色 +>使用Graphic功能，绘制一个三角形,并修改颜色为红色 >