From: p15692025051 <846603105@qq.com>
Date: Thu, 23 Jan 2025 01:19:25 +0000 (+0800)
Subject: Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=299c4f1bd4e7ae4167e4a675af4eceaffc729436;p=mirrors%2FASR1603_G5.git

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
---

299c4f1bd4e7ae4167e4a675af4eceaffc729436
diff --cc 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
index 880272ea,5c7c78d2..55901308
--- a/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