Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
authorp15692025051 <846603105@qq.com>
Tue, 23 May 2023 10:11:06 +0000 (18:11 +0800)
committerp15692025051 <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
2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip

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