|
|
@@ -71,29 +71,23 @@ static int DTU_uart2_init(void)
|
|
|
rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);
|
|
|
return RT_EOK;
|
|
|
}
|
|
|
+
|
|
|
/*数据发送*/
|
|
|
void DTU_Write(char *fmt, ...)
|
|
|
{
|
|
|
- const char dtu_conf[4] = {device_status.vol,0x00,0x00,0x00};
|
|
|
- va_list arg;
|
|
|
- static char dtu_str[800];
|
|
|
+ va_list ap;
|
|
|
+ static char dtu_str[1024];
|
|
|
rt_size_t str_length;
|
|
|
- va_start(arg,fmt);
|
|
|
- str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
|
|
|
- if (str_length > 800 - 1)
|
|
|
- str_length = 800 - 1;
|
|
|
+ va_start(ap,fmt);
|
|
|
+ //str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
|
|
|
+ str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str)-1, fmt, ap);
|
|
|
+ va_end(ap);
|
|
|
+ if (str_length > 1024 - 1)
|
|
|
+ str_length = 1024 - 1;
|
|
|
rt_device_write(dtuserial, 0, dtu_str, str_length);
|
|
|
- if(strstr(dtu_str,"volume")!=RT_NULL)
|
|
|
- {
|
|
|
- rt_device_write(dtuserial,0,dtu_conf,4);
|
|
|
- }
|
|
|
- else if (strstr(dtu_str,"reset")!=RT_NULL) {
|
|
|
- const char dtu_conf[4] = {7,0x00,0x00,0x00};
|
|
|
- rt_device_write(dtuserial,0,dtu_conf,4);
|
|
|
- }
|
|
|
- va_end(arg);
|
|
|
- memset(dtu_str,'\0',sizeof(dtu_str));
|
|
|
+ LOG_D("DTU_Write:%s",dtu_str);
|
|
|
}
|
|
|
+
|
|
|
/* 接收数据回调函数 */
|
|
|
static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
|
|
|
{
|
|
|
@@ -105,7 +99,7 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
|
|
|
if ( result == -RT_EFULL)
|
|
|
{
|
|
|
/* 消息队列满 */
|
|
|
- rt_kprintf("message queue full!\n");
|
|
|
+ LOG_E("rx_mq_dtu message queue full!\n");
|
|
|
rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
|
|
|
}
|
|
|
return result;
|
|
|
@@ -271,7 +265,6 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
}
|
|
|
else {
|
|
|
char *readinfo = makeJson_ReadInfo();
|
|
|
- rt_kprintf("upload data:%s\n",readinfo);
|
|
|
DTU_Write("%s",readinfo);
|
|
|
rt_free(readinfo);
|
|
|
rt_thread_delay(1000);
|
|
|
@@ -1461,7 +1454,6 @@ int parseDtu(char *json_string)
|
|
|
|
|
|
char * readinfo = makeJson_ReadInfo();
|
|
|
DTU_Write("%s",readinfo);
|
|
|
- rt_kprintf("%s\n",readinfo);
|
|
|
rt_free(readinfo);
|
|
|
device_status.hmi_fresh = 2;
|
|
|
device_status.refresh_num = 15;
|
|
|
@@ -1502,6 +1494,7 @@ int parseDtu(char *json_string)
|
|
|
gettimeofday(&tv,NULL);
|
|
|
LOG_I("系统当前时间戳:%d",tv.tv_sec);
|
|
|
}
|
|
|
+ free(tm_time); //2025-0731
|
|
|
}
|
|
|
if(hum!=NULL&&tmp!=NULL)
|
|
|
{
|
|
|
@@ -1780,15 +1773,16 @@ int parseDtu(char *json_string)
|
|
|
}
|
|
|
else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
|
|
|
{
|
|
|
- if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
|
|
|
- {
|
|
|
- UpLoad_Data();
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- rt_thread_delay(2000);
|
|
|
- UpLoad_Data();
|
|
|
- }
|
|
|
+ UpLoad_Data();
|
|
|
+// if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
|
|
|
+// {
|
|
|
+//
|
|
|
+// }
|
|
|
+// else
|
|
|
+// {
|
|
|
+// rt_thread_delay(2000);
|
|
|
+// UpLoad_Data();
|
|
|
+// }
|
|
|
}
|
|
|
device_status.hmi_fresh = 0;
|
|
|
}
|
|
|
@@ -2341,11 +2335,8 @@ int parseDtu(char *json_string)
|
|
|
void UpLoad_Data(void)
|
|
|
{
|
|
|
char *updata = makeJson();
|
|
|
- LOG_I("upload data:%d%s",rt_strlen(updata),updata);
|
|
|
- rt_free(updata);
|
|
|
- #if Color_EN ==0
|
|
|
DTU_Write("%s",updata);
|
|
|
- #endif
|
|
|
+ rt_free(updata);
|
|
|
list_mem();
|
|
|
//播放数据上传中语音
|
|
|
}
|