|
|
@@ -37,7 +37,7 @@
|
|
|
#define HMI_THREAD_TIMESLICE 10 //时间片
|
|
|
|
|
|
#define CONTROL_MOTOR_PRIORITY 18
|
|
|
-#define CONTROL_MOTOR_STACK_SIZE 512
|
|
|
+#define CONTROL_MOTOR_STACK_SIZE 1024
|
|
|
#define CONTROL_MOTOR_TIMESLICE 5
|
|
|
|
|
|
|
|
|
@@ -324,15 +324,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
HMI_WRITE("workSta.cul_time.val=%d",device_status.cul_time);
|
|
|
HMI_WRITE("clockSet.stay.val=%d",device_status.cul_time);
|
|
|
//已培养时间
|
|
|
-
|
|
|
+ if(device_status.develop_flag==0)
|
|
|
+ HMI_WRITE("workSta.staytime.txt=\"0\"");
|
|
|
//滴液时间
|
|
|
HMI_WRITE("clockSet.drop.val=%d",device_status.shake_sec);
|
|
|
//采集开始时间1
|
|
|
HMI_WRITE("clockSet.start1.val=%d",device_status.collecting_sh1);
|
|
|
//采集开始时间2
|
|
|
- HMI_WRITE("clockSet.start2.val=%d",device_status.collecting_eh1);
|
|
|
+ HMI_WRITE("clockSet.start2.val=%d",device_status.collecting_sh2);
|
|
|
//采集结束时间1
|
|
|
- HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_sh2);
|
|
|
+ HMI_WRITE("clockSet.end1.val=%d",device_status.collecting_eh1);
|
|
|
//采集结束时间2
|
|
|
HMI_WRITE("clockSet.end2.val=%d",device_status.collecting_eh2);
|
|
|
//数据上传间隔
|
|
|
@@ -512,7 +513,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
turnzp();
|
|
|
}
|
|
|
else if (device_status.version_type==6) {
|
|
|
- ctr_JD_Clear();
|
|
|
+ ctr_JD_Clear(ON);
|
|
|
}
|
|
|
}
|
|
|
//震动
|
|
|
@@ -636,33 +637,76 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
|
|
|
}
|
|
|
//定时设置
|
|
|
else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
|
|
|
+ char value_str[10];
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
if(device_status.dtype==7)
|
|
|
{
|
|
|
var = strstr(rx_buffer,"=");
|
|
|
var ++;
|
|
|
- device_status.collecting_sh1 = *((int *)var); //采集1开始
|
|
|
- ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
|
|
|
- var+=4;
|
|
|
- device_status.collecting_eh1 = *((int *)var); //采集1结束
|
|
|
- ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
|
|
|
- var+=4;
|
|
|
- device_status.collecting_sh2 = *((int *)var); //采集2开始
|
|
|
- ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
|
|
|
- var+=4;
|
|
|
- device_status.collecting_eh2 = *((int *)var); //采集2结束
|
|
|
- ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
|
|
|
- var+=4;
|
|
|
- device_status.shake_sec = *((int *)var); //滴液时间
|
|
|
- ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
|
|
|
- var+=4;
|
|
|
- device_status.cul_time = *((int *)var); //培养时间
|
|
|
- ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
|
|
|
+ strncpy(value_str,var,2);
|
|
|
+ if(atoi(value_str)>=0&&atoi(value_str)<=23)
|
|
|
+ {
|
|
|
+ device_status.collecting_sh1 = atoi(value_str);
|
|
|
+ ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set collecting_sh1 Failed!");
|
|
|
+ }
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
+ strncpy(value_str,var+2,2);
|
|
|
+ if(atoi(value_str)>=0&&atoi(value_str)<=23)
|
|
|
+ {
|
|
|
+ device_status.collecting_eh1 = atoi(value_str);
|
|
|
+ ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set collecting_eh1 Failed!");
|
|
|
+ }
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
+ strncpy(value_str,var+4,2);
|
|
|
+ if(atoi(value_str)>=0&&atoi(value_str)<=23)
|
|
|
+ {
|
|
|
+ device_status.collecting_sh2 = atoi(value_str);
|
|
|
+ ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set collecting_sh2 Failed!");
|
|
|
+ }
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
+ strncpy(value_str,var+6,2);
|
|
|
+ if(atoi(value_str)>=0&&atoi(value_str)<=23)
|
|
|
+ {
|
|
|
+ device_status.collecting_eh2 = atoi(value_str);
|
|
|
+ ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set collecting_eh2 Failed!");
|
|
|
+ }
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
+ strncpy(value_str,var+8,2);
|
|
|
+ if(atoi(value_str)>=0&&atoi(value_str)<=23)
|
|
|
+ {
|
|
|
+ device_status.shake_sec = atoi(value_str);
|
|
|
+ ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set shake_sec Failed!");
|
|
|
+ }
|
|
|
+ memset(value_str,0,sizeof(value_str));
|
|
|
+ strncpy(value_str,var+10,2);
|
|
|
+ if(atoi(value_str)>0&&atoi(value_str)<=24)
|
|
|
+ {
|
|
|
+ device_status.cul_time = atoi(value_str);
|
|
|
+ ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ LOG_E("Set cul_time Failed!");
|
|
|
+ }
|
|
|
+
|
|
|
MA_save();
|
|
|
LOG_I("参数已保存:%d-%d-%d-%d-%d-%d",device_status.collecting_sh1,device_status.collecting_eh1,device_status.collecting_sh2,device_status.collecting_eh2,device_status.shake_sec,device_status.cul_time);
|
|
|
return;
|
|
|
}
|
|
|
- char value_str[10];
|
|
|
- memset(value_str,0,sizeof(value_str));
|
|
|
LOG_I("时间设置!");
|
|
|
var=strstr(rx_buffer,"=");
|
|
|
var++;
|
|
|
@@ -1328,7 +1372,7 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
break;
|
|
|
}
|
|
|
photo_setup++;
|
|
|
- rt_thread_mdelay(100);
|
|
|
+ rt_thread_mdelay(10);
|
|
|
LOG_I("对焦拍照:%d",photo_setup);
|
|
|
}
|
|
|
DTU_Write("takephotodone");
|
|
|
@@ -1758,33 +1802,46 @@ void Check_ParamConfig(void)
|
|
|
}
|
|
|
void ResetParamDefault(void)
|
|
|
{
|
|
|
- device_status.clt_time = 10; //收集时间
|
|
|
- device_status.dattim = 20; //数据上传间隔
|
|
|
- device_status.startBar = 20; //定时开始时间
|
|
|
- device_status.stopBar = 5; //定时结束时间
|
|
|
- device_status.heattime = 10; //加热时间
|
|
|
- device_status.shake_ws = 1; //针对开关
|
|
|
- device_status.shake_sec = 1; //震动时间1-100ms
|
|
|
- device_status.sunBar = 9; //光控定时时长
|
|
|
- device_status.tph = 70; //高温保护阈值
|
|
|
- device_status.tpl = 5; //低温保护阈值
|
|
|
- device_status.timeSwitch = 0; //定时模式:光控
|
|
|
- device_status.heatvalue=100; //加热温度
|
|
|
device_status.ds = 1; //设备状态开机
|
|
|
device_status.thsp = 300;
|
|
|
device_status.passWord = 8888;
|
|
|
+ device_status.collecting_sh1 = 8;
|
|
|
+ device_status.collecting_eh1 = 9;
|
|
|
+ device_status.collecting_sh1 = 14;
|
|
|
+ device_status.collecting_eh2 = 16;
|
|
|
+
|
|
|
+ if(device_status.dtype==3)
|
|
|
+ {
|
|
|
+ device_status.clt_time = 10; //收集时间
|
|
|
+ device_status.dattim = 20; //数据上传间隔
|
|
|
+ device_status.startBar = 20; //定时开始时间
|
|
|
+ device_status.stopBar = 5; //定时结束时间
|
|
|
+ device_status.heattime = 10; //加热时间
|
|
|
+ device_status.shake_ws = 1; //针对开关
|
|
|
+ device_status.shake_sec = 1; //震动时间1-100ms
|
|
|
+ device_status.sunBar = 9; //光控定时时长
|
|
|
+ device_status.tph = 70; //高温保护阈值
|
|
|
+ device_status.tpl = -5; //低温保护阈值
|
|
|
+ device_status.timeSwitch = 0; //定时模式:光控
|
|
|
+ device_status.heatvalue=100; //加热温度
|
|
|
+ ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
|
|
|
+ ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
|
|
|
+ ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
|
|
|
+ ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
|
|
|
+ ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
|
|
|
+ ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
|
|
|
+ ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
|
|
|
+ ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
|
|
|
+ ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
|
|
|
+ ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws)); //震动开关
|
|
|
+ ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //震动时间
|
|
|
+ }
|
|
|
+ else if(device_status.dtype==7)
|
|
|
+ {
|
|
|
+ device_status.run_sta = 0;
|
|
|
+ ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
|
|
|
+ }
|
|
|
ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
|
|
|
- ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));
|
|
|
- ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
|
|
|
- ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
|
|
|
- ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
|
|
|
- ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
|
|
|
- ef_set_env_blob("jtime", &device_status.heattime, sizeof(device_status.heattime));
|
|
|
- ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
|
|
|
- ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
|
|
|
- ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
|
|
|
- ef_set_env_blob("shake_ws", &device_status.shake_ws, sizeof(device_status.shake_ws)); //震动开关
|
|
|
- ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //震动时间
|
|
|
ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
|
|
|
ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
|
|
|
HMI_WRITE("play %d,%d,%d",1,5,0);
|
|
|
@@ -1802,7 +1859,7 @@ void ResetParamDefault_DC(void)
|
|
|
device_status.shake_sec = 1; //震动时间1-100ms
|
|
|
device_status.sunBar = 4; //光控定时时长
|
|
|
device_status.tph = 70; //高温保护阈值
|
|
|
- device_status.tpl = 5; //低温保护阈值
|
|
|
+ device_status.tpl = -5; //低温保护阈值
|
|
|
device_status.timeSwitch = 0; //定时模式
|
|
|
device_status.heatvalue=100;
|
|
|
device_status.ds = 1; //设备状态开机
|