From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 9 Oct 2023 08:28:12 +0000 (+0800)
Subject: Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/img/static/gitweb.css?a=commitdiff_plain;h=1f698a31312f5d503d82a83d759dcb10a72dafa2;p=mirrors%2FASR1603_G5.git

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

# Conflicts:
#	2.sdk/project/K01/sdk/services/microPython/ports/quectel/core/ui.py
---

1f698a31312f5d503d82a83d759dcb10a72dafa2
diff --cc 2.sdk/Helios_SDK/config/autoconf.h
index 384631ad,384631ad..affe0689
--- a/2.sdk/Helios_SDK/config/autoconf.h
+++ b/2.sdk/Helios_SDK/config/autoconf.h
@@@ -4,6 -4,6 +4,7 @@@
   * Helios SDK Configuration
   *
   */
++#define PROJECT_NAME_G5_K5  1
  #define CONFIG_LVGL_SPAN 1
  #define CONFIG_LVGL_FS_HELIOS 1
  #define CONFIG_LVGL_GIF_DECODE 1
@@@ -26,7 -26,7 +27,8 @@@
  #define CONFIG_LVGL_JPG_DECODE 1
  #define CONFIG_LVGL_PNG_DECODE 1
  #define CONFIG_LVGL_IMGBTN 1
--#define CONFIG_GH301x 1
++//#define CONFIG_GH301x 1
++#define CONFIG_HX3918 1
  #define CONFIG_MBEDTLS 1
  #define CONFIG_SC7A20 1
  #define CONFIG_LVGL_WIN 1
diff --cc 2.sdk/Helios_SDK/config/config.in
index 6e03ed93,6e03ed93..54cbf440
--- a/2.sdk/Helios_SDK/config/config.in
+++ b/2.sdk/Helios_SDK/config/config.in
@@@ -5,10 -5,10 +5,11 @@@ menu "System Configuration
  source "../system/config.in"
  endmenu
  
--menu "EG810MCN_GA_VOLTE"
++menu "EG810MCN_GA_ALIPAY"
  source "../services/microPython/config/config.in"
  source "../components/poc/poc_option.in"
  source "../components/GH301x/GH301x_option.in"
++source "../components/HX3918/HX3918_option.in"
  source "../components/SC7A20/SC7A20_option.in"
  
  endmenu
diff --cc 2.sdk/Helios_SDK/config/config.mk
index aa98ec62,aa98ec62..f135c1bb
--- a/2.sdk/Helios_SDK/config/config.mk
+++ b/2.sdk/Helios_SDK/config/config.mk
@@@ -2,7 -2,7 +2,7 @@@
  # Automatically generated file; DO NOT EDIT.
  # Helios SDK Configuration
  #
--
++PROJECT_NAME_G5_K5=y
  #
  # System Configuration
  #
@@@ -57,5 -57,5 +57,6 @@@ CONFIG_VIOCE_CALL=
  CONFIG_LCD=y
  # CONFIG_UART_SLIP is not set
  # CONFIG_POC is not set
--CONFIG_GH301x=y
++#CONFIG_GH301x=y
++CONFIG_HX3918=y
  CONFIG_SC7A20=y
diff --cc 2.sdk/Helios_SDK/system/include/quectel_version.h
index 75b19704,75b19704..8efef5e7
--- a/2.sdk/Helios_SDK/system/include/quectel_version.h
+++ b/2.sdk/Helios_SDK/system/include/quectel_version.h
@@@ -1,6 -1,6 +1,6 @@@
  #ifndef __QUECTEL_VERSION_H__
  #define __QUECTEL_VERSION_H__
  
--char mob_sw_rev[] = "EG810MCN_GA_VOLTE";
++char mob_sw_rev[] = "EG810MCN_GA_ALIPAY";
  
  #endif
diff --cc 2.sdk/project/D10/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index 797ef67e,797ef67e..ea9dabad
Binary files differ
diff --cc 2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index 0f3bcf8c,0f3bcf8c..f6c79ab0
Binary files differ
diff --cc 2.sdk/project/S6/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index b83ba59a,b83ba59a..8851c2fe
Binary files differ