projects
/
mirrors
/
ASR1603_G5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f2fe6d
a6c6a35
)
Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
author
p15692025051
<846603105@qq.com>
Thu, 23 Jan 2025 01:19:25 +0000
(09:19 +0800)
committer
p15692025051
<846603105@qq.com>
Thu, 23 Jan 2025 01:19:25 +0000
(09:19 +0800)
# Conflicts:
# 2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/capacitive_hynitron_cst816d_update.py
1
2
2.sdk-ZY/project/K01/sdk/services/microPython/ports/quectel/core/ai.py
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/Helios_SDK/services/microPython/microPython.mk
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modlvgl.c
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
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