test: separate software and PMIC shutdown timing

build_rel.bat

@@ -1,8 +1,6 @@
 @echo off
 set CURDIR=%~dp0
-set time0=%time: =0%
-set hour=%time0:~0,2%
-set appbuildtime=%date:~0,4%%date:~5,2%%date:~8,2%%hour%%time:~3,2%%time:~6,2%
+for /f %%i in ('powershell -NoProfile -Command "Get-Date -Format yyyyMMddHHmmss"') do set appbuildtime=%%i
 set appbuildrev=NULL
 set appbuildmodel=EG800AKCN_11LG
 set appbuildver=beta1

ql-application/threadx/interface/custom_app/audio.c

@@ -5,7 +5,6 @@
 #include "ql_iic.h"
 #include "ql_gpio.h"
 #include "app_inc.h"
-#include "audio_prompt.h"
 #include "ql_fs.h"
 
 #define DEFAULT_VOLUME  6
@@ -15,6 +14,7 @@
 u8 g_cur_volume = 0;
 u8 g_pre_volume = 0;
 
+extern const char *mp3_file[];
 extern int g_file_valid;
 
 

ql-application/threadx/interface/custom_app/hal_key.c

@@ -29,6 +29,7 @@ extern int fota_start;
 #define KEY_LONG_PRESS_1S 1000/5
 #define KEY_LONG_PRESS_1_5S 1500/5
 #define KEY_LONG_PRESS_3S  3000/5
+#define PWRKEY_SOFT_SHUTDOWN_TEST  8000/5
 #define KEY_LONG_PRESS_5S  5000/5
 #define KEY_LONG_PRESS_10S  10000/5
 
@@ -114,7 +115,7 @@ static void key_thread_entry(void *parameter)
 				if(level!=0){		//up
 					key_press_mic_status = 0;
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S){
+					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST){
 						//app_play_tips_file(10);
 					//	power_down_status = 1;
 						ql_rtos_task_sleep_s(3);
@@ -148,7 +149,7 @@ static void key_thread_entry(void *parameter)
 							key_press_mic_status = 1;//表示已经按下了
 						}
 
-					if(ql_rtos_get_systicks() - key_press_mic_time > KEY_LONG_PRESS_3S && power_down_status==0){
+					if(ql_rtos_get_systicks() - key_press_mic_time > PWRKEY_SOFT_SHUTDOWN_TEST && power_down_status==0){
 						power_down_status = 1;
 						app_play_tips_file(10);
 						power_down_status = 2;

ql-application/threadx/interface/custom_app/http_downfile.c

@@ -14,9 +14,7 @@
 #include "sockets.h"
 #include "layer3.h"
 #include "ql_uart.h"
-#include "audio_prompt.h"
-
-const char *mp3_file[AUDIO_PROMPT_FILE_COUNT] ={
+const char *mp3_file[] ={
 	"test.mp3",// 0
 	"network_connect_zh.mp3",//1   系统启动中，正在等待网络连接 
 	"network_check.mp3",//2   网络不好 请检查网络
@@ -36,13 +34,6 @@ const char *mp3_file[AUDIO_PROMPT_FILE_COUNT] ={
 	"volume_up_zh.mp3",//16  
 	"volume_down_zh.mp3",//17  
 	"ai_active_zh.mp3",//18
-	/* 19~24：对话响应超时随机提示音，文件名与资源服务器保持一致 */
-	"tts_error01.mp3",//19
-	"tts_error02.mp3",//20
-	"tts_error03.mp3",//21
-	"tts_error04.mp3",//22
-	"tts_error05.mp3",//23
-	"tts_error06.mp3",//24
 };
 
 //http://banban.api.talkingq.com:8080/assets/roles/banban/tts_error.mp3
@@ -192,8 +183,7 @@ void app_file_check_download(void)
 	char filename_buff[64]={0x00};
 	int ret = 0, cnt = 0;
 	
-	/* 遍历完整资源表，新增提示音不存在时会在联网后自动补下载 */
-	for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){
+	for(index=1;index<19;index++){	
 		
 		if(index==4||index==5||index==6||index==7||index==8){
 			continue;
@@ -218,7 +208,7 @@ void app_file_check_del(void)
 	int index = 1;
 	char filename_buff[64]={0x00};
 	
-	for(index=1;index<AUDIO_PROMPT_FILE_COUNT;index++){
+	for(index=1;index<19;index++){	
 		
 		if(index==4||index==5||index==6||index==7||index==8){
 			continue;

ql-application/threadx/interface/custom_app/inc/audio_prompt.h

@@ -1,19 +0,0 @@
-#ifndef _AUDIO_PROMPT_H_
-#define _AUDIO_PROMPT_H_
-
-/*
- * 本地提示音索引约定。
- * 现有索引保持不变，新增的 6 条对话响应超时音频从 19 开始追加，
- * 避免影响项目中已经使用的其他提示音索引。
- */
-#define AUDIO_PROMPT_TTS_ERROR_INDEX          9
-#define AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX   19
-#define AUDIO_PROMPT_TTS_ERROR_LAST_INDEX    24
-#define AUDIO_PROMPT_FILE_COUNT               25
-
-extern const char *mp3_file[AUDIO_PROMPT_FILE_COUNT];
-
-int app_play_tips_file(int index);
-int app_play_random_tts_error(void);
-
-#endif

ql-application/threadx/interface/custom_app/mqtt.c

@@ -368,7 +368,7 @@ int parse_event_response(const char *json_str, response_t *resp)
         }
         else {
             // ===== 原有逻辑: NFC事件 - 动态查找 url_x 字段 =====
-            for (int i = 1; i <= 5; i++) {
+            for (int i = 1; i <= 10; i++) {
                 char key[16];
                 snprintf(key, sizeof(key), "url_%d", i);
                 cJSON *url = cJSON_GetObjectItem(params, key);

ql-application/threadx/interface/custom_app/ws_talkingq.c

@@ -25,7 +25,6 @@
 #include "ql_uart.h"
 #include "hal_api.h"
 #include "fvad.h"
-#include "audio_prompt.h"
 
 
 
@@ -780,16 +779,12 @@ void sendRecordingAudioPacket(AudioPacket *packet) {
 }
 #endif
 
+extern const char *mp3_file[];
+
 int app_play_tips_file(int index)
 {
 	int file_valid_check = 0;
 	
-	/* 防止提示音索引越界访问文件名数组 */
-	if(index < 0 || index >= AUDIO_PROMPT_FILE_COUNT){
-		printf("invalid prompt index:%d\n", index);
-		return -3;
-	}
-
 	printf("xiaoice_play_index:%d\n", index);
 	
 		//正在录音过程中不允许播放
@@ -825,48 +820,6 @@ int app_play_tips_file(int index)
 	return 0;
 }
 
-/*
- * 随机播放一条对话响应超时提示音。
- * 只把 LittleFS 中实际存在的文件加入候选列表，新增音频尚未下载完成时，
- * 仍可回退播放原来的 tts_error.mp3，不会随机到不存在的文件。
- */
-int app_play_random_tts_error(void)
-{
-	static const int timeout_prompt_indices[] = {
-		AUDIO_PROMPT_TTS_ERROR_INDEX,
-		AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX,
-		AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 1,
-		AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 2,
-		AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 3,
-		AUDIO_PROMPT_TTS_ERROR_FIRST_INDEX + 4,
-		AUDIO_PROMPT_TTS_ERROR_LAST_INDEX
-	};
-	int valid_indices[sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])];
-	int valid_count = 0;
-	int selected_index;
-	int i;
-	char filename_buff[64] = {0x00};
-
-	for(i = 0; i < (int)(sizeof(timeout_prompt_indices) / sizeof(timeout_prompt_indices[0])); i++){
-		int prompt_index = timeout_prompt_indices[i];
-		sprintf(filename_buff, "U:/%s", mp3_file[prompt_index]);
-		if(ql_access(filename_buff, 0) == 0){	//检查filename_buff指向的文件是否存在
-			valid_indices[valid_count++] = prompt_index;
-		}
-	}
-
-	if(valid_count == 0){
-		printf("no local tts error prompt file\n");
-		return -2;
-	}
-
-	selected_index = valid_indices[hal_os_get_rand() % valid_count];
-	printf("random tts_error prompt index:%d, file:%s\n",
-		   selected_index, mp3_file[selected_index]);
-
-	return app_play_tips_file(selected_index);
-}
-
 void app_player_thread(void *arvg)
 {
  	ice_work_item *player_item=NULL; 	
@@ -1070,8 +1023,7 @@ static void check_connect_thread_entry(void *parameter)
 			printf("tts_error_set_speech1\n");
 			vad_set_speech_timeout_flag(1);
 			
-			/* 对话响应超时后，从本地已有的 7 条提示音中随机播放一条 */
-			app_play_random_tts_error();
+			app_play_tips_file(9);
 			//talkingq_ws_send_text("REQUEST_PROMPT_SOUND:tts_error");
 			//改为播放本地音频 听不清 请再说一遍
 		}

ql-kernel/threadx/pmic/pmic.c

@@ -3741,6 +3741,10 @@ extern void chargeManagePhase2Init(void);
 void PMIC_Phase2Init(void)
 {
     INTC_ReturnCode intcStatus;
+	#if !defined(NOT_SUPPORT_PM807)
+	UINT8 longkey_e3;
+	UINT8 longkey_e4;
+	#endif
 
 	PMIC_UART_DEBUG("PMIC_Phase2Init");
 
@@ -3780,6 +3784,30 @@ void PMIC_Phase2Init(void)
         #if !defined(NOT_SUPPORT_PM807)
         case PMIC_807:
             GuilinLite3ClkInit();
+			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+			RTI_LOG("PM807 LONGKEY before: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
+				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
+
+			PM812_SET_LONKEY_PRESS_TIME(2);
+			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_1, TRUE);
+			PM812_LONKEY_ENABLE_SET(GUILIN_LITE3_LONGKEY_2, TRUE);
+
+			longkey_e3 = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			longkey_e4 = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+			RTI_LOG("PM807 LONGKEY after: E3=0x%x time=%ds E4=0x%x en1=%d en2=%d",
+				longkey_e3, (((longkey_e3 >> 4) & 0x0f) + 1), longkey_e4,
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN1),
+				!!(longkey_e4 & GUILIN_LITE3_LONGKEY_EN2));
+			if ((((longkey_e3 >> 4) & 0x0f) != 1) ||
+				((longkey_e4 & (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)) !=
+				 (GUILIN_LITE3_LONGKEY_EN1 | GUILIN_LITE3_LONGKEY_EN2)))
+			{
+				RTI_LOG("PM807 LONGKEY configure failed: E3=0x%x E4=0x%x",
+					longkey_e3, longkey_e4);
+			}
     //        GuilinLite3_VBUCK1_Set_FPWM();
             break;
         #endif
@@ -4231,6 +4259,13 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
     	return (((tmp >> 4) & 0x0f) + 1);
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+		return (((tmp >> 4) & 0x0f) + 1);
+	}
+	#endif
 	else
 	{
 		return tmp;
@@ -4241,6 +4276,10 @@ UINT8 PM812_GET_LONKEY_PRESS_TIME(void)
 void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
 {
     UINT8 tmp;
+	#if !defined(NOT_SUPPORT_PM807)
+	UINT8 target;
+	UINT8 bit;
+	#endif
 
     #if !defined(NOT_SUPPORT_PM802)
 	if (PMIC_IS_PM802()||PMIC_IS_PM802S())
@@ -4268,6 +4307,30 @@ void PM812_SET_LONKEY_PRESS_TIME(UINT8 sec)
     	PMIC_WRITE_REG_BASE(NINGBO_RTC_MISC_3_REG,(tmp|sec));
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		if ((sec < 1) || (sec > 16))
+		{
+			RTI_LOG("PM807 invalid LONGKEY time: %d", sec);
+			return;
+		}
+
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+		target = (tmp & 0x0f) | ((sec - 1) << 4);
+
+		/* RTC_MISC_3 may only accept one changed bit per write. */
+		for (bit = 4; bit < 8; bit++)
+		{
+			if ((tmp ^ target) & (1 << bit))
+			{
+				tmp = (tmp & ~(1 << bit)) | (target & (1 << bit));
+				PMIC_WRITE_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG, tmp);
+				tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_RTC_MISC_3_REG);
+			}
+		}
+	}
+	#endif
 }
 
 void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
@@ -4324,6 +4387,22 @@ void PM812_LONKEY_ENABLE_SET(UINT8 LONGKEY_NUM,BOOL enable)
         }
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		tmp = PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG);
+		if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1)
+		{
+			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN1) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN1));
+			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
+		}
+		else if(LONGKEY_NUM == GUILIN_LITE3_LONGKEY_2)
+		{
+			enable ? (tmp |= GUILIN_LITE3_LONGKEY_EN2) : (tmp &= (~GUILIN_LITE3_LONGKEY_EN2));
+			PMIC_WRITE_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG, tmp);
+		}
+	}
+	#endif
 }
 
 //LONGKEY_NUM: 1/2
@@ -4352,6 +4431,13 @@ BOOL PM812_LONKEY_ENABLE_GET(UINT8 LONGKEY_NUM)
             ((LONGKEY_NUM==NINGBO_LONGKEY_1)?NINGBO_LONGKEY_EN1:NINGBO_LONGKEY_EN2));
 	}
 	#endif
+	#if !defined(NOT_SUPPORT_PM807)
+	else if(PMIC_IS_PM807())
+	{
+		return (PMIC_READ_REG_BASE(GUILIN_LITE3_CLK_32K_SEL_REG) &
+			((LONGKEY_NUM == GUILIN_LITE3_LONGKEY_1) ? GUILIN_LITE3_LONGKEY_EN1 : GUILIN_LITE3_LONGKEY_EN2));
+	}
+	#endif
 	else
 	{
 		PMIC_UART_DEBUG("PM812_LONKEY_ENABLE_GET: it shouldn't reach here, NUM=%d",LONGKEY_NUM);