projects
/
mirrors
/
ASR1603_G5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fe19a72
891c019
)
Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
author
p15692025051
<846603105@qq.com>
Tue, 23 May 2023 10:11:06 +0000
(18:11 +0800)
committer
p15692025051
<846603105@qq.com>
Tue, 23 May 2023 10:11:06 +0000
(18:11 +0800)
# Conflicts:
# 2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
1
2
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
index
b0d8512
,
3f6452a
..
de780d5
---
1
/
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
---
2
/
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
+++ b/
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
@@@
-913,7
-913,7
+913,8
@@@
frozen_mpy_list = $(BUILD)/_boot.mpy
$(BUILD)/ui_main_menu.mpy \
$(BUILD)/ui_setting.mpy \
$(BUILD)/ui_WatchFaceScreen.mpy \
+ $(BUILD)/ui_health.mpy \
+ $(BUILD)/versions.mpy \
endif
diff --cc
2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index
b4977ab
,
b4977ab
..
c98defe
Binary files differ