Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authord15521469561 <d155214695615@qq.com>
Mon, 8 May 2023 08:00:02 +0000 (16:00 +0800)
committerd15521469561 <d155214695615@qq.com>
Mon, 8 May 2023 08:00:02 +0000 (16:00 +0800)
commit97ac96e44b7f30fc98c0f584e40176e534007dfe
tree3e8bb3d2d16edbc01883cf8c1f3bc0f8a92b5291
parent0ad8e2b21483c2a713ec74cbf268fc082d52524b
parent2aebd42f614afd77cb34beefb87328261bfcccf5
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 3.code/1.watch/2.code/main.py
# 3.code/1.watch/2.code/main_1.py
13 files changed:
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/appWechat.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/mgr.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_WatchFaceScreen.py
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/ui_setting.py
3.code/1.watch/2.code/appWechat.py
3.code/1.watch/2.code/main.py
3.code/1.watch/2.code/main_1.py
3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/protocol.py
3.code/1.watch/2.code/ui.py
3.code/1.watch/2.code/ui_WatchFaceScreen.py
3.code/1.watch/2.code/ui_setting.py