From: p15692025051 <846603105@qq.com>
Date: Fri, 18 Aug 2023 12:02:55 +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=b7bc28d53b2c7dc197aedb3623f16729eab13399;p=mirrors%2FASR1603_G5.git

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

# Conflicts:
#	2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
---

b7bc28d53b2c7dc197aedb3623f16729eab13399
diff --cc 2.sdk/Helios_SDK/config/autoconf.h
index f63e5ee5,f63e5ee5..affe0689
--- a/2.sdk/Helios_SDK/config/autoconf.h
+++ b/2.sdk/Helios_SDK/config/autoconf.h
@@@ -27,7 -27,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 af85b3e3,af85b3e3..54cbf440
--- a/2.sdk/Helios_SDK/config/config.in
+++ b/2.sdk/Helios_SDK/config/config.in
@@@ -9,6 -9,6 +9,7 @@@ 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 2b217f2a,2b217f2a..f135c1bb
--- a/2.sdk/Helios_SDK/config/config.mk
+++ b/2.sdk/Helios_SDK/config/config.mk
@@@ -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