From: p15692025051 <846603105@qq.com>
Date: Tue, 23 May 2023 10:11:06 +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=3ba9491bfa3d44113f6db52a61e8d6b513c04b1a;p=mirrors%2FASR1603_G5.git

Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
#	2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
---

3ba9491bfa3d44113f6db52a61e8d6b513c04b1a
diff --cc 2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/Makefile
index b0d8512a,3f6452ac..de780d5f
--- a/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 b4977abc,b4977abc..c98defe3
Binary files differ