Skip to content

Commit ddc5316

Browse files
committed
Merge branch 'develop-paper' into develop
2 parents e691a7e + f12eb2a commit ddc5316

40 files changed

+1017
-5
lines changed
38.2 KB
Loading
39.5 KB
Loading
70.6 KB
Loading

docs/en/controllers/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ Controllers
1111
cardputer.rst
1212
coreink.rst
1313
airq.rst
14-
14+
paper.rst

docs/en/controllers/paper.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#########
2+
Paper
3+
#########
4+
5+
.. include:: ../refs/controllers.paper.ref
6+
7+
**********
8+
UI
9+
**********
10+
11+
M5Paper features touch panel, allowing you to directly tap on the tabs on the right side to switch to application.
12+
13+
|flow.png|
14+
15+
In the CODE page, you can see your device's UIFlow mode, MAC address, and account information. You can also confirm the connection status of WiFi and the server at the bottom left corner.
16+
17+
|config.png|
18+
19+
In the SETTING page, you can view your WiFi and server configuration.
20+
21+
|applist.png|
22+
23+
In the APPLIST page, you can directly tap on the file name and then tap the run button to execute the code.

docs/en/refs/controllers.paper.ref

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.. |applist.png| image:: ../../_static/controllers/paper/applist.png
2+
3+
.. |config.png| image:: ../../_static/controllers/paper/config.png
4+
5+
.. |flow.png| image:: ../../_static/controllers/paper/flow.png

docs/zh_CN/controllers/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ Controllers
1111
cardputer.rst
1212
coreink.rst
1313
airq.rst
14+
paper.rst

docs/zh_CN/controllers/paper.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#########
2+
Paper
3+
#########
4+
5+
.. include:: ../refs/controllers.paper.ref
6+
7+
**********
8+
UI
9+
**********
10+
11+
M5Paper具有触摸功能,您可以直接点击右侧的选项卡来切换到相应的应用程序。
12+
13+
|flow.png|
14+
15+
在CODE界面,您可以看到自己设备的UIFlow模式,MAC地址,账号信息。您还可以在UI左下角确认WiFi和服务器的连接情况。
16+
17+
|config.png|
18+
19+
在SETTING界面,您可以看到自己的WiFi配置信息和服务器地址。
20+
21+
|applist.png|
22+
23+
在APPLIST界面,您可以直接点击文件名,并点击右侧的运行按钮运行指定的代码。

docs/zh_CN/refs/controllers.paper.ref

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.. |applist.png| image:: ../../_static/controllers/paper/applist.png
2+
3+
.. |config.png| image:: ../../_static/controllers/paper/config.png
4+
5+
.. |flow.png| image:: ../../_static/controllers/paper/flow.png

m5stack/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ boards := \
2323
M5STACK_CoreInk:coreink \
2424
M5STACK_AirQS3:airq \
2525
M5STACK_Dial:dial \
26-
M5STACK_Cardputer:cardputer
26+
M5STACK_Cardputer:cardputer \
27+
M5STACK_Paper:paper
2728

2829
define find_board
2930
$(if $(filter $(1):%,$(boards)),$(word 2,$(subst :, ,$(filter $(1):%,$(boards)))),none)
@@ -47,7 +48,8 @@ BOARD_TYPE_DEF := \
4748
coreink \
4849
airq \
4950
dial \
50-
cardputer
51+
cardputer \
52+
paper
5153

5254
# Select the board type to build, default is None
5355
# This value affects which folder in the "./fs/system/" directory is pack into "fs-system.bin"

0 commit comments

Comments
 (0)