Skip to content

Commit 4437a4e

Browse files
pandiannanopandiannano
committed
Merge remote-tracking branch 'origin/develop' into develop-pandian
2 parents dd28310 + c6a4345 commit 4437a4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+2820
-748
lines changed

‎README.md

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ git clone https://github.com/m5stack/esp-idf.git
1010
git -C esp-idf checkout 014ee65f1f5e291230e398c4913020be9a6278a1
1111
git -C esp-idf submodule update --init --recursive
1212
./esp-idf/install.sh
13-
. ./esp-idf/export.sh
13+
. ./esp-idf/export.sh
1414
```
1515

1616
### Building the firmware
@@ -21,22 +21,39 @@ cd uiflow_micropython/m5stack
2121
make submodules # Only need once
2222
make littlefs
2323
make mpy-cross
24-
# atoms3, atoms3-lite
25-
make BOARD=M5STACK_S3_8MB BOARD_TYPE=atoms3 flash # Build and flash to atoms3 baord
26-
# stamps3
27-
make BOARD=M5STACK_S3_8MB BOARD_TYPE=stamps3 flash
28-
# cores3
29-
make BOARD=M5STACK_S3_SPIRAM_16MB BOARD_TYPE=cores3 flash
24+
# Build and flash
25+
# atoms3
26+
make BOARD=M5STACK_AtomS3 pack_all flash
27+
# atoms3-lite
28+
make BOARD=M5STACK_AtomS3_Lite pack_all flash
3029
# atoms3u
31-
make BOARD=M5STACK_S3_8MB BOARD_TYPE=atoms3u flash
30+
make BOARD=M5STACK_AtomS3U pack_all flash
31+
# core(BASIC/M5GO/GRAY) (Falsh 16MB)
32+
make BOARD=M5STACK_Basic pack_all flash
33+
# core(BASIC/M5GO/GRAY) (Falsh 4MB)
34+
make BOARD=M5STACK_Basic_4MB pack_all flash
35+
# capsule
36+
make BOARD=M5STACK_Capsule pack_all flash
3237
# core2,tough
33-
make BOARD=M5STACK_SPIRAM_16MB BOARD_TYPE=core2 flash
34-
# stickcplus2
35-
make BOARD=M5STACK_SPIRAM_8MB BOARD_TYPE=stickcplus2 flash
38+
make BOARD=M5STACK_Core2 pack_all flash
39+
# cores3
40+
make BOARD=M5STACK_CoreS3 pack_all flash
41+
# dial
42+
make BOARD=M5STACK_Dial pack_all flash
43+
# fire
44+
make BOARD=M5STACK_Fire pack_all flash
45+
# stamps3
46+
make BOARD=M5STACK_StampS3 pack_all flash
3647
# stickcplus
37-
make BOARD=M5STACK_4MB BOARD_TYPE=stickcplus flash
48+
make BOARD=M5STACK_StickC_PLUS pack_all flash
49+
# stickcplus2
50+
make BOARD=M5STACK_StickC_PLUS2 pack_all flash
3851
```
3952

53+
## Documentation
54+
55+
API documentation for this library can be found on [Read the Docs](https://uiflow-micropython.readthedocs.io/en/latest/).
56+
4057
## License
4158

4259
- [micropython][] Copyright (c) 2013-2023 Damien P. George and licensed under MIT License.

‎docs/en/refs/unit.adc.ref

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.. |ADC| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/angle/angle_01.webp
2+
:target: https://docs.m5stack.com/en/unit/adc
3+
:height: 200px
4+
:width: 200 px
5+
6+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/example.svg
7+
8+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/init.svg
9+
10+
.. |get_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_value.svg
11+
12+
.. |get_voltage.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_voltage.svg
13+
14+
.. |get_raw_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_raw_value.svg
15+
16+
.. |get_operating_mode.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_operating_mode.svg
17+
18+
.. |get_data_rate.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_data_rate.svg
19+
20+
.. |get_gain.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/get_gain.svg
21+
22+
.. |set_operating_mode.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/set_operating_mode.svg
23+
24+
.. |set_data_rate.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/set_data_rate.svg
25+
26+
.. |set_gain.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/adc/set_gain.svg
27+
28+
.. |adc_core_example.m5f2| raw:: html
29+
30+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/adc/adc_core_example.m5f2" target="_blank">adc_core_example.m5f2</a>
31+

‎docs/en/refs/unit.angle.ref

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.. |Angle| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/angle/angle_01.webp
2+
:target: https://docs.m5stack.com/en/unit/angle
3+
:height: 200px
4+
:width: 200 px
5+
6+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/angle/example.svg
7+
8+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/angle/init.svg
9+
10+
.. |get_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/angle/get_value.svg
11+
12+
.. |get_voltage.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/angle/get_voltage.svg
13+
14+
.. |angle_core_example.m5f2| raw:: html
15+
16+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/angle/angle_core_example.m5f2" target="_blank">angle_core_example.m5f2</a>
17+

‎docs/en/refs/unit.dlight.ref

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.. |Dlight| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/DLight%20Unit/img-0f153f02-a61e-4071-85a9-b6af7795684f.webp
2+
:target: https://docs.m5stack.com/en/unit/DLight%20Unit
3+
:height: 200px
4+
:width: 200 px
5+
6+
7+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dlight/example.svg
8+
9+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dlight/init.svg
10+
11+
.. |get_lux.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dlight/get_lux.svg
12+
13+
.. |configure.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dlight/configure.svg
14+
15+
16+
.. |dlight_core_example.m5f2| raw:: html
17+
18+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/dlight/dlight_core_example.m5f2" target="_blank">dlight_core_example.m5f2</a>
19+

‎docs/en/refs/unit.dual_button.ref

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.. |Dual_Button| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/dual_button/dual_button_01.webp
2+
:target: https://docs.m5stack.com/en/unit/dual_button
3+
:height: 200px
4+
:width: 200 px
5+
6+
7+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dual_button/example.svg
8+
9+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dual_button/init.svg
10+
11+
.. |get_status.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dual_button/get_status.svg
12+
13+
.. |setCallback.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dual_button/setCallback.svg
14+
15+
.. |tick.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/dual_button/tick.svg
16+
17+
18+
.. |dual_button_core_example.m5f2| raw:: html
19+
20+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/dual_button/dual_button_core_example.m5f2" target="_blank">dual_button_core_example.m5f2</a>
21+

‎docs/en/refs/unit.earth.ref

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.. |EARTH| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/earth/earth_01.webp
2+
:target: https://docs.m5stack.com/en/unit/earth
3+
:height: 200px
4+
:width: 200 px
5+
6+
7+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/example.svg
8+
9+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/init.svg
10+
11+
.. |get_analog_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/get_analog_value.svg
12+
13+
.. |get_digital_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/get_digital_value.svg
14+
15+
.. |get_voltage_mv.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/get_voltage_mv.svg
16+
17+
.. |humidity.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/humidity.svg
18+
19+
.. |set_calibrate.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/earth/set_calibrate.svg
20+
21+
.. |earth_core_example.m5f2| raw:: html
22+
23+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/earth/earth_core_example.m5f2" target="_blank">earth_core_example.m5f2</a>
24+

‎docs/en/refs/unit.env.ref

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11
.. |ENV| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/env/env_01.webp
22
:target: https://docs.m5stack.com/en/unit/env
3-
3+
:height: 200px
4+
:width: 200 px
45
.. |ENV II| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/envII/envII_01.webp
56
:target: https://docs.m5stack.com/en/unit/envII
6-
7+
:height: 200px
8+
:width: 200 px
79
.. |ENV III| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/envIII/envIII_01.webp
810
:target: https://docs.m5stack.com/en/unit/envIII
11+
:height: 200px
12+
:width: 200 px
13+
14+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/env/example.svg
15+
16+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/env/init.svg
17+
18+
.. |read_temperature.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/env/read_temperature.svg
919

10-
.. |example.svg| image:: ../../_static/unit/env/example.svg
20+
.. |read_humidity.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/env/read_humidity.svg
1121

12-
.. |init.svg| image:: https://m5stack.oss-cn-shenzhen.aliyuncs.com/mpy_docs/unit/env/init.svg
22+
.. |read_pressure.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/env/read_pressure.svg
1323

14-
.. |read_temperature.svg| image:: https://m5stack.oss-cn-shenzhen.aliyuncs.com/mpy_docs/unit/env/read_temperature.svg
24+
.. |env_cores3_example.m5f2| raw:: html
1525

16-
.. |read_humidity.svg| image:: https://m5stack.oss-cn-shenzhen.aliyuncs.com/mpy_docs/unit/env/read_humidity.svg
26+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/env/env_cores3_example.m5f2" target="_blank">env_cores3_example.m5f2</a>
1727

18-
.. |read_pressure.svg| image:: https://m5stack.oss-cn-shenzhen.aliyuncs.com/mpy_docs/unit/env/read_pressure.svg

‎docs/en/refs/unit.ir.ref

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.. |IR| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/earth/earth_01.webp
2+
:target: https://docs.m5stack.com/en/unit/ir
3+
:height: 200px
4+
:width: 200 px
5+
6+
7+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/ir/example.svg
8+
9+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/ir/init.svg
10+
11+
.. |rx_event.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/ir/rx_event.svg
12+
13+
.. |tx.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/ir/tx.svg
14+
15+
16+
.. |ir_core_example.m5f2| raw:: html
17+
18+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/ir/ir_core_example.m5f2" target="_blank">ir_core_example.m5f2</a>
19+

‎docs/en/refs/unit.light.ref

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.. |Light| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/LIGHT/img-0b6d72e0-3533-4245-9c84-bfe6c24a50a6.webp
2+
:target: https://docs.m5stack.com/en/unit/LIGHT
3+
:height: 200px
4+
:width: 200 px
5+
6+
7+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/light/example.svg
8+
9+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/light/init.svg
10+
11+
.. |get_digital_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/light/get_digital_value.svg
12+
13+
.. |get_analog_value.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/light/get_analog_value.svg
14+
15+
.. |get_ohm.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/light/get_ohm.svg
16+
17+
18+
.. |light_core_example.m5f2| raw:: html
19+
20+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/light/light_core_example.m5f2" target="_blank">light_core_example.m5f2</a>
21+

‎docs/en/refs/unit.rgb.ref

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.. |RGB| image:: https://static-cdn.m5stack.com/resource/docs/products/unit/rgb/rgb_01.webp
2+
:target: https://docs.m5stack.com/en/unit/rgb
3+
:height: 200px
4+
:width: 200 px
5+
6+
.. |example.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/rgb/example.svg
7+
8+
.. |init.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/rgb/init.svg
9+
10+
.. |set_brightness.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/rgb/set_brightness.svg
11+
12+
.. |fill_color.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/rgb/fill_color.svg
13+
14+
.. |set_color.svg| image:: https://static-cdn.m5stack.com/mpy_docs/unit/rgb/set_color.svg
15+
16+
.. |rgb_core_example.m5f2| raw:: html
17+
18+
<a href="https://uiflow2.m5stack.com/?example=https://raw.githubusercontent.com/m5stack/uiflow-micropython/develop/m5f2_examples/unit/rgb/rgb_core_example.m5f2" target="_blank">rgb_core_example.m5f2</a>

0 commit comments

Comments
 (0)