From: p15692025051 <846603105@qq.com>
Date: Mon, 20 Nov 2023 08:41:59 +0000 (+0800)
Subject: C06S添加flash型号，切换sar通道
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=75da21630d75ea5907de2955e9c86ea031b4d9c5;p=mirrors%2FASR1603_G5.git

C06S添加flash型号，切换sar通道
---

diff --git a/2.sdk/Helios_SDK/components/HX3918/hx3918_prox.c b/2.sdk/Helios_SDK/components/HX3918/hx3918_prox.c
index 8db2d3a8..76429833 100644
--- a/2.sdk/Helios_SDK/components/HX3918/hx3918_prox.c
+++ b/2.sdk/Helios_SDK/components/HX3918/hx3918_prox.c
@@ -336,21 +336,25 @@ bool hx3918_prox_reg_init(void)
 
 
 #ifdef INDEPENDDENT_CH //
+#ifdef PROJECT_NAME_G3_C06S
+    write_ok &= hx3918_write_reg(0x55,0x30);   //CS1->CH0
+    write_ok &= hx3918_write_reg(0x57,0x0c);   //CS0->CH1
+#else
     write_ok &= hx3918_write_reg(0x55,0x0C);   //CS1->CH0
-	write_ok &= hx3918_write_reg(0x57,0x03);   //CS0->CH1
-		
-		
+    write_ok &= hx3918_write_reg(0x57,0x03);   //CS0->CH1
+#endif			
 //    write_ok &= hx3918_write_reg(0x57,0x30);   //CS2->CH1	
 //		write_ok &= hx3918_write_reg(0x57,0x03);   //CS0->CH1
 		  //write_ok &= hx3918_write_reg(0x57,0x0c);   //CS1->CH1
 		
 #elif defined(DIFFERENCE_CH) //?????????????¨, ???????·??
-//    write_ok &= hx3918_write_reg(0x55,0x2c);   //CS1->CH0[P],CS2->CH0[N]
-//		write_ok &= hx3918_write_reg(0x55,0x0e);   //CS1->CH0[P],CS0->CH0[N]
-		write_ok &= hx3918_write_reg(0x55,0x0c);   //CS0->CH0[P],CS1->CH0[N]
-//    write_ok &= hx3918_write_reg(0x57,0x30);   //CS2->CH1
-//		 write_ok &= hx3918_write_reg(0x57,0x03);   //CS0->CH1
-		write_ok &= hx3918_write_reg(0x57,0x0b);   //CS1->CH1
+#ifdef PROJECT_NAME_G3_C06S
+    write_ok &= hx3918_write_reg(0x55,0x30);   //CS1->CH0
+    write_ok &= hx3918_write_reg(0x57,0x0c);   //CS0->CH1
+#else
+        write_ok &= hx3918_write_reg(0x55,0x30);   //CS0->CH0[P],CS1->CH0[N]
+        write_ok &= hx3918_write_reg(0x57,0x2c);   //CS1->CH1
+#endif
 #endif
 		write_ok &= hx3918_write_reg(0x59,0x0c);   //CH2  CS1
 
diff --git a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modVideoCall.c b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modVideoCall.c
index 71eef099..7f4b17b1 100644
--- a/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modVideoCall.c
+++ b/2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modVideoCall.c
@@ -17,7 +17,7 @@
 #include "pyexec.h"
 #include "mphalport.h"
 #include "autoconf.h"
-#if 1 //
+#if 0 //
 
 
 STATIC const mp_rom_map_elem_t VideoCall_module_globals_table[] = {
diff --git a/2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip b/2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip
index bf23d524..9fbf1902 100644
Binary files a/2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip and b/2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip differ