zhunk 1 год назад
Родитель
Сommit
a9fc567afc

+ 1 - 1
Application_cbd_apm32f1/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-446626834515254951" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-434655199918149018" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 12 - 15
Application_cbd_apm32f1/applications/control.c

@@ -190,7 +190,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
 //    }
 
     //驱动使能
-    //rt_pin_write(HK_IO, ON);
+    rt_pin_write(HK_IO, ON);
 
     //方向选择
     if(dir_ == 1){
@@ -202,7 +202,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
     switch(DIR_){
         case X_:
             ctr_lamp(1, ON);   //X轴电源开关:开
-            rt_thread_delay(100);
+            rt_thread_delay(1000);
             //判断限位
             if(dir_== 0 && rt_pin_read(Limit_Motor_X)==1){
                 for(int z =0;z < 3; z++){
@@ -212,7 +212,8 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
                 return 0;
             }
             rt_pin_write(HK_IO, ON);
-            beep_set(pulse, pulse/2); //PWM使能
+            rt_thread_delay(100);
+            beep_set(pulse, pulse/3); //PWM使能
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                     rt_thread_delay(10);   //10ms
@@ -245,8 +246,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
                 return 0;
             }
             rt_pin_write(HK_IO, ON);
-            beep_set(pulse, pulse/3); //PWM使能
-
+            beep_set(pulse, pulse/2); //PWM使能
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                     rt_thread_delay(1);
@@ -267,9 +267,9 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
             break;
         case Z_:
             ctr_swz(ON);         //Z轴电源开关:开
-            rt_thread_delay(100);   //
+            rt_thread_delay(1000);   //
             //判断限位
-            if(dir_== 0 && rt_pin_read(Limit_Motor_Z)==1){
+            if(dir_== 1 && rt_pin_read(Limit_Motor_Z)==1){
                 for(int z =0;z < 3; z++){
                     Beep_Tip(200);
                     LOG_W("Z:已在初始位置!");
@@ -278,11 +278,12 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
             }
             //驱动使能
             rt_pin_write(HK_IO, ON);
-            beep_set(pulse, pulse/2); //PWM使能
+            rt_thread_delay(100);
+            beep_set(pulse, pulse/3); //PWM使能
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                     rt_thread_delay(10);
-                   if(dir_==0&&rt_pin_read(Limit_Motor_Z)==1){
+                   if(dir_==1&&rt_pin_read(Limit_Motor_Z)==1){
                        rt_thread_delay(10);
                        if(rt_pin_read(Limit_Motor_Z)==1){
                            j = dis_;
@@ -1071,11 +1072,9 @@ void slide_thread_entry(void *parameter)
             LOG_I("The slide's x movement was done ok");
             if(slide_para.xdis==55)
             {
-                rt_thread_delay(1000);
                 DTU_Write("{\"cmd\": \"takephoto\" }");
                 device_status.autotakepic = 4;
             }else {
-                rt_thread_delay(1000);
                 char *photo = makeJson_Warn("movx","done");
                 LOG_I("%s",photo);
                 DTU_Write("%s",photo);
@@ -1091,11 +1090,9 @@ void slide_thread_entry(void *parameter)
             rt_kprintf("The slide's z movement was done ok\n");
             if(slide_para.zdis==55)
             {
-                rt_thread_delay(1000);
                 DTU_Write("{\"cmd\": \"takephoto\" }");
                 device_status.autotakepic = 4;
             }else {
-                rt_thread_delay(1000);
                 char *photo = makeJson_Warn("movz","done");
                 LOG_I("%s",photo);
                 DTU_Write("%s",photo);
@@ -1123,8 +1120,8 @@ void slide_thread_entry(void *parameter)
        }
     case 4:{
                //复位Z
-                LOG_W("Z轴复位!");
-               slide_para.zdir = 0;
+               LOG_W("Z轴复位!");
+               slide_para.zdir = 1;   //250717
                slide_para.zdis = 5000;
                ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
                LOG_I("The slide's Z movement was done ok");

+ 2 - 2
Application_cbd_apm32f1/applications/control.h

@@ -114,8 +114,8 @@ typedef struct  _packed
     rt_uint32_t num_updata;         //
     rt_uint32_t rebootcnt;          //启动次数
     rt_uint32_t light_over_tim;     //光控定时差秒数,镇流器的结束时间
-    rt_uint32_t data_plan;          //流量套餐
-    rt_uint32_t expiry_date;        //到期时间
+    rt_uint32_t x_init_dis;          //流量套餐
+    rt_uint32_t y_init_dis;        //到期时间
     double focus_value;
     int passWord;              //初始密码
     double process;

+ 22 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -660,6 +660,8 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"dat_f",utos);
     //信号强度
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
+    cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_init_dis);
+    cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
@@ -1324,6 +1326,26 @@ int parseDtu(char *json_string)
 
                           cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time");   //培养时间1~24
                           cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
+                          cJSON* x_init_dis= cJSON_GetObjectItem(item_ext,"x_init_dis");
+                          cJSON* y_init_dis= cJSON_GetObjectItem(item_ext,"y_init_dis");
+                          if(x_init_dis!=NULL)
+                          {
+                              if(x_init_dis->valueint>0){
+                                  device_status.x_init_dis = x_init_dis->valueint;
+                                  LOG_I("设置X轴初始位置:%d",device_status.x_init_dis);
+                                  ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
+                              }
+
+                          }
+                          if(y_init_dis!=NULL)
+                          {
+                              if(y_init_dis->valueint>0){
+                                   device_status.y_init_dis = x_init_dis->valueint;
+                                   LOG_I("设置Y轴初始位置:%d",device_status.y_init_dis);
+                                   ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
+
+                               }
+                          }
                           if(drop_sec!=NULL)
                           {
                               if(drop_sec->valueint>=1&&drop_sec->valueint<=300)

+ 62 - 96
Application_cbd_apm32f1/applications/hmi.c

@@ -1361,7 +1361,7 @@ void thread1_signal_handler(int sig)
 
         LOG_I("[对焦] 最佳位置:%d (清晰度:%.2f)", g_best_pos, g_best_sharpness);
 
-        if(g_peak_counter>=3&&current_sharpness>g_best_sharpness-2.0f){
+        if(g_peak_counter>=3&&current_sharpness>g_best_sharpness-3.0f){
             focus_done = true;
         }else{
             focus_done = false;
@@ -1422,7 +1422,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 rt_thread_delay(1000);
             }
 
-            slide_para.en_slide =4;     //Z轴复位
+            slide_para.en_slide = 4;     //Z轴复位
             slide_para.pulse_period = mapSpeed(50);
             while(slide_para.en_slide!=0){
                 LOG_D("等待Z轴电机完成复位!");
@@ -1439,7 +1439,8 @@ static void Ctr_Mortor_entry(void* parameter)
             //X轴电机运行到胶带位置
             if(rt_pin_read(Limit_Motor_X)==1){
                 slide_para.xdir = 1;        //1位反向,0位正向;
-                slide_para.xdis = 1100;
+
+                slide_para.xdis = 1200;
                 slide_para.pulse_period = mapSpeed(50);
                 slide_para.en_slide = 1;
                 while(slide_para.en_slide!=0){
@@ -1459,7 +1460,8 @@ static void Ctr_Mortor_entry(void* parameter)
             }
             //Y轴电机运行到指定距离
             slide_para.ydir = 1;
-            slide_para.ydis = 3350;
+            //slide_para.ydis = 3350;
+            slide_para.ydis = 9000;
             slide_para.pulse_period = mapSpeed(50);
             slide_para.en_slide = 6;
             while(slide_para.en_slide!=0){
@@ -1624,6 +1626,8 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.tempture, "-15");
         rt_sprintf(device_status.humidity, "31");
         rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
+        device_status.x_init_dis = 500;
+        device_status.y_init_dis = 6000;
         ef_set_env_blob("iSave", &device_status.iSave, sizeof(device_status.iSave));  //
         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));
@@ -1657,6 +1661,8 @@ void Check_ParamConfig(void)
         ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));      //
         ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
         ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
+        ef_set_env_blob("x_init_dis", &device_status.x_init_dis, sizeof(device_status.x_init_dis));
+        ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
 
         LOG_I("SOFTWARE VERSION:%s",device_status.driver);
         LOG_I("Default paramconf is:");
@@ -1716,14 +1722,15 @@ void Check_ParamConfig(void)
         ef_get_env_blob("Power_Type",&device_status.Power_Type,sizeof(device_status.Power_Type),NULL);              //供电类型
         ef_get_env_blob("deviceId",&device_status.deviceId,sizeof(device_status.deviceId),NULL);                    //设备编码
         ef_get_env_blob("handle_bugger",&device_status.handle_bugger,sizeof(device_status.handle_bugger),NULL);     //排虫
-        device_status.light_over_tim = device_status.sunBar * 3600;                                                 //光控计数
+        ef_get_env_blob("x_init_dis",&device_status.x_init_dis,sizeof(device_status.x_init_dis),NULL);
+        ef_get_env_blob("y_init_dis",&device_status.y_init_dis,sizeof(device_status.y_init_dis),NULL);                                               //光控计数
         device_status.work_done = 0;
         //工作完成标志位
         if(device_status.dattim==0)
         {
             device_status.dattim = 10;
         }
-        /*设备类型,7孢子仪,3测报灯,默认设置测报灯*/
+        /*设备类型,7孢子仪*/
         device_status.dtype = 7;
         device_status.version_type = 7;
         if (device_status.version_type==7) {
@@ -1757,8 +1764,8 @@ void Check_ParamConfig(void)
         LOG_I("孢子仪运行状态:%d",device_status.run_sta);
         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.collecting_sh3,device_status.collecting_eh3);
         LOG_I("PowerType:%d",device_status.Power_Type);
-        LOG_I("deviceId:%s",device_status.deviceId);
-        LOG_I("handle_bugger:%d",device_status.handle_bugger);
+        LOG_I("x_init_dis:%d",device_status.x_init_dis);
+        LOG_I("y_init_dis:%d",device_status.y_init_dis);
     }
     //RTC时间判断,如果当前年份小于2020,提示需要设置时间,切换为光控
     if(device_status.update_flag==1)
@@ -1788,9 +1795,6 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
-            if(Read_Real_Voltage()/100>5&&device_status.power_status==0)
-                ctr_RTU_DTU(ON);
-
             char *readinfo =  makeJson_ReadInfo();
             DTU_Write("%s",readinfo);
             rt_free(readinfo);
@@ -1802,11 +1806,6 @@ void Check_ParamConfig(void)
             {
                 device_status.timeSwitch = 0;
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
-                #if 0
-                set_date(2020, 1, 1);
-                set_time(0, 0, 0);
-                #endif
-                break;
             }
         }
         connect_num = 0;
@@ -1843,40 +1842,7 @@ void ResetParamDefault(void)
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
 
     ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
-    if(device_status.dtype==3)
-    {
-        device_status.clt_time = 10;    //收集时间
-        #if LAMP_EN == 0
-        device_status.startBar = 20;    //定时开始时间
-        device_status.stopBar = 5;      //定时结束时间
-        #endif
-        device_status.heattime = 10;    //加热时间
-        device_status.shake_ws = 1;     //针对开关
-        device_status.shake_sec = 1;    //震动时间1-100ms
-        #if LAMP_EN == 1
-        device_status.sunBar = 3;       //光控定时时长
-        #else
-        device_status.sunBar = 8;
-        #endif
-        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));    //震动时间
-        device_status.handle_bugger = 0;
-        ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
-    }
-    else if(device_status.dtype==7)
+    if(device_status.dtype==7)
     {
         device_status.run_sta = 0;
         device_status.heatvalue = 25;    //培养温度
@@ -1961,52 +1927,52 @@ void app_partion_backup(void)
             }
             else
             {
-                            rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
-                            if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
-                            {
-                                int clone_pos = 0;
-                                int clone_len = 0, clone_tol_len;
-                                rt_uint8_t *buf = rt_malloc(4096);
-
-                                if (dst_part->len < src_part->len)
-                                    clone_tol_len = dst_part->len;
-                                else
-                                    clone_tol_len = src_part->len;
-
-                                while ((clone_pos < clone_tol_len) && (buf != RT_NULL))
-                                {
-                                    clone_len = fal_partition_read(src_part, clone_pos, buf, 4096);
-                                    if (clone_len < 0)
-                                    {
-                                        rt_kprintf("\nread %s partition failed, clone stop!\n", src_part_name);
-                                        break;
-                                    }
-
-                                    if (fal_partition_write(dst_part, clone_pos, buf, clone_len) < 0)
-                                    {
-                                        rt_kprintf("\nwrite %s partition failed, clone stop!\n", dst_part_name);
-                                        break;
-                                    }
-
-                                    HMI_WRITE("#");
-                                    rt_kprintf("#");
-                                    clone_pos += clone_len;
-                                }
-
-                                if (clone_pos >= clone_tol_len)
-                                {
-
-                                    rt_kprintf("\nClone partition success, total %d bytes!\n", clone_tol_len);
-
-                                }
-                                else
-                                {
-                                    rt_kprintf("Clone partition failed!");
-
-                                }
-                                if (buf)
-                                    rt_free(buf);
-                            }
+                rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
+                if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
+                {
+                    int clone_pos = 0;
+                    int clone_len = 0, clone_tol_len;
+                    rt_uint8_t *buf = rt_malloc(4096);
+
+                    if (dst_part->len < src_part->len)
+                        clone_tol_len = dst_part->len;
+                    else
+                        clone_tol_len = src_part->len;
+
+                    while ((clone_pos < clone_tol_len) && (buf != RT_NULL))
+                    {
+                        clone_len = fal_partition_read(src_part, clone_pos, buf, 4096);
+                        if (clone_len < 0)
+                        {
+                            rt_kprintf("\nread %s partition failed, clone stop!\n", src_part_name);
+                            break;
+                        }
+
+                        if (fal_partition_write(dst_part, clone_pos, buf, clone_len) < 0)
+                        {
+                            rt_kprintf("\nwrite %s partition failed, clone stop!\n", dst_part_name);
+                            break;
+                        }
+
+                        HMI_WRITE("#");
+                        rt_kprintf("#");
+                        clone_pos += clone_len;
+                    }
+
+                    if (clone_pos >= clone_tol_len)
+                    {
+
+                        rt_kprintf("\nClone partition success, total %d bytes!\n", clone_tol_len);
+
+                    }
+                    else
+                    {
+                        rt_kprintf("Clone partition failed!");
+
+                    }
+                    if (buf)
+                        rt_free(buf);
+                }
             }
 }
 void Debug_log_ON(void)

+ 3 - 1
Application_cbd_apm32f1/packages/EasyFlash-v4.1.0/src/ef_fal_port.c

@@ -89,7 +89,9 @@ static const ef_env default_env_set[] = {
         {"collecting_eh3","0"},    //
         {"Power_Type","0"},        //供电类型
         {"deviceId","0"},          //BDH设备编码
-        {"handle_bugger","0"}      //虫子处理,收虫,排虫
+        {"handle_bugger","0"},      //虫子处理,收虫,排虫
+        {"x_init_dis","0"},
+        {"y_init_dis","0"}
 };
 static char log_buf[RT_CONSOLEBUF_SIZE];
 static struct rt_semaphore env_cache_lock;