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

diff --cc 2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/microPython.mk
Simple merge

diff --cc 2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
Simple merge

diff --cc 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
index 880272e,5c7c78d..5590130
--- 1/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
--- 2/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
@@@ -377,9 -377,9 +377,10 @@@ SRC_QSTR += 
                        source/modwlan_ASR5803.c \
                        source/machine_soft_spi.c \
                        source/code128_p.c \
 +                      source/modmask.c \
                        source/modwlan.c\
                        source/modwlan.c \
+                       source/modmask.c \
                        source/machine_one_wire.c