From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 27 Nov 2023 07:49:42 +0000 (+0800)
Subject: Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=44f51f862ff018ed46c518f7d2c05cac41c8a94d;p=mirrors%2FASR1603_G5.git

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

# Conflicts:
#	2.sdk/Helios_SDK/services/microPython/py/scheduler.c
#	2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/alarm.py
#	2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
---

44f51f862ff018ed46c518f7d2c05cac41c8a94d
diff --cc 2.sdk/Helios_SDK/config/autoconf.h
index affe0689,affe0689..17f50c23
--- a/2.sdk/Helios_SDK/config/autoconf.h
+++ b/2.sdk/Helios_SDK/config/autoconf.h
@@@ -4,7 -4,7 +4,7 @@@
   * Helios SDK Configuration
   *
   */
--#define PROJECT_NAME_G5_K5  1
++#define PROJECT_NAME_G3_K01  1  //项目宏定义
  #define CONFIG_LVGL_SPAN 1
  #define CONFIG_LVGL_FS_HELIOS 1
  #define CONFIG_LVGL_GIF_DECODE 1
@@@ -28,7 -28,7 +28,6 @@@
  #define CONFIG_LVGL_PNG_DECODE 1
  #define CONFIG_LVGL_IMGBTN 1
  //#define CONFIG_GH301x 1
--#define CONFIG_HX3918 1
  #define CONFIG_MBEDTLS 1
  #define CONFIG_SC7A20 1
  #define CONFIG_LVGL_WIN 1
@@@ -38,3 -38,3 +37,8 @@@
  #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
++//菊风视频通话
++#define CONFIG_juphoon 1
diff --cc 2.sdk/Helios_SDK/config/config.in
index 54cbf440,54cbf440..343bad71
--- a/2.sdk/Helios_SDK/config/config.in
+++ b/2.sdk/Helios_SDK/config/config.in
@@@ -5,12 -5,12 +5,11 @@@ menu "System Configuration
  source "../system/config.in"
  endmenu
  
--menu "EG810MCN_GA_ALIPAY"
++menu "EG810MCN_GA_VOLTE"
  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"
--
++source "../components/juphoon/juphoon_option.in"
  endmenu
  
diff --cc 2.sdk/Helios_SDK/config/config.mk
index f135c1bb,f135c1bb..42b702bf
--- a/2.sdk/Helios_SDK/config/config.mk
+++ b/2.sdk/Helios_SDK/config/config.mk
@@@ -2,14 -2,14 +2,14 @@@
  # Automatically generated file; DO NOT EDIT.
  # Helios SDK Configuration
  #
--PROJECT_NAME_G5_K5=y
++PROJECT_NAME_G3_K01=y
  #
  # System Configuration
  #
  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
@@@ -58,5 -58,5 +60,7 @@@ CONFIG_LCD=
  # CONFIG_UART_SLIP is not set
  # CONFIG_POC is not set
  #CONFIG_GH301x=y
--CONFIG_HX3918=y
  CONFIG_SC7A20=y
++#菊风视频通话
++CONFIG_juphoon=y
++
diff --cc 2.sdk/Helios_SDK/system/include/quectel_version.h
index 8efef5e7,8efef5e7..75b19704
--- 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_ALIPAY";
++char mob_sw_rev[] = "EG810MCN_GA_VOLTE";
  
  #endif
diff --cc 2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index 9fbf1902,9fbf1902..859b77f2
Binary files differ
diff --cc 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
index 58fab1ad,2bc2b794..14c9530f
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
@@@ -142,10 -142,11 +143,10 @@@ def main_init()
      app.append_manager(sosInfoCallManager())
      app.append_manager(testSmsSetIPManager())
      app.append_manager(deleteSmsManager())
 -    app.append_manager(ClockManager())
  
-     print("init21:{}".format(utime.localtime()))    
+     EventMesh.debug_log("init21:{}".format(utime.localtime()))    
      
-     print("init11:{}".format(utime.localtime()))    
+     EventMesh.debug_log("init11:{}".format(utime.localtime()))    
      pcr = ProtoColResolver()
      pcr.add_support(LK_ProtoCol())
      pcr.add_support(PING_ProtoCol())
diff --cc 2.sdk/project/D10/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index ea9dabad,ea9dabad..3d2fb116
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 db3a74ef,db3a74ef..cea55d76
Binary files differ
diff --cc 2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index 9dc0f14a,9dc0f14a..93ff2f6c
Binary files differ