|
@@ -132,7 +132,7 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
msg.size : sizeof(rx_buffer) - 1;
|
|
msg.size : sizeof(rx_buffer) - 1;
|
|
|
rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
|
|
rx_length = rt_device_read(msg.dev, 0, &rx_buffer[0], rx_length);
|
|
|
rx_buffer[rx_length] = '\0';
|
|
rx_buffer[rx_length] = '\0';
|
|
|
- rt_kprintf("recv data:%s\n",rx_buffer);
|
|
|
|
|
|
|
+ LOG_D("recv data:%s",rx_buffer);
|
|
|
if(strstr(rx_buffer,"{")==RT_NULL||strstr(rx_buffer,"}")==RT_NULL)
|
|
if(strstr(rx_buffer,"{")==RT_NULL||strstr(rx_buffer,"}")==RT_NULL)
|
|
|
{
|
|
{
|
|
|
HMI_WRITE("sysTest.result.txt=\"%s\"",rx_buffer);
|
|
HMI_WRITE("sysTest.result.txt=\"%s\"",rx_buffer);
|
|
@@ -168,21 +168,26 @@ static void dtu_thread_entry_recv(void *parameter)
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
rx_err ++;
|
|
rx_err ++;
|
|
|
- if(rx_err==54000)//90分钟未接收到数据
|
|
|
|
|
|
|
+ if (rx_err < 54000)
|
|
|
|
|
+ {
|
|
|
|
|
+ ctr_DTU_Power(ON);
|
|
|
|
|
+ ctr_photo(ON);
|
|
|
|
|
+ ctr_DTU_Power(ON);
|
|
|
|
|
+ }
|
|
|
|
|
+ else if(rx_err==54000)//90分钟未接收到数据
|
|
|
{
|
|
{
|
|
|
if(device_status.version_type==6)
|
|
if(device_status.version_type==6)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("RK3399 transter Error!\n");
|
|
|
|
|
|
|
+ LOG_E("RK3399 transter Error!\n");
|
|
|
ctr_photo(OFF);
|
|
ctr_photo(OFF);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
ctr_DTU_Power(OFF);
|
|
ctr_DTU_Power(OFF);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (rx_err>54100) {
|
|
|
|
|
|
|
+ else if (rx_err==54100)
|
|
|
|
|
+ {
|
|
|
rx_err = 0;
|
|
rx_err = 0;
|
|
|
- ctr_photo(ON);
|
|
|
|
|
- ctr_DTU_Power(ON);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
//rt_kprintf("%s\n",rx_json_buffer);
|
|
//rt_kprintf("%s\n",rx_json_buffer);
|
|
@@ -220,13 +225,6 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
device_status.power_status = 0;
|
|
device_status.power_status = 0;
|
|
|
rt_thread_delay(1500);
|
|
rt_thread_delay(1500);
|
|
|
}
|
|
}
|
|
|
- if(0)
|
|
|
|
|
- {
|
|
|
|
|
- //关闭路由器供电
|
|
|
|
|
- ctr_router(OFF);
|
|
|
|
|
- //关闭RTU供电
|
|
|
|
|
- ctr_DTU_Power(OFF);
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
//打开路由器和RTU供电
|
|
//打开路由器和RTU供电
|
|
@@ -789,7 +787,7 @@ int parseDtu(char *json_string)
|
|
|
type = cJSON_GetObjectItem(item_ext,"type");
|
|
type = cJSON_GetObjectItem(item_ext,"type");
|
|
|
if(strstr(type->valuestring,"rtu_off_on")!=RT_NULL)
|
|
if(strstr(type->valuestring,"rtu_off_on")!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("DTU 12V Power down");
|
|
|
|
|
|
|
+ LOG_W("DTU 12V Power down");
|
|
|
ctr_RTU_DTU(OFF);
|
|
ctr_RTU_DTU(OFF);
|
|
|
rt_thread_delay(5000);
|
|
rt_thread_delay(5000);
|
|
|
ctr_RTU_DTU(ON);
|
|
ctr_RTU_DTU(ON);
|
|
@@ -959,9 +957,27 @@ int parseDtu(char *json_string)
|
|
|
rt_kprintf("设置温度失败:%s!!!\n",tmp->valuestring);
|
|
rt_kprintf("设置温度失败:%s!!!\n",tmp->valuestring);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (strstr(item_cmd->valuestring,"color")!=RT_NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ if(cJSON_GetObjectItem(item_ext,"turn")!=RT_NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ ctr_turn(90, 0);
|
|
|
|
|
+ }
|
|
|
|
|
+ else {
|
|
|
|
|
+ LOG_W("Unknow cmd value!");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
|
|
else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
|
|
|
{
|
|
{
|
|
|
|
|
+ if(device_status.dtype==7)
|
|
|
|
|
+ {
|
|
|
|
|
+ DTU_Write("%s","SwversionV7");
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (device_status.dtype==3)
|
|
|
|
|
+ {
|
|
|
|
|
+ DTU_Write("%s","SwversionV4");
|
|
|
|
|
+ }
|
|
|
device_status.refresh_timeout=0;
|
|
device_status.refresh_timeout=0;
|
|
|
//driver_4g = cJSON_GetObjectItem(item_ext,"version");
|
|
//driver_4g = cJSON_GetObjectItem(item_ext,"version");
|
|
|
driver_4g = cJSON_GetObjectItem(item_ext,"dver");
|
|
driver_4g = cJSON_GetObjectItem(item_ext,"dver");
|
|
@@ -1023,36 +1039,29 @@ int parseDtu(char *json_string)
|
|
|
strncpy(sec_s,datetime->valuestring+12,2);
|
|
strncpy(sec_s,datetime->valuestring+12,2);
|
|
|
if(atoi(year_s)>=2022&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
|
|
if(atoi(year_s)>=2022&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("设置时间:%d年%d月%d日\n",atoi(year_s),atoi(month_s),atoi(day_s));
|
|
|
|
|
|
|
+
|
|
|
if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
|
|
if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
|
|
|
{
|
|
{
|
|
|
if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
|
|
if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
|
|
|
{
|
|
{
|
|
|
- LOG_I("set_date success!");
|
|
|
|
|
|
|
+ LOG_I("设置时间:%d年%d月%d日",atoi(year_s),atoi(month_s),atoi(day_s));
|
|
|
|
|
+ if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
|
|
|
|
|
+ {
|
|
|
|
|
+ LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
|
|
+ set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
LOG_E("set_date failed!");
|
|
LOG_E("set_date failed!");
|
|
|
rt_hw_rtc_init();
|
|
rt_hw_rtc_init();
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
-
|
|
|
|
|
- LOG_E("网络连接失败,同步时间失败!");
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
|
|
|
|
|
- {
|
|
|
|
|
- LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
|
|
- if(atoi(net->valuestring)==0&&atoi(year_s)>=2022)
|
|
|
|
|
|
|
+ else
|
|
|
{
|
|
{
|
|
|
- set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
|
|
|
|
|
|
|
+ LOG_E("网络连接失败,同步时间失败!");
|
|
|
}
|
|
}
|
|
|
- else {
|
|
|
|
|
-
|
|
|
|
|
- rt_kprintf("网络连接失败,同步时间失败!!!\n");
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
- rt_kprintf("参数同步:\nlat:%s\nlng:%s\n",lat->valuestring,lng->valuestring);
|
|
|
|
|
|
|
+ LOG_I("参数同步:lat:%s lng:%s",lat->valuestring,lng->valuestring);
|
|
|
//CSQ
|
|
//CSQ
|
|
|
if(csq!=NULL&&atoi(csq->valuestring)>=0&&atoi(csq->valuestring)<=31)
|
|
if(csq!=NULL&&atoi(csq->valuestring)>=0&&atoi(csq->valuestring)<=31)
|
|
|
{
|
|
{
|
|
@@ -1065,13 +1074,13 @@ int parseDtu(char *json_string)
|
|
|
if(link_sta!=NULL&&atoi(link_sta->valuestring)>=0&&atoi(link_sta->valuestring)<=1)
|
|
if(link_sta!=NULL&&atoi(link_sta->valuestring)>=0&&atoi(link_sta->valuestring)<=1)
|
|
|
{
|
|
{
|
|
|
device_status.link_sta = atoi(link_sta->valuestring);
|
|
device_status.link_sta = atoi(link_sta->valuestring);
|
|
|
- rt_kprintf("\n>>>>>>>>>>>>>有线接入状态>>>>>>>>>>>>>>:%d\n",device_status.link_sta);
|
|
|
|
|
|
|
+ LOG_I(">>>>>>>>>>>>>有线接入状态>>>>>>>>>>>>>>:%d",device_status.link_sta);
|
|
|
}
|
|
}
|
|
|
//Volume
|
|
//Volume
|
|
|
if(volume!=NULL&&atoi(volume->valuestring)>=0&&atoi(volume->valuestring)<=31)
|
|
if(volume!=NULL&&atoi(volume->valuestring)>=0&&atoi(volume->valuestring)<=31)
|
|
|
{
|
|
{
|
|
|
device_status.vol = atoi(volume->valuestring);
|
|
device_status.vol = atoi(volume->valuestring);
|
|
|
- rt_kprintf("设置音量:%d\n",device_status.vol);
|
|
|
|
|
|
|
+ LOG_I("设置音量:%d",device_status.vol);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
device_status.vol = 7;
|
|
device_status.vol = 7;
|
|
@@ -1079,7 +1088,7 @@ int parseDtu(char *json_string)
|
|
|
//NET
|
|
//NET
|
|
|
if (net!=NULL&&atoi(net->valuestring)>=0&&atoi(net->valuestring)<=1)
|
|
if (net!=NULL&&atoi(net->valuestring)>=0&&atoi(net->valuestring)<=1)
|
|
|
{
|
|
{
|
|
|
- rt_kprintf("网络状态:%s\n",net->valuestring);
|
|
|
|
|
|
|
+ LOG_I("网络状态:%s",net->valuestring);
|
|
|
rt_sprintf(device_status.net,"%s",net->valuestring);
|
|
rt_sprintf(device_status.net,"%s",net->valuestring);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
@@ -1150,12 +1159,12 @@ int parseDtu(char *json_string)
|
|
|
else {
|
|
else {
|
|
|
rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
|
|
rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
|
|
|
}
|
|
}
|
|
|
- rt_kprintf("当前平台1:%s\n",mqttcfg1->valuestring);
|
|
|
|
|
|
|
+ LOG_I("当前平台1:%s",mqttcfg1->valuestring);
|
|
|
}
|
|
}
|
|
|
if(mqttcfg2!=NULL)
|
|
if(mqttcfg2!=NULL)
|
|
|
{
|
|
{
|
|
|
sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
|
|
sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
|
|
|
- rt_kprintf("当前平台2:%s\n",mqttcfg2->valuestring);
|
|
|
|
|
|
|
+ LOG_I("当前平台2:%s",mqttcfg2->valuestring);
|
|
|
}
|
|
}
|
|
|
if( device_status.num_updata==0)
|
|
if( device_status.num_updata==0)
|
|
|
{
|
|
{
|
|
@@ -1504,7 +1513,7 @@ int parseDtu(char *json_string)
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- rt_kprintf("光控定时tt设置失败参数错误!!!\n");
|
|
|
|
|
|
|
+ LOG_E("光控定时tt设置失败参数错误!!!");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1520,7 +1529,7 @@ int parseDtu(char *json_string)
|
|
|
LOG_I("加热时长htim:%d",htim->valueint);
|
|
LOG_I("加热时长htim:%d",htim->valueint);
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- LOG_I("加热时长htim设置失败参数错误!!!");
|
|
|
|
|
|
|
+ LOG_E("加热时长htim设置失败参数错误!!!");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
else if (htim->type==cJSON_String) {
|
|
else if (htim->type==cJSON_String) {
|
|
@@ -1554,11 +1563,11 @@ int parseDtu(char *json_string)
|
|
|
// device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
|
|
// device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
|
|
|
LOG_I("定时模式ts:%d",ts->valueint);
|
|
LOG_I("定时模式ts:%d",ts->valueint);
|
|
|
#else
|
|
#else
|
|
|
- rt_kprintf("三光源模式,禁止设置定时!!!\n");
|
|
|
|
|
|
|
+ LOG_W("三光源模式,禁止设置定时!!!");
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|
|
|
- rt_kprintf("定时模式ts设置失败参数错误!!!\n");
|
|
|
|
|
|
|
+ LOG_E("定时模式ts设置失败参数错误!!!");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
else if (ts->type==cJSON_String) {
|
|
else if (ts->type==cJSON_String) {
|
|
@@ -1704,13 +1713,12 @@ int parseDtu(char *json_string)
|
|
|
|
|
|
|
|
void UpLoad_Data(void)
|
|
void UpLoad_Data(void)
|
|
|
{
|
|
{
|
|
|
-
|
|
|
|
|
char *updata = makeJson();
|
|
char *updata = makeJson();
|
|
|
- rt_kprintf("upload data:%d\n%s\n",rt_strlen(updata),updata);
|
|
|
|
|
|
|
+ LOG_I("upload data:%d%s",rt_strlen(updata),updata);
|
|
|
rt_free(updata);
|
|
rt_free(updata);
|
|
|
DTU_Write("%s",updata);
|
|
DTU_Write("%s",updata);
|
|
|
- updata = NULL;
|
|
|
|
|
list_mem();
|
|
list_mem();
|
|
|
|
|
+ ctr_RTU_DTU(ON);
|
|
|
//播放数据上传中语音
|
|
//播放数据上传中语音
|
|
|
}
|
|
}
|
|
|
|
|
|