Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authord15521469561 <d155214695615@qq.com>
Tue, 25 Apr 2023 08:27:31 +0000 (16:27 +0800)
committerd15521469561 <d155214695615@qq.com>
Tue, 25 Apr 2023 08:27:31 +0000 (16:27 +0800)
commit1f93df2b72265693af5ccae603fa5631372134b4
tree4a767e91a7422fc92e1013d7023268436d75c492
parent2fea0627d6830605bd47536230026bcfd11eeba7
parentec5a01b8d2cd9febfc99257206a487204a7db073
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 3.code/1.watch/2.code/main_1.py
# 3.code/1.watch/2.code/ui.py
# 3.code/1.watch/2.code/ui_setting.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_setting.py