From: dxy15521469561 <1731678236@qq.com>
Date: Fri, 1 Sep 2023 06:59:45 +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=0f5e5db6e2d7c0dcac60f0a29b5b90296e27e7e4;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
---

0f5e5db6e2d7c0dcac60f0a29b5b90296e27e7e4
diff --cc 2.sdk/Helios_SDK/config/autoconf.h
index bc104c6c,bc104c6c..26766385
--- a/2.sdk/Helios_SDK/config/autoconf.h
+++ b/2.sdk/Helios_SDK/config/autoconf.h
@@@ -37,3 -37,3 +37,6 @@@
  #define CONFIG_LVGL_QRCODE 1
  #define CONFIG_LVGL_TILEVIEW 1
  #define CONFIG_LVGL_HANDLER_TASK_PRIORITY 80
++#define CONFIG_CAMERA 1
++#define CONFIG_JPEG 1
++#define CONFIG_CAMERA_SAVEPHOTOS 1
diff --cc 2.sdk/Helios_SDK/config/config.mk
index de80d967,de80d967..bf69c97c
--- a/2.sdk/Helios_SDK/config/config.mk
+++ b/2.sdk/Helios_SDK/config/config.mk
@@@ -9,7 -9,7 +9,7 @@@ PROJECT_NAME_G3_K01=
  CONFIG_MBEDTLS=y
  
  #
--# EG810MCN_GA_ALIPAY
++# EG810MCN_GA_VOLTE
  #
  CONFIG_LVGL=y
  
@@@ -46,11 -46,11 +46,13 @@@ CONFIG_LVGL_KEYBOARD=
  CONFIG_LVGL_SPAN=y
  CONFIG_LVGL_HANDLER_TASK_PRIORITY=80
  # CONFIG_QRCODE is not set
--# CONFIG_CAMERA is not set
++CONFIG_CAMERA=y
++# CONFIG_CAMERA_DECODE is not set
++CONFIG_CAMERA_SAVEPHOTOS=y
  # CONFIG_QUECTHING is not set
  # CONFIG_SPINAND is not set
  # CONFIG_RTMP is not set
--# CONFIG_JPEG is not set
++CONFIG_JPEG=y
  # CONFIG_SPI_SDCARD is not set
  CONFIG_VIOCE_CALL=y
  # CONFIG_TTS is not set
diff --cc 2.sdk/Helios_SDK/config/config.mk.old
index 1bb96615,1bb96615..699ff84b
--- a/2.sdk/Helios_SDK/config/config.mk.old
+++ b/2.sdk/Helios_SDK/config/config.mk.old
@@@ -2,7 -2,7 +2,7 @@@
  # Automatically generated file; DO NOT EDIT.
  # Helios SDK Configuration
  #
--
++PROJECT_NAME_G3_K01=y
  #
  # System Configuration
  #
@@@ -40,13 -40,13 +40,13 @@@ CONFIG_LVGL_MSGBOX=
  # CONFIG_LVGL_CALENDAR is not set
  # CONFIG_LVGL_SPINNER is not set
  # CONFIG_LVGL_SPINBOX is not set
--CONFIG_LVGL_ANIMIMG=y
--CONFIG_LVGL_COLORWHEEL=y
++# CONFIG_LVGL_ANIMIMG is not set
++# CONFIG_LVGL_COLORWHEEL is not set
  CONFIG_LVGL_KEYBOARD=y
  CONFIG_LVGL_SPAN=y
--CONFIG_LVGL_HANDLER_TASK_PRIORITY=90
++CONFIG_LVGL_HANDLER_TASK_PRIORITY=80
  # CONFIG_QRCODE is not set
--# CONFIG_CAMERA is not set
++CONFIG_CAMERA=y
  # CONFIG_QUECTHING is not set
  # CONFIG_SPINAND is not set
  # CONFIG_RTMP is not set
@@@ -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_SC7A20=y
++