Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
authorp15692025051 <846603105@qq.com>
Thu, 23 Jan 2025 01:19:25 +0000 (09:19 +0800)
committerp15692025051 <846603105@qq.com>
Thu, 23 Jan 2025 01:19:25 +0000 (09:19 +0800)
commit299c4f1bd4e7ae4167e4a675af4eceaffc729436
treed52ee818fc38b2c49770e6dcbace3195b9e99fec
parent6f2fe6d3ac59e8efa280ddc945f1508cec050920
parenta6c6a35bcaaef29c47c1f8c6e249edcb3933646c
Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/capacitive_hynitron_cst816d_update.py
2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py
2.sdk/Helios_SDK/services/microPython/microPython.mk
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile