projects
/
mirrors
/
ASR1603_G5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05d19ba
2cb7037
)
Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
author
p15692025051
<846603105@qq.com>
Thu, 21 Aug 2025 06:59:41 +0000
(14:59 +0800)
committer
p15692025051
<846603105@qq.com>
Thu, 21 Aug 2025 06:59:41 +0000
(14:59 +0800)
# Conflicts:
# 2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
1
2
2.sdk/project/7PIN_1_5/images/customer_fs.bin
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
2.sdk/project/7PIN_1_5/images/customer_fs.bin
index
4633dda
,
4633dda
..
9f33589
Binary files differ
diff --cc
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/ai_VC.py
Simple merge
diff --cc
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
index
023b98e
,
023b98e
..
107f4d5
---
1
/
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
---
2
/
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
+++ b/
2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/versions.py
@@@
-1,2
-1,2
+1,2
@@@
Version="V1.0"
--Build_Time="2025-0
7-04 16:48:41
"
++Build_Time="2025-0
8-21 14:37:54
"
diff --cc
2.sdk/project/7PIN_1_5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index
0d7491a
,
0d7491a
..
da4c2ac
Binary files differ