zhunk 1 year atrás
parent
commit
a0df6661d6

+ 0 - 14
Application_cbd_apm32f1/applications/control.c

@@ -2387,13 +2387,11 @@ static void Control_Check_thread_entry(void *parameter)
     static int current_second = 0;
     static int process = 0;
 
-    static int route_off_t = 0;
     #if MATCH_DEVICE == 1
     rt_pin_mode(LED_P, PIN_MODE_OUTPUT);
     rt_pin_write(LED_P,ON);
     #endif
     device_status.C01 = 0;
-    device_status.route_off_t = 0;
     rt_thread_delay(10000);
 
     while(1)
@@ -2427,18 +2425,6 @@ static void Control_Check_thread_entry(void *parameter)
             }else {
                 process = 0;
                 current_second = 0;
-                if(device_status.route_off_t!=0)
-                {
-                    ctr_router(OFF);
-                    route_off_t = device_status.route_off_t * 60 + 1;
-                    while(route_off_t!=0)
-                    {
-                        route_off_t--;
-                        rt_thread_delay(1000);
-                    }
-                    ctr_router(ON);
-                    device_status.route_off_t = 0;
-                }
 #if 0
                 if(device_status.rain_status==0)
                 {

+ 2 - 2
Application_cbd_apm32f1/applications/control.h

@@ -17,8 +17,8 @@
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     1             //比赛设备
+#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
+#define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 

+ 9 - 3
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -367,7 +367,7 @@ static void dtu_thread_entry_send(void *parameter)
         static struct tm now_tm;   //现在
         //获取当前时间戳
         now_tm =*localtime(&now_t);
-        if(atoi(device_status.net)==0||atoi(device_status.gps)==1||(now_tm.tm_year+1900 >=2025))    //当前时间大于2024
+        if(atoi(device_status.net)==0 || (now_tm.tm_year+1900 >=2025))    //当前时间大于2024
         {
             if(device_status.rain_status==1||device_status.temp_status==1)
             {
@@ -522,14 +522,20 @@ int dtu_data_play(void)
             DTU_THREAD_PRIORITY,
             DTU_THREAD_TIMESLICE);
     /* 如果获得线程控制块,启动这个线程 */
-    if(dtu_send_data!=RT_NULL)
-        rt_thread_startup(dtu_send_data);
+//    if(dtu_send_data!=RT_NULL)
+//        rt_thread_startup(dtu_send_data);
     /* 如果获得线程控制块,启动这个线程 */
     if (dtu_recv_data != RT_NULL)
         rt_thread_startup(dtu_recv_data);
     return RT_EOK;
 }
 
+void dtu_send_data_start(void)
+{
+    if(dtu_send_data!=RT_NULL)
+        rt_thread_startup(dtu_send_data);
+}
+
 
 void get_iso8601_utc_time(char *buffer, size_t buffer_size,uint8_t time_h) {
     time_t now_seconds;

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -50,7 +50,7 @@ typedef struct {
 }WS_CBDV5;
 
 
-
+void dtu_send_data_start(void);
 
 //查询数据---{"cmd": "read"}
 //重启-------{"cmd": "reboot"}

+ 31 - 6
Application_cbd_apm32f1/applications/hmi.c

@@ -1366,6 +1366,8 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_int16_t photo_led_sec = 900;  //55S
    rt_uint8_t num_tg_open = 200;    //20S
    rt_uint8_t num_tg_init = 200;
+   static rt_uint16_t route_off_t = 0;
+   device_status.route_off_t = 0;
    //int current_t[200];
    /*孢子仪拍照数量*/
    rt_uint16_t photo_setup = 0;
@@ -1779,6 +1781,21 @@ static void Ctr_Mortor_entry(void* parameter)
            selfcheck(0);
         }
 
+        if(device_status.route_off_t!=0)
+        {
+            ctr_router(OFF);
+            route_off_t = device_status.route_off_t * 60 * 10;
+            device_status.route_off_t = 0;
+        }
+        if(route_off_t>0)
+        {
+            route_off_t--;
+            if(route_off_t==1)
+            {
+                ctr_router(ON);
+                route_off_t = 0;
+            }
+        }
         rt_thread_delay(100);
     }
 }
@@ -1879,7 +1896,7 @@ void Check_ParamConfig(void)
         device_status.collecting_sh2 = 14;
         device_status.collecting_eh2 = 16;
         device_status.cold_sw = 0;
-        device_status.heat_sw =0;
+        device_status.heat_sw = 0;
         device_status.cul_time = 1;
         device_status.run_sta = 0;
         device_status.handle_bugger = 0;    //默认排虫
@@ -2040,6 +2057,7 @@ void Check_ParamConfig(void)
         LOG_I("定时结束时间:%d",device_status.stopBar);
         LOG_I("timeSwitch:%d",device_status.timeSwitch);
         LOG_I("光控定时时长:%d",device_status.sunBar);
+        LOG_I("加热开关:%d",device_status.heat_sw);
         LOG_I("加热时间:%d",device_status.heattime);
         LOG_I("加热温度:%d",device_status.heatvalue);
         LOG_I("震动开关:%d",device_status.shake_ws);
@@ -2096,9 +2114,9 @@ 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);
+                ctr_RTU_DTU(ON);
             if(device_status.dtype==7)
-            HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
+                HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();
             DTU_Write("%s",readinfo);
             rt_free(readinfo);
@@ -2106,8 +2124,8 @@ void Check_ParamConfig(void)
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为3分钟
-            #ifdef MATCH_DEVICE == 1
-            if(connect_num==30) //180
+            #if MATCH_DEVICE == 1
+            if(connect_num==60) //180
             {
                 device_status.timeSwitch = 1;
                 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);
@@ -2140,10 +2158,12 @@ void Check_ParamConfig(void)
             connect_num++;
             if(connect_num>5) break;
         }
-        if(device_status.version_type==6) device_status.timeSwitch = 1;
+
+        if(device_status.version_type==6) device_status.timeSwitch = 1; //吸虫塔,只有时控
 
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
+        dtu_send_data_start();
         if(device_status.dtype!=7&&device_status.version_type!=30)
         {
             Workstatus_check();
@@ -2177,6 +2197,7 @@ void ResetParamDefault(void)
     device_status.collecting_sh2 = 14;
     device_status.collecting_eh2 = 16;
     device_status.Power_Type = 0;
+
     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));        //上传时间
@@ -2199,6 +2220,8 @@ void ResetParamDefault(void)
         device_status.tpl = -5;          //低温保护阈值
         device_status.timeSwitch = 0;   //定时模式:光控
         device_status.heatvalue=100;    //加热温度
+        device_status.heat_sw = 1;
+        ef_set_env_blob("heat_sw", &device_status.heat_sw, sizeof(device_status.heat_sw));
         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));
@@ -2259,6 +2282,7 @@ void ResetParamDefault_DC(void)
     device_status.timeSwitch = 0;
     device_status.Power_Type = 1;
     device_status.handle_bugger = 0;
+    device_status.heat_sw = 0;
     ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
     ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
@@ -2276,6 +2300,7 @@ void ResetParamDefault_DC(void)
     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));
+    ef_set_env_blob("heat_sw", &device_status.heat_sw,sizeof(device_status.heat_sw));
     DTU_Write("reset.mp3");
     rt_thread_delay(1000);
 }

+ 3 - 1
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -202,7 +202,7 @@ static void Power_ReadCheck(void *parameter)
         rt_uint16_t _24v_current_int = moving_average_filter_update(filter,Read_Real_Current());
         if(_24v_current_int-2430>0)
         {
-            sprintf(device_status.power,"%.2f",(float)(_24v_current_int-2430)/0.4);
+            sprintf(device_status.power,"%.2f",(float)(_24v_current_int-2400)/0.4);
         }else {
             sprintf(device_status.power,"0.0");
         }
@@ -247,7 +247,9 @@ static void Power_ReadCheck(void *parameter)
             bat_cnt = 0;
             device_status.C01 &= ~(1<<4);
             device_status.bat_status = 0; //解除欠压
+        #if MATCH_DEVICE == 0
             ctr_router(ON);               //打开路由器供电
+        #endif
             ctr_photo(ON);                //打开相机供电
         #if ROBOT_EN == 1
             ctr_led(ON);        //打开补光灯

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

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

+ 13 - 4
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -11,6 +11,7 @@
 #include <rtdevice.h>
 #include <rthw.h>
 #include <syswatch.h>
+#include "control.h"
 
 #ifdef SYSWATCH_USING
 
@@ -398,14 +399,22 @@ static void syswatch_thread_entry(void *parameter)
             rt_hw_cpu_reset();
             #endif
         }
-        if((alarm_new.tm_hour)==23&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        if(((alarm_new.tm_hour)==22 ||
+                (alarm_new.tm_hour)==0 ||
+                (alarm_new.tm_hour)==1 ||
+                (alarm_new.tm_hour)==2 ||
+                (alarm_new.tm_hour)==3 ||
+                (alarm_new.tm_hour)==4||
+                (alarm_new.tm_hour)==5||
+                (alarm_new.tm_hour)==6||
+                (alarm_new.tm_hour)==7)&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
         {
-            ctr_router(1);
+            ctr_router(ON);
         }
 
-        if((alarm_new.tm_hour)==6&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
         {
-            ctr_router(0);
+            ctr_router(OFF);
         }
         #endif
         rt_thread_delay(RT_TICK_PER_SECOND);