|
|
@@ -447,11 +447,10 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
device_status.num_updata = 0;
|
|
|
static uint16_t current_arry[10];
|
|
|
static uint8_t record_current = 0;
|
|
|
- static uint8_t lamp_sta_cnt = 0;
|
|
|
rt_thread_delay(10000);
|
|
|
static rt_uint16_t wait_i = 0;
|
|
|
static rt_uint8_t check_i = 0;
|
|
|
- static rt_uint8_t power_i = 0;
|
|
|
+
|
|
|
while(1)
|
|
|
{
|
|
|
time_t now_t;
|
|
|
@@ -480,52 +479,14 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
{
|
|
|
HMI_WRITE("sleep=%d",1);
|
|
|
}
|
|
|
- LOG_I("掉电检测:%d-%d",atoi(device_status.voltage),device_status.power_status);
|
|
|
- //检测到电源掉电
|
|
|
- if(atoi(device_status.voltage)<5&&device_status.power_status==1)
|
|
|
- {
|
|
|
- power_i++;
|
|
|
- //确定网络状态
|
|
|
- if(power_i==10)
|
|
|
+ if(device_status.sleep_mode == 1) {
|
|
|
+ if(device_status.num_updata==120)
|
|
|
{
|
|
|
- device_status.bat_status = 1;
|
|
|
- rt_sprintf(device_status.net, "1");
|
|
|
- HMI_WRITE("sleep=%d",1); //屏幕休眠
|
|
|
- DTU_Write("%s",makeJson_Warn("power down","power"));
|
|
|
- device_status.power_status = 0;
|
|
|
- rt_thread_delay(5000);
|
|
|
- ctr_router(OFF);
|
|
|
- ctr_RTU_DTU(OFF);
|
|
|
- power_i = 0;
|
|
|
- }
|
|
|
- }
|
|
|
- if(atoi(device_status.voltage)>12&&device_status.power_status==0) //电压正常
|
|
|
- {
|
|
|
- device_status.power_status = 1;
|
|
|
- ctr_router(ON);
|
|
|
- ctr_RTU_DTU(ON);
|
|
|
- power_i = 0;
|
|
|
- }
|
|
|
- if(device_status.work_status==1&&device_status.num_updata%10==0&&atoi(device_status.power)>20) //每过10S把电流值存入数组,连续10条数据的电流值大于400mA判断为正常
|
|
|
- {
|
|
|
- current_arry[record_current] = atoi(device_status.power);
|
|
|
- record_current++;
|
|
|
- if(record_current==10)
|
|
|
- {
|
|
|
- record_current = 0;
|
|
|
- if(hasElementGreaterThan400(current_arry, 10)==0) //连续10条电流值大于400,灯管状态正常
|
|
|
- {
|
|
|
- device_status.lamp = 0;
|
|
|
- lamp_sta_cnt = 0;
|
|
|
- }
|
|
|
- if(hasElementGreater_lessThan400(current_arry,10)==0) //连续10条电流值小于400,灯管状态异常
|
|
|
- {
|
|
|
- lamp_sta_cnt++;
|
|
|
- }
|
|
|
- if(lamp_sta_cnt>=3) device_status.lamp = 1;
|
|
|
- memset(current_arry,0,sizeof(current_arry));
|
|
|
+ ctr_router(ON);
|
|
|
+ ctr_RTU_DTU(ON);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
else {
|
|
|
char *readinfo = makeJson_ReadInfo();
|
|
|
@@ -544,39 +505,26 @@ static void dtu_thread_entry_send(void *parameter)
|
|
|
rt_free(res_fuse_warn);
|
|
|
}
|
|
|
device_status.num_updata = device_status.dattim * 60;
|
|
|
- if(device_status.dattim==0) device_status.dattim=20; //数据上传时间间隔设置为0?
|
|
|
- if(device_status.bat_status==0) device_status.power_status = 1; //解除欠压,清除标志位
|
|
|
- }
|
|
|
- }
|
|
|
- else {
|
|
|
- wait_i ++;
|
|
|
- LOG_I("wait connect internet......%d",wait_i);
|
|
|
- //检测到电源掉电
|
|
|
- if(Read_Real_Voltage()/100<5&&device_status.power_status==1&&wait_i>200)
|
|
|
- {
|
|
|
- check_i++;
|
|
|
- LOG_W("断网状态下检测到设备断电!%d",atoi(device_status.voltage));
|
|
|
- if(check_i==10)
|
|
|
- {
|
|
|
- device_status.bat_status = 1;
|
|
|
- device_status.power_status = 0;
|
|
|
+ if(device_status.dattim==0) device_status.dattim=30; //数据上传时间间隔设置为0?
|
|
|
+
|
|
|
+ if(device_status.sleep_mode == 1) {
|
|
|
rt_thread_delay(5000);
|
|
|
ctr_router(OFF);
|
|
|
ctr_RTU_DTU(OFF);
|
|
|
- check_i = 0;
|
|
|
}
|
|
|
}
|
|
|
- if(Read_Real_Voltage()/100>10&&device_status.power_status==0)
|
|
|
- {
|
|
|
- check_i = 0;
|
|
|
- LOG_I("电源恢复正常,打开路由器和RTU供电!");
|
|
|
- device_status.power_status = 1;
|
|
|
- //打开路由器和RTU供电
|
|
|
- ctr_router(ON);
|
|
|
- ctr_RTU_DTU(ON);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ wait_i ++;
|
|
|
+ if(device_status.sleep_mode == 1){
|
|
|
+ if(wait_i==3500){
|
|
|
+ ctr_router(ON);
|
|
|
+ ctr_RTU_DTU(ON);
|
|
|
+ }
|
|
|
}
|
|
|
+ LOG_I("wait connect internet......%d",wait_i);
|
|
|
}
|
|
|
- rt_thread_mdelay(1000);
|
|
|
+ rt_thread_mdelay(1000);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -681,6 +629,26 @@ char * makeJson_ReadInfo()
|
|
|
cJSON_Delete(rJsonRoot);
|
|
|
return r;
|
|
|
}
|
|
|
+
|
|
|
+char *makeJson_ParsePhoto()
|
|
|
+{
|
|
|
+ cJSON * rJsonRoot = NULL;
|
|
|
+ rJsonRoot = cJSON_CreateObject();
|
|
|
+ if(NULL==rJsonRoot)
|
|
|
+ {
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+ cJSON_AddStringToObject(rJsonRoot, "cmd", "ParsePhoto");
|
|
|
+ char * r = cJSON_PrintUnformatted(rJsonRoot);
|
|
|
+ if(NULL == r)
|
|
|
+ {
|
|
|
+ cJSON_Delete(rJsonRoot);
|
|
|
+ return NULL;
|
|
|
+ }
|
|
|
+ cJSON_Delete(rJsonRoot);
|
|
|
+ return r;
|
|
|
+}
|
|
|
+
|
|
|
//{"cmd": "platform", "ext": {"type": "120.27.222.26"}}
|
|
|
char * makeJson_platform(char *plt)
|
|
|
{
|
|
|
@@ -969,12 +937,6 @@ char * makeJson()
|
|
|
if(device_status.gps==NULL)
|
|
|
rt_sprintf(device_status.gps, "0");
|
|
|
|
|
|
- if(device_status.work_status==0) {
|
|
|
- device_status.lamp = 0;
|
|
|
- }
|
|
|
- if(atoi(device_status.power)>5000)
|
|
|
- rt_sprintf(device_status.power,"0.01");
|
|
|
-
|
|
|
makejson_sta = 1;
|
|
|
time_t stamp=time(RT_NULL);
|
|
|
static struct tm tm;
|
|
|
@@ -989,56 +951,6 @@ char * makeJson()
|
|
|
return NULL;
|
|
|
}
|
|
|
memset(device_status.driver,0,sizeof(device_status.driver));
|
|
|
- if(device_status.version_type==1)
|
|
|
- {
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
|
|
|
- }
|
|
|
- else if (device_status.version_type==4) {
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
|
|
|
- }
|
|
|
- else if (device_status.version_type==41) {
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_HK,device_status.driver_4g);
|
|
|
- }
|
|
|
- else if (device_status.version_type==11) {
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_GK,device_status.driver_4g);
|
|
|
- }
|
|
|
- else if (device_status.version_type==5) {
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_V5,device_status.driver_4g);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "DEVICE_SERIAL_NUMBER", device_status.imei);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "VERSION", device_status.driver);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "SIGNAL", device_status.csq);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "SIM", device_status.iccid);
|
|
|
- static char iso8601_time[32]; // 确保缓冲区足够大以容纳时间字符串
|
|
|
- get_iso8601_utc_time(iso8601_time, sizeof(iso8601_time),24);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "UPDATE_DATE", iso8601_time);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "STATUS", "STATUS_ONLINE");
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "STATUS_DESCRIPTION","设备运行正常");
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "LOCATION","113.0,34.0");
|
|
|
- static char iso8601_time_s[32]; // 确保缓冲区足够大以容纳时间字符串
|
|
|
- get_iso8601_utc_time(iso8601_time_s, sizeof(iso8601_time_s),device_status.startBar);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "START_TIME",iso8601_time_s);
|
|
|
- get_iso8601_utc_time(iso8601_time_s, sizeof(iso8601_time_s),device_status.stopBar);
|
|
|
- cJSON_AddStringToObject(pJsonRoot, "END_TIME",iso8601_time_s);
|
|
|
-
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "CONTRIL", !device_status.timeSwitch);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "TT", device_status.sunBar);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "WS", device_status.work_status);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "TPS", device_status.tpl);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "RPS", device_status.rain_status);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "LPS", device_status.sun_status);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "TEMPERATURE", 20.2);
|
|
|
- cJSON_AddNumberToObject(pJsonRoot, "HUMIDITY", 60.2);
|
|
|
- char *p = cJSON_PrintUnformatted(pJsonRoot);
|
|
|
- if(NULL == p)
|
|
|
- {
|
|
|
- cJSON_Delete(pJsonRoot);
|
|
|
- rt_kprintf("cJSON_Delete NULL!!!\n");
|
|
|
- return NULL;
|
|
|
- }
|
|
|
- cJSON_Delete(pJsonRoot);
|
|
|
- return p;
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
cJSON * pSubJson = NULL;
|
|
|
pSubJson = cJSON_CreateObject();
|
|
|
@@ -1057,6 +969,7 @@ char * makeJson()
|
|
|
cJSON_AddStringToObject(pJsonRoot, "cmd", "data");
|
|
|
}
|
|
|
|
|
|
+ rt_sprintf(device_status.driver,"%s-%s",VERSION,device_status.driver_4g);
|
|
|
|
|
|
if(device_status.sensor_485_sta!=0)
|
|
|
{
|
|
|
@@ -1070,158 +983,66 @@ char * makeJson()
|
|
|
rt_sprintf(utos, "%d",device_status.dtype);
|
|
|
cJSON_AddStringToObject(pSubJson,"dtype",utos);
|
|
|
//类型细分
|
|
|
- if(device_status.version_type==4) //水稻
|
|
|
- {
|
|
|
- rt_sprintf(utos,"4");
|
|
|
- cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
- }
|
|
|
- else if (device_status.version_type==1) { //1.0
|
|
|
- rt_sprintf(utos,"1");
|
|
|
- cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
- }
|
|
|
- else if (device_status.version_type==11) { //高空
|
|
|
- rt_sprintf(utos,"11");
|
|
|
- cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
- }
|
|
|
- else if (device_status.version_type==5) { //5.0
|
|
|
- rt_sprintf(utos,"5");
|
|
|
- cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
- }
|
|
|
- else if (device_status.version_type==6) { //吸虫塔
|
|
|
- rt_sprintf(utos,"6");
|
|
|
- cJSON_AddStringToObject(pSubJson,"vtype",utos);
|
|
|
- }
|
|
|
- if(device_status.version_type!=6&&device_status.dtype!=7)
|
|
|
- {
|
|
|
- //光控定时
|
|
|
- rt_sprintf(utos, "%d",device_status.sunBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tt",utos);
|
|
|
- //定时模式
|
|
|
- rt_sprintf(utos, "%d",device_status.timeSwitch);
|
|
|
- cJSON_AddStringToObject(pSubJson,"ts",utos);
|
|
|
- //温控
|
|
|
- rt_sprintf(utos, "%d",device_status.temp_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tps",utos);
|
|
|
- //光控状态
|
|
|
- rt_sprintf(utos, "%d",device_status.sun_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"lps",utos);
|
|
|
- //雨控状态
|
|
|
- rt_sprintf(utos, "%d",device_status.rain_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"rps",utos);
|
|
|
- //电池状态
|
|
|
- rt_sprintf(utos, "%d",device_status.bat_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"batStatus",utos);
|
|
|
- //灯管状态
|
|
|
- rt_sprintf(utos, "%d",device_status.lamp);
|
|
|
- cJSON_AddStringToObject(pSubJson,"lamp",utos);
|
|
|
- //上仓门状态 1-打开,0-关闭-(通道) 打开为落虫,关闭为排水
|
|
|
- rt_sprintf(utos, "%d",device_status.up_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"upds",utos);
|
|
|
- //下仓门状态 1-打开,0-关闭
|
|
|
- rt_sprintf(utos, "%d",device_status.down_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"dnds",utos);
|
|
|
- //加热仓温度
|
|
|
- if(device_status.run_sta>device_status.heattem)
|
|
|
- {
|
|
|
- rt_sprintf(utos, "%d",device_status.run_sta);
|
|
|
- device_status.run_sta = 0;
|
|
|
- }
|
|
|
- else {
|
|
|
- rt_sprintf(utos, "%d",device_status.heattem);
|
|
|
- }
|
|
|
- cJSON_AddStringToObject(pSubJson,"hrt",utos);
|
|
|
- //加热状态
|
|
|
- rt_sprintf(utos, "%d",device_status.heat_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"hs",utos);
|
|
|
- //收集时间(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.clt_time);
|
|
|
- cJSON_AddStringToObject(pSubJson,"collt",utos);
|
|
|
- //加热时间(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.heattime);
|
|
|
- cJSON_AddStringToObject(pSubJson,"htim",utos);
|
|
|
- //加热温度(参数)
|
|
|
- rt_sprintf(utos, "%d",device_status.heatvalue);
|
|
|
- cJSON_AddStringToObject(pSubJson,"hst",utos);
|
|
|
- //高温保护
|
|
|
- rt_sprintf(utos, "%d",device_status.tph);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tph",utos);
|
|
|
- //低温保护
|
|
|
- rt_sprintf(utos, "%d",device_status.tpl);
|
|
|
- cJSON_AddStringToObject(pSubJson,"tpl",utos);
|
|
|
- }
|
|
|
- if(device_status.dtype==3)
|
|
|
- {
|
|
|
- //工作状态
|
|
|
- rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"ws",utos);
|
|
|
- //保险丝电压
|
|
|
- cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
|
|
|
- //开始时间
|
|
|
- rt_sprintf(utos, "%d",device_status.startBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"st",utos);
|
|
|
- //结束时间
|
|
|
- rt_sprintf(utos, "%d",device_status.stopBar);
|
|
|
- cJSON_AddStringToObject(pSubJson,"et",utos);
|
|
|
- }
|
|
|
- else if(device_status.dtype==7)
|
|
|
- {
|
|
|
- char ct1[10],ct2[10];
|
|
|
- rt_sprintf(ct1,"%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
|
|
|
- rt_sprintf(ct2,"%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
|
|
|
- rt_kprintf("ct1-ct2:%s\n",ct1);
|
|
|
- device_status.coll_time[0] = ct1;
|
|
|
- device_status.coll_time[1] = ct2;
|
|
|
- cJSON *data_clt = NULL;
|
|
|
- data_clt = cJSON_CreateStringArray(device_status.coll_time,2);
|
|
|
- //工作状态
|
|
|
- rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"work_sta",utos);
|
|
|
- //运行状态
|
|
|
- rt_sprintf(utos, "%d",device_status.run_sta);
|
|
|
- cJSON_AddStringToObject(pSubJson,"run_sta",utos);
|
|
|
- //箱体温度-box_tem
|
|
|
- rt_sprintf(utos, "%d",device_status.box_temp);
|
|
|
- cJSON_AddStringToObject(pSubJson,"box_tem",utos);
|
|
|
- //培养时间-cul_time
|
|
|
- rt_sprintf(utos, "%d",device_status.cul_time);
|
|
|
- cJSON_AddStringToObject(pSubJson,"cul_time",utos);
|
|
|
- //制冷状态
|
|
|
- rt_sprintf(utos, "%d",device_status.cold_sw);
|
|
|
- cJSON_AddStringToObject(pSubJson,"cold_sw",utos);
|
|
|
- //电压状态-batStatus
|
|
|
- rt_sprintf(utos, "%d",device_status.bat_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"batStatus",utos);
|
|
|
- //已培养时间-staytime
|
|
|
- rt_sprintf(utos, "%d",device_status.stay_time);
|
|
|
- cJSON_AddStringToObject(pSubJson,"stay_time",utos);
|
|
|
- //风机开关
|
|
|
- rt_sprintf(utos, "%d",device_status.wind_sw);
|
|
|
- cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
|
|
|
- //培养仓温度
|
|
|
- rt_sprintf(utos, "%d",device_status.pre_temp);
|
|
|
- cJSON_AddStringToObject(pSubJson,"pre_temp",utos);
|
|
|
- //分辨率
|
|
|
- cJSON_AddStringToObject(pSubJson,"imgres","0");
|
|
|
- //usb
|
|
|
- cJSON_AddStringToObject(pSubJson,"usb_sta","0");
|
|
|
- //雨控状态-rps
|
|
|
- rt_sprintf(utos, "%d",device_status.rain_status);
|
|
|
- cJSON_AddStringToObject(pSubJson,"rps",utos);
|
|
|
- //收集时间
|
|
|
- cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
|
|
|
- //设定温度
|
|
|
- rt_sprintf(utos, "%d",device_status.heatvalue);
|
|
|
- cJSON_AddStringToObject(pSubJson,"set_temp",utos);
|
|
|
- }
|
|
|
- if(device_status.dtype!=7)
|
|
|
- {
|
|
|
- //震动开关
|
|
|
- rt_sprintf(utos, "%d",device_status.shake_ws);
|
|
|
- cJSON_AddStringToObject(pSubJson,"shake",utos);
|
|
|
- }
|
|
|
- //震动时间
|
|
|
- rt_sprintf(utos, "%d",device_status.shake_sec);
|
|
|
- cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
|
|
|
+
|
|
|
+
|
|
|
+ //电流(当前)
|
|
|
+ cJSON_AddStringToObject(pSubJson,"cc",device_status.power);
|
|
|
+ //电压
|
|
|
+ cJSON_AddStringToObject(pSubJson,"bv",device_status.voltage);
|
|
|
+ //电压状态-batStatus
|
|
|
+ rt_sprintf(utos, "%d",device_status.bat_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"bs",utos);
|
|
|
+ //工作状态
|
|
|
+ rt_sprintf(utos, "%d",device_status.work_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ws",utos);
|
|
|
+ //开始时间
|
|
|
+ rt_sprintf(utos, "%d",device_status.startBar);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"st",utos);
|
|
|
+ //结束时间
|
|
|
+ rt_sprintf(utos, "%d",device_status.stopBar);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"et",utos);
|
|
|
+ //cs:充电标志位 0:非充电 1:充电
|
|
|
+ cJSON_AddStringToObject(pSubJson,"cs","0");
|
|
|
+ //rps雨控状态 0:正常 1:保护
|
|
|
+ rt_sprintf(utos, "%d",device_status.rain_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"rps",utos);
|
|
|
+ //定时模式
|
|
|
+ rt_sprintf(utos, "%d",device_status.timeSwitch);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"ts",utos);
|
|
|
+ //温控
|
|
|
+ rt_sprintf(utos, "%d",device_status.temp_status);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"tps",utos);
|
|
|
+ //倾倒状态
|
|
|
+ cJSON_AddStringToObject(pSubJson,"dps","0");
|
|
|
+ //cv 充电电压 单位:V 字符串类型
|
|
|
+ cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
|
|
|
+ //volt_ct电击计数值
|
|
|
+ rt_sprintf(utos, "%d",device_status.all_ycct);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"volt_ct",utos);
|
|
|
+
|
|
|
+ //清虫间隔
|
|
|
+ rt_sprintf(utos, "%d",device_status.cul_time);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"clt_t",utos);
|
|
|
+ //主板温度
|
|
|
+ rt_sprintf(utos, "%d.%d",Get_Temprate()/100,Get_Temprate()%100);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"bt",utos);
|
|
|
+ //volt_freq
|
|
|
+ cJSON_AddStringToObject(pSubJson,"volt_freq","3");
|
|
|
+ //barometric
|
|
|
+// cJSON_AddStringToObject(pSubJson,"barometric","0");
|
|
|
+ //wind_drec
|
|
|
+ cJSON_AddStringToObject(pSubJson,"wind_drec","0");
|
|
|
+ //wind_sped
|
|
|
+ cJSON_AddStringToObject(pSubJson,"wind_sped","0");
|
|
|
+ //cpu_temp
|
|
|
+ cJSON_AddStringToObject(pSubJson,"cpu_tmp",device_status.cpu_temp);
|
|
|
+ //camera_sta
|
|
|
+ cJSON_AddStringToObject(pSubJson,"cam_sta",device_status.camera_sta);
|
|
|
+ //InsectSpecies,昆虫种类
|
|
|
+ cJSON_AddNumberToObject(pSubJson,"InsectSpecies",device_status.InsectSpecies);
|
|
|
+ cJSON_AddNumberToObject(pSubJson,"Power_Type",device_status.Power_Type);
|
|
|
+ cJSON_AddStringToObject(pSubJson,"deviceId",device_status.deviceId);
|
|
|
+
|
|
|
cJSON_AddStringToObject(pSubJson,"gps",device_status.gps); //定位状态
|
|
|
//开关状态
|
|
|
rt_sprintf(utos, "%d",device_status.ds);
|
|
|
@@ -1239,23 +1060,13 @@ char * makeJson()
|
|
|
cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
|
|
|
//是否为上电开机
|
|
|
cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
|
|
|
- //电流(当前)
|
|
|
- cJSON_AddStringToObject(pSubJson,"current",device_status.power);
|
|
|
- #if PCB_V1 == 0
|
|
|
- //加热电流(当前)
|
|
|
- cJSON_AddStringToObject(pSubJson,"current_heat",device_status.heat_power);
|
|
|
- #endif
|
|
|
- //电压
|
|
|
- cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
|
|
|
+
|
|
|
//数据上传间隔
|
|
|
rt_sprintf(utos, "%d",device_status.dattim);
|
|
|
cJSON_AddStringToObject(pSubJson,"dat_f",utos);
|
|
|
//信号强度
|
|
|
cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
|
|
|
- #if 0
|
|
|
- //太阳能板电压
|
|
|
- cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
|
|
|
- #endif
|
|
|
+
|
|
|
char *p = cJSON_PrintUnformatted(pJsonRoot);
|
|
|
if(NULL == p)
|
|
|
{
|
|
|
@@ -1481,27 +1292,12 @@ int parseDtu(char *json_string)
|
|
|
|
|
|
if(ledsta!=NULL)
|
|
|
{
|
|
|
- rt_timer_stop(timer_takephoto);
|
|
|
- HMI_WRITE("selfcheck.t3.bco=2024");
|
|
|
- device_status.C01 &= ~(1<<2);
|
|
|
- if(ledsta->valueint==0)
|
|
|
- {
|
|
|
- HMI_WRITE("selfcheck.t4.bco=2024");
|
|
|
- device_status.C01 &= ~(1<<3);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- HMI_WRITE("selfcheck.t4.bco=63488");
|
|
|
- device_status.C01 |= (1<<3);
|
|
|
- }
|
|
|
-
|
|
|
device_status.led_sta = ledsta->valueint;
|
|
|
LOG_I("补光灯报警状态:%d",device_status.led_sta);
|
|
|
}
|
|
|
if(photolink!=NULL){
|
|
|
- device_status.camsta = 0; //拍照正常
|
|
|
- device_status.ctr_up_motor = 0; //关闭
|
|
|
- device_status.ctr_down_motor = 0; //关闭
|
|
|
+ device_status.selfcheck_ws = 0;
|
|
|
+ device_status.camera_sta = 0; //拍照正常
|
|
|
rt_sprintf(device_status.photolink,"%s",photolink->valuestring);
|
|
|
LOG_I("接收到图片地址:%s",device_status.photolink);
|
|
|
//上报自检结果
|
|
|
@@ -1510,7 +1306,7 @@ int parseDtu(char *json_string)
|
|
|
DTU_Write("%s",json_temp);
|
|
|
free(json_temp);
|
|
|
}
|
|
|
-
|
|
|
+ if(device_status.work_status==0) ctr_lamp(OFF, 1); //关闭高压
|
|
|
}
|
|
|
if(item_checkself!=NULL){//自检签名
|
|
|
memset(device_status.qianming,0,sizeof(device_status.qianming));
|
|
|
@@ -1521,9 +1317,9 @@ int parseDtu(char *json_string)
|
|
|
char *json_temp = makeJson_selfCheck_(0);
|
|
|
DTU_Write("%s",json_temp);
|
|
|
free(json_temp);
|
|
|
- ctr_lamp(ON, 1);
|
|
|
- ctr_Heat(OFF);
|
|
|
- //执行自检
|
|
|
+ ctr_lamp(OFF,1);
|
|
|
+ rt_thread_delay(1000);
|
|
|
+ ctr_lamp(ON, 1); //开启高压
|
|
|
device_status.selfcheck_ws = 1;
|
|
|
}
|
|
|
//item_data = cJSON_GetObjectItem(root,"data");
|
|
|
@@ -1603,18 +1399,7 @@ int parseDtu(char *json_string)
|
|
|
rt_free(photo);
|
|
|
rt_thread_delay(2000);
|
|
|
}
|
|
|
- //{"ext": {"type": "turn"}, "cmd": "ctrl"} 转仓
|
|
|
- else if(strstr(type->valuestring,"turn")!=RT_NULL)
|
|
|
- {
|
|
|
- #if Color_EN == 0
|
|
|
- char *turn_zp = makeJson_Warn("send cmd success:turn_zp","control");
|
|
|
- DTU_Write("%s",turn_zp);
|
|
|
- rt_free(turn_zp);
|
|
|
- ctr_turn(90, 0);
|
|
|
- #else
|
|
|
- DTU_Write("黄板复位:%d",ctr_Color_board(RESET, 800));
|
|
|
- #endif
|
|
|
- }
|
|
|
+
|
|
|
//{"ext": {"type": "paichong"}, "cmd": "ctrl"} 排虫
|
|
|
else if (strstr(type->valuestring,"paichong")!=RT_NULL) {
|
|
|
char *turn_zp = makeJson_Warn("send cmd success:paichong","control");
|
|
|
@@ -1632,29 +1417,11 @@ int parseDtu(char *json_string)
|
|
|
{
|
|
|
ctr_led(OFF);
|
|
|
}
|
|
|
- else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
|
|
|
- {
|
|
|
- if(device_status.selfcheck_ws == 2)
|
|
|
- {
|
|
|
- char *js = makeJson_C01_Warn(device_status.C01,device_status.process);
|
|
|
- DTU_Write("%s",js);
|
|
|
- free(js);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- device_status.selfcheck_ws = 2;
|
|
|
- }
|
|
|
- LOG_I("收到自检指令:%d",device_status.selfcheck_ws);
|
|
|
- }
|
|
|
- else if(strstr(type->valuestring,"insect_kill")!=RT_NULL)
|
|
|
+ else if(strstr(type->valuestring,"sleep_mode")!=RT_NULL)
|
|
|
{
|
|
|
- device_status.autotakepic = 10;
|
|
|
- LOG_W("收到害虫信号!");
|
|
|
- }
|
|
|
- else if(strstr(type->valuestring,"insect_save")!=RT_NULL)
|
|
|
- {
|
|
|
- device_status.autotakepic = 11;
|
|
|
- LOG_W("收到益虫信号!");
|
|
|
+ device_status.sleep_mode = 1;
|
|
|
+ ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode)); //设备编码
|
|
|
+ LOG_I("收到设置休眠指令:%d",device_status.sleep_mode);
|
|
|
}
|
|
|
}
|
|
|
//切换平台
|
|
|
@@ -1878,10 +1645,10 @@ int parseDtu(char *json_string)
|
|
|
HMI_WRITE("menu.eth1_sta.val=%d",atoi(value_commn->valuestring));
|
|
|
}
|
|
|
value_commn = cJSON_GetObjectItem(item_ext,"cpu_tmp");
|
|
|
+ sprintf(device_status.cpu_temp,"%s",value_commn->valuestring);
|
|
|
if(value_commn!=RT_NULL)
|
|
|
{
|
|
|
- HMI_WRITE("menu.cpu_temp.txt=\"%d.%d℃\"",atoi(value_commn->valuestring)/1000,atoi(value_commn->valuestring)%1000);
|
|
|
-
|
|
|
+ HMI_WRITE("menu.cpu.txt=\"%d.%d\"",atoi(value_commn->valuestring)/1000,atoi(value_commn->valuestring)%1000);
|
|
|
}
|
|
|
if(link_ip!=NULL)
|
|
|
{
|