yf_zjb 5 лет назад
Родитель
Сommit
02504b9535

BIN
Application_CBD/.settings/.rtmenus


+ 43 - 0
Application_CBD/applications/beep.c

@@ -10,7 +10,12 @@
 #include <rtdevice.h>  //使用 RT-Thread 的设备需要包含此头文件
 #include <beep.h>
 #include <control.h>
+#include "hmi.h"
+
+Device_Status_typedef device_status;
+
 struct rt_device_pwm    *pwm_device = RT_NULL; //定义 pwm 设备指针
+struct rt_device_pwm    *pwm_tim8 = RT_NULL; //定义 pwm 设备指针
 /*初始化蜂鸣器*/
 int beep_init(void)
 {
@@ -23,6 +28,16 @@ int beep_init(void)
     }
     return 0;
 }
+int pwm8_init(void)
+{
+    pwm_tim8 = (struct rt_device_pwm *)rt_device_find("pwm8");
+    if(pwm_tim8==RT_NULL)
+    {
+        rt_kprintf("pwm device pwm8 not found!\n");
+        return -RT_ERROR;
+    }
+    return 0;
+}
 /*打开蜂鸣器*/
 int beep_on(void)
 {
@@ -63,6 +78,34 @@ void Beep_Tip(uint16_t volnum)
     rt_thread_mdelay(volnum);
     rt_pin_write(Beep, 0);
 }
+void Motor_Juandai(uint8_t on_off)
+{
+    pwm8_init();
+    rt_pwm_set(pwm_tim8, PC7_TIM3_CH, 200000, 100000);//channel,period,pulse
+    if(on_off==ON){
+        rt_pwm_enable(pwm_tim8, PC7_TIM3_CH);
+    }
+    else {
+        rt_pwm_disable(pwm_tim8, PC7_TIM3_CH);
+    }
+}
+
+void Motor_shake(uint8_t status_shake,uint16_t shake_sec)
+{
+    beep_init();
+    rt_pwm_set(pwm_device, PB1_TIM3_CH, 200000, 100000);//channel,period,pulse
+    if(status_shake==ON&&device_status.shake_ws==1)
+    {
+        rt_pwm_enable(pwm_device, PB1_TIM3_CH);
+        rt_thread_delay(shake_sec*1000);
+        rt_pwm_disable(pwm_device, PB1_TIM3_CH);
+        HMI_WRITE("cangWei.switchShake.val=%d",0);
+    }
+    else {
+        rt_pwm_disable(pwm_device, PB1_TIM3_CH);
+        HMI_WRITE("cangWei.switchShake.val=%d",0);
+    }
+}
 
 
 

+ 5 - 1
Application_CBD/applications/beep.h

@@ -12,11 +12,15 @@
 
 #include <rtthread.h>
 #define BEEP_PWM_DEVICE "pwm3"
+#define RAIN_PWM_DEVICE "pwm8"
 #define BEEP_PWM_CH 1
-
 int beep_init(void);                            //蜂鸣器初始化
 int beep_on(void);                              //蜂鸣器开
 int beep_off(void);                             //蜂鸣器关
 void beep_set(uint32_t freq, uint32_t volume);    //蜂鸣器设定
 void Beep_Tip(uint16_t volnum);
+/**************************吸虫塔****************************/
+void Motor_Juandai(uint8_t on_off);
+void Motor_shake(uint8_t status_shake,uint16_t shake_sec);
+/***********************************************************/
 #endif                                          /* APPLICATIONS_INC_BEEP_H_ */

+ 159 - 53
Application_CBD/applications/control.c

@@ -31,6 +31,74 @@ Device_Status_typedef device_status;
 
 rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
+
+/*************************吸虫塔*********************************/
+//清扫-卷带电机
+void ctr_JD_Clear()
+{
+    rt_uint16_t turn_timeout = 0;
+    rt_pin_mode(MOTOR_C_LIMIT,PIN_MODE_INPUT);
+    while(rt_pin_read(MOTOR_C_LIMIT)==0)
+       {
+
+           rt_thread_delay(20);
+           while(rt_pin_read(MOTOR_C_LIMIT)==0)
+           {
+               Motor_Juandai(ON);
+               rt_thread_delay(50);
+               turn_timeout++;
+               if(turn_timeout==1000) break;
+           }
+           break;
+       }
+       while(rt_pin_read(MOTOR_C_LIMIT)==1)
+       {
+           rt_thread_delay(20);
+           while(rt_pin_read(MOTOR_C_LIMIT)==1)
+           {
+               rt_thread_delay(50);
+               Motor_Juandai(ON);
+               turn_timeout++;
+               if(turn_timeout==1000) break;
+           }
+           break;
+       }
+       while(rt_pin_read(MOTOR_C_LIMIT)==0)
+       {
+
+           rt_thread_delay(20);
+           if(rt_pin_read(MOTOR_C_LIMIT)==0)
+           {
+               Motor_Juandai(OFF);
+               break;
+           }
+           else {
+               break;
+           }
+       }
+    Motor_Juandai(OFF);
+}
+//工作任务流程
+void WorkTask_XCT(void)
+{
+    uint32_t photo_fre = 0;
+    photo_fre = device_status.dattim * 60;
+    //ctr_Motor_xichong(ON);
+    //ctr_Motor_xifu(ON);
+    while(photo_fre!=0)
+    {
+        photo_fre --;
+        rt_thread_delay(1000);
+        rt_kprintf("收集中,等待开始拍照:%d\n",photo_fre);
+    }
+    //卷带
+    ctr_JD_Clear();
+    //震动
+    Motor_shake(ON, device_status.shake_sec);
+    //拍照
+    HK_TakePhoto();
+}
+/**********************************************************************/
 /*光控*/
 uint8_t In_Light_status(void)
 {
@@ -135,6 +203,7 @@ uint8_t ctr_lamp(uint8_t status_lamp)
     }
     return device_status.lamp_status;
 }
+
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
@@ -351,12 +420,15 @@ uint8_t ctr_clear(uint16_t status_clear)
     }
     while(rt_pin_read(CLEAR_L_LIMIT)==1&&rt_pin_read(CLEAR_R_LIMIT)==1)
     {
-        rt_kprintf("Clear Motor Limit Not Access:%d",atoi(device_status.power));
-        char * Clear_ERR = makeJson_Warn("Clear Motor Limit Not Access","device");
-        DTU_Write("%s",Clear_ERR);
-        rt_free(Clear_ERR);
         rt_pin_write(CLEAR_R,ON);
         rt_pin_write(CLEAR_L,ON);
+        if(device_status.version_type==41)
+        {
+            rt_kprintf("Clear Motor Limit Not Access:%d",atoi(device_status.power));
+            char * Clear_ERR = makeJson_Warn("Clear Motor Limit Not Access","device");
+            DTU_Write("%s",Clear_ERR);
+            rt_free(Clear_ERR);
+        }
         return 0;
     }
     clear_num = 0;
@@ -453,11 +525,13 @@ void Hk_Take_io(void)
 }
 void calorstat(uint16_t heat_time)
 {
+    uint8_t heat_up_cnt = 0;
     uint16_t n = 0;
     uint16_t delay_heat = 60;
     FlagStatus heat_flg = RESET;
-    device_status.heattime = 0;
+    device_status.heat_time_min = 0;
     ctr_Heat(ON);
+    UpLoad_Data();      //开始加热时的第一条数据
     //恒温模式
     for(n=0;n < heat_time;n++)
     {
@@ -477,15 +551,25 @@ void calorstat(uint16_t heat_time)
         }
         if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         {
+            heat_up_cnt = 0;
             ctr_Heat(ON);
         }
         else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         {
+            if(heat_up_cnt==0)
+            {
+                UpLoad_Data();      //加热到设定温度的数据
+                heat_up_cnt = 1;
+            }
             ctr_Heat(OFF);
         }
         if((n % 60)==0)
         {
-            device_status.heattime = device_status.heattime + 1;
+            device_status.heat_time_min = device_status.heat_time_min + 1;
+            if(device_status.heat_time_min % 2 == 0)
+            {
+                UpLoad_Data();      //从加热开始每两分钟上传的数据
+            }
         }
         //如果触发异常退出加热
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
@@ -499,6 +583,7 @@ void calorstat(uint16_t heat_time)
         rt_kprintf("=======正在加热======:%d-%d\n",n,heat_time);
     }
     ctr_Heat(OFF);
+    UpLoad_Data();      //加热结束的数据
 }
 //初始化所有控制驱动,关闭
 void HardWare_Init(uint8_t boot)
@@ -612,54 +697,68 @@ void SunTest(void)
 /*上电初始化*/
 void ResetInit(void)
 {
-    device_status.work_done = 1;
-    //1.打开路由器供电
-    ctr_router(ON);
-    ctr_RTU_DTU(ON);
-    //2.打开相机供电
-    ctr_photo(ON);
-    //3.关闭镇流器
-    ctr_lamp(OFF);
-    //4.关闭震动电机
-    ctr_shake(OFF, 0);
-    //5.关闭加热
-    ctr_Heat(OFF);
-    //6.关闭补光灯
-    ctr_led(OFF);
-    if(device_status.bat_status==1||atoi(device_status.fuse_voltage)<1)
-    {
-        rt_kprintf("欠压!!!\n");
-        return;
-    }
-    //7.关闭上仓门
-    device_status.ctr_up_motor = 2;
-    while(device_status.ctr_up_motor!=0)
-    {
-        rt_kprintf("关闭上仓门...\n");
-        rt_thread_delay(100);
-    }
-    //8.关闭下仓门
-    device_status.ctr_down_motor = 2;
-    while(device_status.ctr_down_motor!=0)
+    if(device_status.version_type!=6)
     {
-        rt_kprintf("关闭下仓门....\n");
-        rt_thread_delay(100);
-    }
-    //9.清扫
-    if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
-    {
-        rt_kprintf("异常退出!!!\n");
-        return;
-    }
-    if(device_status.version_type==4)
-    {
-        if(ctr_clear(650)==0)
-        ctr_TG_Clear(350);
+        device_status.work_done = 1;
+           //1.打开路由器供电
+           ctr_router(ON);
+           ctr_RTU_DTU(ON);
+           //2.打开相机供电
+           ctr_photo(ON);
+           //3.关闭镇流器
+           ctr_lamp(OFF);
+           //4.关闭震动电机
+           ctr_shake(OFF, 0);
+           //5.关闭加热
+           ctr_Heat(OFF);
+           //6.关闭补光灯
+           ctr_led(OFF);
+           if(device_status.bat_status==1||atoi(device_status.fuse_voltage)<1)
+           {
+               rt_kprintf("欠压!!!\n");
+               return;
+           }
+           //7.关闭上仓门
+           device_status.ctr_up_motor = 2;
+           while(device_status.ctr_up_motor!=0)
+           {
+               rt_kprintf("关闭上仓门...\n");
+               rt_thread_delay(100);
+           }
+           //8.关闭下仓门
+           device_status.ctr_down_motor = 2;
+           while(device_status.ctr_down_motor!=0)
+           {
+               rt_kprintf("关闭下仓门....\n");
+               rt_thread_delay(100);
+           }
+           //9.清扫
+           if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
+           {
+               rt_kprintf("异常退出!!!\n");
+               return;
+           }
+           if(device_status.version_type==4||device_status.version_type==41)
+           {
+               if(ctr_clear(650)==0)
+               ctr_TG_Clear(350);
+           }
+           else if (device_status.version_type==1) {
+               turnzp();
+           }
+           rt_thread_delay(1000);
     }
-    else if (device_status.version_type==1) {
-        turnzp();
+    else {
+        //1.打开路由器供电
+        ctr_router(ON);
+        ctr_RTU_DTU(ON);
+        //2.打开相机供电
+        ctr_photo(ON);
+        //5.关闭加热
+        ctr_Heat(OFF);
+        //6.关闭补光灯
+        ctr_led(OFF);
     }
-    rt_thread_delay(1000);
 }
 //出厂前自检 0-开机自检  1-屏幕或指令下发手动自检
 void HardWare_Check(uint8_t boot)
@@ -829,8 +928,9 @@ void WorkCheck(void)
     device_status.work_status = 0;
     rt_thread_delay(1000);
 }
+
 //工作任务流程s
-void WorkTast(void)
+void WorkTask(void)
 {
     ctr_router(ON); //打开路由器供电
     static int clt_time = 0; //收集时间差秒数
@@ -962,7 +1062,13 @@ static void Work_Loop_thread_entry(void *parameter)
     ResetInit();
     while(1)
     {
-        WorkTast();
+        if(device_status.version_type!=6)
+        {
+            WorkTask();
+        }
+        else {
+            WorkTask_XCT();
+        }
         rt_thread_delay(1000);
     }
 }

+ 45 - 32
Application_CBD/applications/control.h

@@ -14,14 +14,13 @@
 
 #include <rtdevice.h>
 
-#define VERSION_HK "1.25.41(HK)"         //版本
-#define VERSION_ZP "1.25.1(ZP)"         //版本
+#define VERSION_HK          "1.27.41(HK)"           //4.0海康
+#define VERSION_HK_2000W    "1.27.4(2000W)"         //4.0水稻
+#define VERSION_ZP          "1.27.1(ZP)"            //1.0转盘
+#define VERSION_GK          "1.27.1(GK)"            //1.0高空
+#define VERSION_XCT         "1.27.6(HK)"            //吸虫塔-海康
+#define CompileTime         "20210924"
 
-#define CompileTime "20210728"
-
-
-/*******************************测试任务****************************************/
-/*********************************************************************/
 /*********************************************************************/
 typedef struct{
     uint8_t iSave;          //存储标志位
@@ -35,7 +34,7 @@ typedef struct{
     uint8_t down_status;    //下仓门状态 0-停止 1-打开 2-关闭
     uint8_t clear_status;   //清扫状态   0-停止 1-开始
     uint8_t shake_ws;       //震动       0-关   1-开
-    uint8_t heatvalue;
+    uint8_t heatvalue;      //
     uint8_t ctr_up_motor;   //上仓门,    1打开,0关闭
     uint8_t ctr_down_motor; //下仓门,    1打开,0关闭
     uint8_t rain_status;    //雨控              0-正常 1-欠压
@@ -46,6 +45,7 @@ typedef struct{
     uint8_t work_done;      //工作结束   1-正常 0-工作已结束
     uint8_t bat_status;     //电压状态   1-正常 0-欠压
     uint8_t heattime;       //加热时间
+    uint8_t heat_time_min;  //实时加热时间
     uint8_t clt_time;       //收集时间
     uint8_t vol;            //音量
     uint16_t thsp;          //息屏时间
@@ -55,7 +55,7 @@ typedef struct{
     uint8_t startBar;       //时控开始时间
     uint8_t stopBar;        //时控结束时间
     uint8_t tph;            //高温保护
-    int8_t tpl;            //低温保护
+    int8_t tpl;             //低温保护
     uint8_t shake_sec;      //震动时间
     uint8_t timeSwitch;     //模式0光控,1时控
     uint8_t dattim;         //数据上传间隔
@@ -63,39 +63,38 @@ typedef struct{
     uint8_t hmi_fresh;      //是否启动屏幕
     uint8_t update_flag;    //是否启动升级
     uint8_t photo_type;     //相机类型,0-USB,1-海康,2-大华
-    uint8_t version_type;   //版本类型,1-转盘,4-海康
+    uint8_t version_type;   //版本类型,1-转盘,4-海康,42-水稻,11-高空
     uint8_t stop_in_bootloader;     //进入bootloader模式 1
     uint8_t account_status;         //卡状态
-    rt_uint32_t num_updata;            //
+    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;        //到期时间
-    int passWord;           //初始密码
-    char csq[3];            //信号强度
-    char net[3];            //网络
-    char sim[3];            //SIM卡
-    char gps[3];            //定位类型
-    char tempture[12];      //温度
-    char humidity[12];      //湿度
+    int passWord;              //初始密码
+    char csq[3];               //信号强度
+    char net[3];               //网络
+    char sim[3];               //SIM卡
+    char gps[3];               //定位类型
+    char tempture[12];         //温度
+    char humidity[12];         //湿度
     char driver[32];           //版本
     char driver_4g[32];        //4g版本
     char driver_bl[32];        //BL版本
     char driver_compile[32];   //BL编译时间
-    char mqttcfg1[32];
-    char mqttcfg2[128];
+    char mqttcfg1[32];         //
+    char mqttcfg2[128];        //
     char project[32];          //project,用于判断升级
-    char lng[32];           //经度
-    char lat[32];           //纬度
-    char stamp[32];         //系统时间
-    char fuse_voltage[32];  //保险丝电压
+    char lng[32];              //经度
+    char lat[32];              //纬度
+    char stamp[32];            //系统时间
+    char fuse_voltage[32];     //保险丝电压
     char iccid[32];            //SIM卡ICCID
-    char imei[32];          //IMEI,唯一ID
-    char  *power;          //功率
-    char *voltage;     //电池电压
-
+    char imei[32];             //IMEI,唯一ID
+    char *power;              //功率
+    char *voltage;             //电池电压
 }Device_Status_typedef;
-/**************************************/
+/************************************************/
 #define ON 1
 #define OFF 0
 #define LED0_PIN    GET_PIN(B, 3)
@@ -151,6 +150,20 @@ typedef struct{
 
 #define CTR_RO_LIMIT GET_PIN(B,15)
 #define CTR_RC_LIMIT GET_PIN(C,6)
+/******************************吸虫塔*********************************/
+#define PC7_TIM3_CH 2
+#define PC8_TIM3_CH 3
+#define PB1_TIM3_CH  4
+
+#define MOTOR1_CTR_PIN GET_PIN(C,9)        //吸虫电机IO
+#define MOTOR2_CTR_PIN GET_PIN(B,2)        //吸附电机IO
+
+#define MOTOR_CR_PIN GET_PIN(C,7)
+#define MOTOR_CL_PIN GET_PIN(C,8)
+
+#define MOTOR_C_LIMIT GET_PIN(C,13)       //卷带限位
+
+/***************************************************************/
 /***************************************************************/
 uint8_t ctr_Heat(uint8_t status_heat);          //加热
 uint8_t ctr_cangmen_up(uint8_t status_up);      //上仓门
@@ -163,7 +176,7 @@ uint8_t ctr_led(uint8_t status_led);            //补光灯
 void calorstat(uint16_t heat_time);             //恒温
 void ctr_router(uint8_t status_router);         //路由器
 void turnzp(void);                              //转仓
-void Hk_Take_io(void);
+void Hk_Take_io(void);                          //触发拍照
 void HK_TakePhoto(void);                        //拍照
 void ctr_photo(uint8_t status_photo);
 void ctr_RTU_DTU(uint8_t status_rtu);
@@ -173,10 +186,10 @@ void HardWare_Check(uint8_t boot);              //自检
 void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 /*****************************************************/
-
+void WorkTask_XCT(void);
 /****************************************************/
 void WorkCheck(void);               //工作检测
-void WorkTast(void);                //工作任务
+void WorkTask(void);                //工作任务
 //线程
 int Workstatus_check(void);
 int Work_Loop_Task(void);

+ 128 - 93
Application_CBD/applications/dtu_uart2.c

@@ -207,7 +207,6 @@ static void dtu_thread_entry_send(void *parameter)
                     if(device_status.dattim==0) device_status.dattim=20;   //数据上传时间间隔设置为0?
                     if(device_status.bat_status==0) device_status.power_status = 1;     //解除欠压,清除标志位
                 }
-
         }
     else {
         rt_kprintf("wait connect internet......\n");
@@ -396,8 +395,17 @@ char * makeJson()
         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==6) {
+        rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
+    }
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
@@ -405,98 +413,125 @@ char * makeJson()
     device_status.dtype=3;
     rt_sprintf(utos, "%d",device_status.dtype);
     cJSON_AddStringToObject(pSubJson,"dtype",utos);
-    //光控定时
-    rt_sprintf(utos, "%d",device_status.sunBar);
-    cJSON_AddStringToObject(pSubJson,"tt",utos);
-    //震动开关
-    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);
+    //类型细分
+    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)
+    {
+        //光控定时
+        rt_sprintf(utos, "%d",device_status.sunBar);
+        cJSON_AddStringToObject(pSubJson,"tt",utos);
+        //工作状态
+        rt_sprintf(utos, "%d",device_status.work_status);
+        cJSON_AddStringToObject(pSubJson,"ws",utos);
+        //定时模式
+        rt_sprintf(utos, "%d",device_status.timeSwitch);
+        cJSON_AddStringToObject(pSubJson,"ts",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);
+        //温控
+        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_status);
+        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);
+        //加热仓温度
+        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);
+    }
+        //震动开关
+        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,"gps",device_status.gps);              //定位状态
+        //开关状态
+        rt_sprintf(utos, "%d",device_status.ds);
+        cJSON_AddStringToObject(pSubJson,"ds",utos);
+        //湿度
+        cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
+        //温度
+        cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
+        cJSON_AddStringToObject(pSubJson,"imei",device_status.imei);            //IMEI
+        cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid);          //ICCID
+        cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp);          //时间
+        //经度
+        cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
+        //纬度
+        cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
+        //是否为上电开机
+        cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
+        //电流(当前)
+        cJSON_AddStringToObject(pSubJson,"current",device_status.power);
+        //电压
+        cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
+        //保险丝电压
+        cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
+        //数据上传间隔
+        rt_sprintf(utos, "%d",device_status.dattim);
+        cJSON_AddStringToObject(pSubJson,"dat_f",utos);
+
+        //信号强度
+        cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
+
 
-    cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
-    //工作状态
-    rt_sprintf(utos, "%d",device_status.work_status);
-    cJSON_AddStringToObject(pSubJson,"ws",utos);
-    //工作状态
-    rt_sprintf(utos, "%d",device_status.ds);
-    cJSON_AddStringToObject(pSubJson,"ds",utos);
-    //定时模式
-    rt_sprintf(utos, "%d",device_status.timeSwitch);
-    cJSON_AddStringToObject(pSubJson,"ts",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);
-    //湿度
-    cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
-    //温度
-    cJSON_AddStringToObject(pSubJson,"at",device_status.tempture);
-    //温控
-    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_status);
-    cJSON_AddStringToObject(pSubJson,"lamp",utos);
-    cJSON_AddStringToObject(pSubJson,"stamp",device_status.stamp);          //时间
-    cJSON_AddStringToObject(pSubJson,"imei",device_status.imei);            //IMEI
-    cJSON_AddStringToObject(pSubJson,"iccid",device_status.iccid);          //ICCID
-    //上仓门状态 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);
-    //经度
-    cJSON_AddStringToObject(pSubJson,"lng",device_status.lng);
-    //纬度
-    cJSON_AddStringToObject(pSubJson,"lat",device_status.lat);
-    //加热仓温度
-    rt_sprintf(utos, "%d",device_status.heattem);
-    cJSON_AddStringToObject(pSubJson,"hrt",utos);
-    //是否为上电开机
-    cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
-    //电流(当前)
-    cJSON_AddStringToObject(pSubJson,"current",device_status.power);
-    //电压
-    cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
-    //保险丝电压
-    cJSON_AddStringToObject(pSubJson,"fuse_voltage",device_status.fuse_voltage);
-    //数据上传间隔
-    rt_sprintf(utos, "%d",device_status.dattim);
-    cJSON_AddStringToObject(pSubJson,"dat_f",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);
-    //信号强度
-    cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
-    //高温保护
-    rt_sprintf(utos, "%d",device_status.tph);
-    cJSON_AddStringToObject(pSubJson,"tph",utos);
-    //低温保护
-    rt_sprintf(utos, "%d",device_status.tpl);
-    cJSON_AddStringToObject(pSubJson,"tpl",utos);
     char * p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {
@@ -964,7 +999,7 @@ void parseDtu(char *json_string)
                           }
                           if(vt!=NULL)
                           {
-                              if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=10)
+                              if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=100)
                               {
                                   device_status.version_type = atoi(vt->valuestring);
                                   ef_set_env_blob("version_type", &device_status.version_type, sizeof(device_status.version_type));

+ 156 - 26
Application_CBD/applications/hmi.c

@@ -222,7 +222,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
         //
         HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
-        //更新加热温度
+        //更新加热时间和温度
         HMI_WRITE("workSta.heatTem.val=%d",device_status.heattem);
         HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
         //更新加热状态
@@ -267,6 +267,21 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             HMI_WRITE("menu.net.val=1");
             HMI_WRITE("workSta.net.val=2");
         }
+        /**********************************吸虫塔*********************************/
+        //更新电压
+        HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
+        //更新震动时间
+        HMI_WRITE("menu.shake_sec.txt=\"%s\"",device_status.shake_sec);
+        //更新电流
+         HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
+        //更新温湿度数据
+        HMI_WRITE("menu.envHum.val=%d",atoi(device_status.humidity));
+        HMI_WRITE("menu.envTem.val=%d",atoi(device_status.tempture));
+        //SIM卡状态
+        HMI_WRITE("menu.bt0.val=%d",atoi(device_status.sim));
+        //数据上传间隔
+        HMI_WRITE("menu.datt.val=%d",device_status.dattim);
+        /**********************************************************************/
     }
     else if (strstr(rx_buffer,"getClockData")!=NULL) {
         //更新定时模式
@@ -289,7 +304,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
-        if(device_status.version_type==4)
+        if(device_status.version_type==4||device_status.version_type==41)
         {
             device_status.clear_status=1;
         }
@@ -497,6 +512,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         if(atoi(dattim_str)>=1&&atoi(dattim_str)<=120)
         {
             device_status.dattim =atoi(dattim_str); //数据上传间隔
+            ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim));
             MA_save();
         }
         else {
@@ -511,6 +527,24 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         ctr_lamp(ON);
         device_status.sun_test = 1;
     }
+    else if (strstr(rx_buffer,"shakesec=")!=NULL)
+    {
+        static char shakesec_str[3];
+        rt_kprintf("震动时间设置!\n");
+        var = strstr(rx_buffer,"=");
+        var ++;
+        strncpy(shakesec_str,var,2);
+        if(atoi(shakesec_str)>=1&&atoi(shakesec_str)<=1000)
+        {
+            device_status.shake_sec =atoi(shakesec_str); //
+            ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));
+            MA_save();
+        }
+        else {
+            rt_kprintf("设置失败!!!\n");
+        }
+        rt_kprintf("震动时间设置:%d\n",device_status.shake_sec);
+    }
     //恢复出厂设置电池
     else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
     {
@@ -535,23 +569,82 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     else if (strstr(rx_buffer,"DebugDisable")!=NULL) {
         Debug_log_OFF();
     }
+    //1.0
     else if (strstr(rx_buffer,"SwversionV1")!=NULL)
     {
-        device_status.version_type = 1;
-        sprintf(device_status.driver, "%s",VERSION_ZP);
-        ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
-        MA_save();
+        if(device_status.version_type != 1)
+        {
+            device_status.version_type = 1;
+            sprintf(device_status.driver, "%s",VERSION_ZP);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+        else {
+
+        }
     }
-    else if (strstr(rx_buffer,"SwversionV1")!=NULL) {
-        device_status.version_type = 4;
-        sprintf(device_status.driver, "%s",VERSION_HK);
-        ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
-        MA_save();
+    //高空
+    else if (strstr(rx_buffer,"SwversionV11")!=NULL)
+    {
+        if(device_status.version_type != 11)
+        {
+            device_status.version_type = 11;
+            sprintf(device_status.driver, "%s",VERSION_ZP);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+        else {
+
+        }
+    }
+    //4.0
+    else if (strstr(rx_buffer,"SwversionV41")!=NULL) {
+        if(device_status.version_type != 41)
+        {
+            device_status.version_type = 41;
+            sprintf(device_status.driver, "%s",VERSION_HK);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+        else {
+
+        }
+    }
+    //水稻
+    else if (strstr(rx_buffer,"SwversionV4")!=NULL) {
+        if(device_status.version_type != 4)
+        {
+            device_status.version_type = 4;
+            sprintf(device_status.driver, "%s",VERSION_HK_2000W);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+        else {
+
+        }
+    }
+    //吸虫塔
+    else if (strstr(rx_buffer,"SwversionV6")!=NULL) {
+        if(device_status.version_type != 6)
+        {
+            device_status.version_type = 6;
+            sprintf(device_status.driver, "%s",VERSION_XCT);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+        else {
+
+        }
     }
     else if(strstr(rx_buffer,"DisplayPower")!=RT_NULL)
     {
         HMI_WRITE("sysTest.sysTest_power.txt=\"%s\"",device_status.power);
     }
+    //立即上传
+    else if(strstr(rx_buffer,"uploaddata")!=RT_NULL)
+    {
+        UpLoad_Data();
+    }
     else if (strstr(rx_buffer,"checkupdate")!=NULL)
     {
         time_t now = time(RT_NULL);
@@ -576,7 +669,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     else if (strstr(rx_buffer,"reboot")!=NULL) {
         rt_hw_cpu_reset();
     }
+    //屏幕上触发远程升级
+    else if (strstr(rx_buffer,"hmi_update")!=NULL) {
+        DTU_Write("hmi_update");
+        device_status.update_flag = 1;
+        ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
+        rt_thread_delay(2000);
+        rt_hw_cpu_reset();
+    }
 }
+
 //入口函数-电机控制及
 static void Ctr_Mortor_entry(void* parameter)
 {
@@ -610,6 +712,11 @@ static void Ctr_Mortor_entry(void* parameter)
                 num_up_open = 200;
                 rt_kprintf("*************************上仓门电机打开堵转!!!**********************%d\n",atoi(device_status.power));
             }
+            //如果打开仓门1S后检测不到电流增大,则判定为异常
+            else if (atoi(device_status.power)<500&&num_up_open==190&&device_status.work_status==1) {
+                DTU_Write("%s",makeJson_Warn("UP Motor OPEN ERR","device_Up_TG"));
+                rt_free(makeJson_Warn("UP Motor OPEN ERR","device_Up_TG"));
+            }
             if (num_up_open == 0)
             {
                 ctr_cangmen_up(OFF);
@@ -626,7 +733,11 @@ static void Ctr_Mortor_entry(void* parameter)
                 num_up_close = 200;
                 rt_kprintf("************************上仓门电机关闭堵转!!!**********************%d\n",atoi(device_status.power));
             }
-
+            //如果关闭仓门1S后检测不到电流增大,则判定为异常
+            else if (atoi(device_status.power)<500&&num_up_close==190&&device_status.work_status==1) {
+                DTU_Write("%s",makeJson_Warn("UP Motor CLOSE ERR","device_Up_TG"));
+                rt_free(makeJson_Warn("UP Motor CLOSE ERR","device_Up_TG"));
+            }
             if (num_up_close == 0)
             {
                 ctr_cangmen_up(OFF);
@@ -643,6 +754,11 @@ static void Ctr_Mortor_entry(void* parameter)
                 num_down_open = 200;
                 rt_kprintf("*************************下仓门电机打开堵转!!!**********************%d\n",atoi(device_status.power));
             }
+            //如果关闭仓门1S后检测不到电流增大,则判定为异常
+            else if (atoi(device_status.power)<500&&num_down_open==190&&device_status.work_status==1) {
+                DTU_Write("%s",makeJson_Warn("Down Motor OPEN ERR","device_Down_TG"));
+                rt_free(makeJson_Warn("Down Motor OPEN ERR","device_Down_TG"));
+            }
             if (num_down_open == 0)
             {
                 ctr_cangmen_down(OFF);
@@ -659,6 +775,11 @@ static void Ctr_Mortor_entry(void* parameter)
                 num_down_close = 200;
                 rt_kprintf("*************************下仓门电机关闭堵转!!!**********************%d\n",atoi(device_status.power));
             }
+            //如果关闭仓门1S后检测不到电流增大,则判定为异常
+            else if (atoi(device_status.power)<500&&num_down_close==190&&device_status.work_status==1) {
+                DTU_Write("%s",makeJson_Warn("Down Motor CLOSE ERR","device_Down_TG"));
+                rt_free(makeJson_Warn("Down Motor CLOSE ERR","device_Down_TG"));
+            }
             if (num_down_close == 0)
             {
                ctr_cangmen_down(OFF);
@@ -721,7 +842,7 @@ int Hmi_Fresh(void)
                             HMI_THREAD_STACK_SIZE,
                             HMI_THREAD_PRIORITY,
                             HMI_THREAD_TIMESLICE);
-    /*打开上仓门的线程*/
+    /*部分控制的线程*/
     ctr_motor = rt_thread_create("Ctr motor",
                             Ctr_Mortor_entry,
                             RT_NULL,
@@ -838,8 +959,7 @@ void Check_ParamConfig(void)
         ef_get_env_blob("passWord",&device_status.passWord,sizeof(device_status.passWord),NULL);                    //密码
         ef_get_env_blob("imei",&device_status.imei,sizeof(device_status.imei),NULL);                                 //IMEI
         ef_get_env_blob("iccid",&device_status.iccid,sizeof(device_status.iccid),NULL);                              //ICCID
-        ef_get_env_blob("ds",&device_status.ds,
-                sizeof(device_status.ds),NULL);                                      //开关机状态
+        ef_get_env_blob("ds",&device_status.ds,sizeof(device_status.ds),NULL);                                      //开关机状态
         ef_get_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type),NULL);        //版本类型
         ef_get_env_blob("driver_bl",&device_status.driver_bl,sizeof(device_status.driver_bl),NULL);     //BL版本号 进BL的时候存储到FLASH
         ef_get_env_blob("driver_compile",&device_status.driver_compile,sizeof(device_status.driver_compile),NULL);     //BL版本号 进BL的时候存储到FLASH
@@ -853,17 +973,29 @@ void Check_ParamConfig(void)
         if(device_status.version_type==0)
         {
             app_partion_backup();   //固件备份至df_area
-            device_status.version_type = 4;
+            device_status.version_type = 41;
+            rt_sprintf(device_status.driver, "%s",VERSION_HK);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));
         }
-        if(device_status.version_type==1)
+        else if(device_status.version_type==1)
         {
             rt_sprintf(device_status.driver, "%s",VERSION_ZP);
         }
-        else if (device_status.version_type==4) {
+        else if (device_status.version_type==11)
+        {
+            rt_sprintf(device_status.driver, "%s",VERSION_GK);
+        }
+        else if (device_status.version_type==4)
+        {
+            rt_sprintf(device_status.driver, "%s",VERSION_HK_2000W);
+        }
+        else if (device_status.version_type==41) {
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
-
+        else if (device_status.version_type==6)
+        {
+            rt_sprintf(device_status.driver, "%s",VERSION_XCT);
+        }
         rt_kprintf("SOFTWARE VERSION:%s-imei:%s--iccid:%s\n",device_status.driver,device_status.imei,device_status.iccid);
         rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
         rt_kprintf("开机次数:%d\n",device_status.rebootcnt);
@@ -901,7 +1033,7 @@ void Check_ParamConfig(void)
         Hmi_Fresh();
         dtu_data_play();
         sht30_collect();
-        mb_master_samlpe();
+        //mb_master_samlpe();
         uint16_t connect_num=0;
         //等待联网,
         while(atoi(device_status.net)==1)
@@ -916,8 +1048,6 @@ void Check_ParamConfig(void)
             if(connect_num==180)
             {
                 device_status.timeSwitch = 0;
-                //保存光控变量
-                ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
                 rt_kprintf("Time not set:%04d-%02d-%02d %02d:%02d:%02d\n",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
                 set_date(2020, 1, 1);
                 set_time(0, 0, 0);
@@ -942,7 +1072,7 @@ void ResetParamDefault(void)
     device_status.tph = 70;         //高温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
-    device_status.heatvalue=110;//加热温度
+    device_status.heatvalue=110;    //加热温度
     device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
@@ -956,8 +1086,8 @@ void ResetParamDefault(void)
     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("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));
     DTU_Write("reset.mp3");
@@ -990,7 +1120,7 @@ void ResetParamDefault_DC(void)
     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_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));

+ 4 - 1
Application_CBD/applications/main.c

@@ -66,7 +66,10 @@ int main(void)
         //开机自检
         HardWare_Check(0);
         //工作状态置位线程
-        Workstatus_check();
+        if(device_status.version_type!=6)   //吸虫塔
+        {
+            Workstatus_check();
+        }
         /***************/
         //工作流程
         Work_Loop_Task();

+ 128 - 11
Application_CBD/drivers/board.c

@@ -16,6 +16,7 @@
 #define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 TIM_HandleTypeDef htim3;
+TIM_HandleTypeDef htim8;
 ADC_HandleTypeDef hadc1;
 SPI_HandleTypeDef hspi1;
 void SystemClock_Config(void)
@@ -80,7 +81,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
 
   /* USER CODE END TIM3_MspInit 1 */
   }
-
+  else if (htim_base->Instance==TIM8)
+  {
+     __HAL_RCC_TIM8_CLK_ENABLE();
+  }
 }
 void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
 {
@@ -91,29 +95,55 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
   /* USER CODE BEGIN TIM3_MspPostInit 0 */
 
   /* USER CODE END TIM3_MspPostInit 0 */
-
-    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
     /**TIM3 GPIO Configuration
-    PC6     ------> TIM3_CH1
+    PB0     ------> TIM3_CH3
+    PB1     ------> TIM3_CH4
+    PB4     ------> TIM3_CH1
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_6;
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_4;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-    __HAL_AFIO_REMAP_TIM3_ENABLE();
+    __HAL_AFIO_REMAP_TIM3_PARTIAL();
 
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
 
   /* USER CODE END TIM3_MspPostInit 1 */
   }
+  else if(htim->Instance==TIM8)
+  {
+  /* USER CODE BEGIN TIM8_MspPostInit 0 */
+
+  /* USER CODE END TIM8_MspPostInit 0 */
+
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    /**TIM8 GPIO Configuration
+    PC7     ------> TIM8_CH2
+    PC8     ------> TIM8_CH3
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_7|GPIO_PIN_8;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
+  /* USER CODE BEGIN TIM8_MspPostInit 1 */
+
+  /* USER CODE END TIM8_MspPostInit 1 */
+  }
 
 }
+/**
+  * @brief TIM3 Initialization Function
+  * @param None
+  * @retval None
+  */
 static void MX_TIM3_Init(void)
 {
 
   /* USER CODE BEGIN TIM3_Init 0 */
-
+    HAL_TIM_Base_MspInit(&htim3);
   /* USER CODE END TIM3_Init 0 */
 
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
@@ -124,9 +154,9 @@ static void MX_TIM3_Init(void)
 
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 72-1;
+  htim3.Init.Prescaler = 72;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 500-1;
+  htim3.Init.Period = 1000;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
   if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
@@ -149,19 +179,105 @@ static void MX_TIM3_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 0;
+  sConfigOC.Pulse = 100;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
   {
     Error_Handler();
   }
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)
+  {
+    Error_Handler();
+  }
   /* USER CODE BEGIN TIM3_Init 2 */
 
   /* USER CODE END TIM3_Init 2 */
   HAL_TIM_MspPostInit(&htim3);
 
 }
+/**
+  * @brief TIM8 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_TIM8_Init(void)
+{
+
+  /* USER CODE BEGIN TIM8_Init 0 */
+
+  /* USER CODE END TIM8_Init 0 */
+
+  TIM_ClockConfigTypeDef sClockSourceConfig = {0};
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+  TIM_OC_InitTypeDef sConfigOC = {0};
+  TIM_BreakDeadTimeConfigTypeDef sBreakDeadTimeConfig = {0};
+
+  /* USER CODE BEGIN TIM8_Init 1 */
+
+  /* USER CODE END TIM8_Init 1 */
+  htim8.Instance = TIM8;
+  htim8.Init.Prescaler = 72;
+  htim8.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim8.Init.Period = 1000;
+  htim8.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
+  htim8.Init.RepetitionCounter = 0;
+  htim8.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
+  if (HAL_TIM_Base_Init(&htim8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
+  if (HAL_TIM_ConfigClockSource(&htim8, &sClockSourceConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_TIM_PWM_Init(&htim8) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim8, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sConfigOC.OCMode = TIM_OCMODE_PWM1;
+  sConfigOC.Pulse = 100;
+  sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
+  sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
+  sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
+  sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET;
+  sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET;
+  if (HAL_TIM_PWM_ConfigChannel(&htim8, &sConfigOC, TIM_CHANNEL_2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  if (HAL_TIM_PWM_ConfigChannel(&htim8, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE;
+  sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE;
+  sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF;
+  sBreakDeadTimeConfig.DeadTime = 0;
+  sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE;
+  sBreakDeadTimeConfig.BreakPolarity = TIM_BREAKPOLARITY_HIGH;
+  sBreakDeadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_DISABLE;
+  if (HAL_TIMEx_ConfigBreakDeadTime(&htim8, &sBreakDeadTimeConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM8_Init 2 */
+
+  /* USER CODE END TIM8_Init 2 */
+  HAL_TIM_MspPostInit(&htim8);
+
+}
 
 /**
 * @brief ADC MSP Initialization
@@ -272,6 +388,7 @@ static int SPI1_INIT(void)
 static int PWM3_INIT(void)
 {
     MX_TIM3_Init();
+    MX_TIM8_Init();
     return RT_EOK;
 }
 /**

+ 5 - 0
Application_CBD/drivers/board.h

@@ -204,6 +204,11 @@ extern "C" {
 /*#define BSP_USING_PWM2*/
 #define BSP_USING_PWM3
 #define BSP_USING_PWM3_CH1
+#define BSP_USING_PWM3_CH3
+#define BSP_USING_PWM3_CH4
+#define BSP_USING_PWM8
+#define BSP_USING_PWM8_CH2
+#define BSP_USING_PWM8_CH3
 
 /*-------------------------- PWM CONFIG END --------------------------*/
 

+ 11 - 0
Application_CBD/drivers/include/config/pwm_config.h

@@ -61,6 +61,17 @@ extern "C" {
 #endif /* PWM5_CONFIG */
 #endif /* BSP_USING_PWM5 */
 
+#ifdef BSP_USING_PWM8
+#ifndef PWM8_CONFIG
+#define PWM8_CONFIG                             \
+    {                                           \
+       .tim_handle.Instance     = TIM8,         \
+       .name                    = "pwm8",       \
+       .channel                 = 0             \
+    }
+#endif /* PWM3_CONFIG */
+#endif /* BSP_USING_PWM3 */
+
 #ifdef __cplusplus
 }
 #endif

+ 69 - 0
Application_CBD/readme.md

@@ -1,3 +1,72 @@
+# 2021-09-24-版本:
+#define VERSION_HK  "1.28.41(HK)"           //4.0海康
+#define VERSION_HK_2000W  "1.28.4(2000W)"   //4.0水稻
+#define VERSION_ZP  "1.27.1(ZP)"            //1.0转盘
+#define VERSION_GK  "1.27.1(GK)"            //1.0高空
+#define VERSION_XCT "1.27.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210924"
+- 水稻清扫取消限位预计检测的上传
+- 增加打开关闭上下仓门的异常检测,上报预警信息.(如果打开仓门1S后检测不到电流增大,则判定为异常)
+- 取消freemodbus线程
+--------------------------------------
+# 2021-09-24-版本:
+#define VERSION_HK  "1.27.41(HK)"           //4.0海康
+#define VERSION_HK_2000W  "1.27.4(2000W)"   //4.0水稻
+#define VERSION_ZP  "1.27.1(ZP)"            //1.0转盘
+#define VERSION_GK  "1.27.1(GK)"            //1.0高空
+#define VERSION_XCT "1.27.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210924"
+- 修复版本号与版本类型匹配上传的问题
+- 远程修改版本类型
+{"cmd": "paramconf", "ext": {"vt": "4"}
+---------------------------------------
+# 2021-09-23-版本:
+#define VERSION_HK  "1.27.41(HK)"           //4.0海康
+#define VERSION_HK_2000W  "1.27.4(2000W)"   //4.0水稻
+#define VERSION_ZP  "1.27.1(ZP)"            //1.0转盘
+#define VERSION_GK  "1.27.1(GK)"            //1.0高空
+#define VERSION_XCT "1.27.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210923"
+- 增加对吸虫塔的兼容;
+- 关于各版本兼容的适配;
+- 屏幕切换版本和下发设置版本;
+- !!!对旧版本的兼容;
+- 取消开机3分钟联网超时切换光控保存
+
+# 2021-09-22-版本:
+	define VERSION_HK "1.26.41(HK)"         //版本
+	define VERSION_ZP "1.26.1(ZP)"         //版本
+	CompileTime "20210922"
+- 针对水稻测报灯增加字段的修改;
+vtype:
+	1-(1.0转盘)
+	11-(1.0高空)
+	4-(4.0水稻)
+	5-(5.0测报灯)
+	6-(吸虫塔)
+
+# 2021-09-18-版本:
+	define VERSION_HK "1.26.41(HK)"         //版本
+	define VERSION_ZP "1.26.1(ZP)"         //版本
+	CompileTime "20210918"
+- 屏幕增加远程升级按钮的修改;
+# 2021-09-17-版本:
+	define VERSION_HK "1.26.41(HK)"         //版本
+	define VERSION_ZP "1.26.1(ZP)"         //版本
+	CompileTime "20210914"
+- 修复屏幕加热温度显示为0;
+- 屏幕增加立即上传数据按钮
+# 2021-09-14-版本:
+	define VERSION_HK "1.26.41(HK)"         //版本
+	define VERSION_ZP "1.26.1(ZP)"         //版本
+	CompileTime "20210914"
+- 修复加热时间和实时加热时间变量冲突问题;
+# 2021-09-13-版本:
+	define VERSION_HK "1.25.41(HK)"         //版本
+	define VERSION_ZP "1.25.1(ZP)"         //版本
+	CompileTime "20210913"
+- 针对加热温度平台展示的修改:
+	恒温加热函数:加热开始时上传,加热到设定温度时上传,加热每到两分钟时上传。
 # 2021-07-28-版本:
 	define VERSION_HK "1.25.41(HK)"         //版本
 	define VERSION_ZP "1.25.1(ZP)"         //版本

+ 1 - 1
Application_CBD_LED/.cproject

@@ -68,7 +68,6 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/libraries/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/libraries/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/libraries/STM32F1xx_HAL_Driver/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Application_CBD/applications}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/EasyFlash-latest/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/LedBlink-latest}&quot;"/>
@@ -90,6 +89,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/libcpu/arm/common}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/libcpu/arm/cortex-m3}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD_LED\applications&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.100549972" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>

+ 1 - 1
Application_CBD_LED/.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="483624409807790059" 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="577835862454764971" 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>

+ 179 - 32
Application_CBD_LED/applications/control.c

@@ -135,6 +135,18 @@ uint8_t ctr_lamp(uint8_t status_lamp)
     }
     return device_status.lamp_status;
 }
+//LED
+void ctr_LED(uint8_t Sta_BLUE,uint8_t Sta_YELLOW,uint8_t Sta_PURPLE,uint8_t Sta_GREEN)
+{
+    rt_pin_mode(LED_YELLOW, PIN_MODE_OUTPUT);
+    rt_pin_mode(LED_BLUE, PIN_MODE_OUTPUT);
+    rt_pin_mode(LED_PURPLE, PIN_MODE_OUTPUT);
+    rt_pin_mode(LED_GREEN, PIN_MODE_OUTPUT);
+    rt_pin_write(LED_YELLOW,Sta_YELLOW);
+    rt_pin_write(LED_BLUE,Sta_BLUE);
+    rt_pin_write(LED_PURPLE,Sta_PURPLE);
+    rt_pin_write(LED_GREEN,Sta_GREEN);
+}
 //震动电机
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
@@ -373,15 +385,14 @@ uint8_t ctr_clear(uint16_t status_clear)
 void ctr_router(uint8_t status_router)
 {
     rt_pin_mode(ROUTER, PIN_MODE_OUTPUT);
-    rt_pin_mode(POWER_CLEAR, PIN_MODE_OUTPUT);
     if(status_router==ON)
     {
         rt_pin_write(ROUTER,ON);
-        rt_pin_write(POWER_CLEAR,ON);
+        //rt_pin_write(POWER_CLEAR,ON);
     }
     else {
         rt_pin_write(ROUTER,OFF);
-        rt_pin_write(POWER_CLEAR,OFF);
+        //rt_pin_write(POWER_CLEAR,OFF);
     }
 }
 //DTU_RTU供电
@@ -453,11 +464,13 @@ void Hk_Take_io(void)
 }
 void calorstat(uint16_t heat_time)
 {
+    uint8_t heat_up_cnt = 0;
     uint16_t n = 0;
     uint16_t delay_heat = 60;
     FlagStatus heat_flg = RESET;
-    device_status.heattime = 0;
+    device_status.heat_time_min = 0;
     ctr_Heat(ON);
+    UpLoad_Data();      //开始加热时的第一条数据
     //恒温模式
     for(n=0;n < heat_time;n++)
     {
@@ -477,15 +490,25 @@ void calorstat(uint16_t heat_time)
         }
         if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         {
+            heat_up_cnt = 0;
             ctr_Heat(ON);
         }
         else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         {
+            if(heat_up_cnt==0)
+            {
+                UpLoad_Data();      //加热到设定温度的数据
+                heat_up_cnt = 1;
+            }
             ctr_Heat(OFF);
         }
         if((n % 60)==0)
         {
-            device_status.heattime = device_status.heattime + 1;
+            device_status.heat_time_min = device_status.heat_time_min + 1;
+            if(device_status.heat_time_min % 2 == 0)
+            {
+                UpLoad_Data();      //从加热开始每两分钟上传的数据
+            }
         }
         //如果触发异常退出加热
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
@@ -499,6 +522,7 @@ void calorstat(uint16_t heat_time)
         rt_kprintf("=======正在加热======:%d-%d\n",n,heat_time);
     }
     ctr_Heat(OFF);
+    UpLoad_Data();      //加热结束的数据
 }
 //初始化所有控制驱动,关闭
 void HardWare_Init(uint8_t boot)
@@ -521,7 +545,8 @@ void HardWare_Init(uint8_t boot)
     }
 
     //关闭镇流器
-    ctr_lamp(OFF);
+    //ctr_lamp(OFF);
+    ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
     if(boot==1)
     {
         HMI_WRITE("hardcheck.checktip.txt=\"镇流器已关闭!!!\"");
@@ -829,6 +854,130 @@ void WorkCheck(void)
     device_status.work_status = 0;
     rt_thread_delay(1000);
 }
+
+//工作状态检测-LED
+void WorkCheck_LED(void)
+{
+    while(device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1)
+    {
+        time_t now;
+        time(&now);
+        static struct tm nowtime;   //现在
+        static struct tm start_time;   //阶段1:17:30-18:30
+        static struct tm end_time_1;   //阶段1:17:30-18:30
+        static struct tm end_time_2;   //阶段2:18:30-19:30
+        static struct tm end_time_3;   //阶段3:19:30-20:30
+        static struct tm end_time_4;   //阶段3:20:30-22:30
+        static struct tm end_time_5;   //阶段3:22:30-01:30
+        static struct tm end_time_6;   //阶段3:01:30-05:30
+        static struct tm end_time_7;   //阶段3:05:30-06:30
+        //获取当前时间戳
+        nowtime =*localtime(&now);
+        nowtime.tm_hour = nowtime.tm_hour-8;
+
+        //获取阶段1的开始时间戳
+        start_time = *localtime(&now);
+        start_time.tm_hour = 17-8;
+        start_time.tm_min = 30;
+        start_time.tm_sec  = 0;
+        //获取阶段1的结束时间戳
+        end_time_1 = *localtime(&now);
+        end_time_1.tm_hour = 18-8;
+        end_time_1.tm_min  = 30;
+        end_time_1.tm_sec  = 0;
+
+        //获取阶段2的结束时间戳
+        end_time_2 = *localtime(&now);
+        end_time_2.tm_hour = 19-8;
+        end_time_2.tm_min = 30;
+        end_time_2.tm_sec  = 0;
+        //获取阶段3的结束时间
+        end_time_3 = *localtime(&now);
+        end_time_3.tm_hour = 20-8;
+        end_time_3.tm_min = 30;
+        end_time_3.tm_sec  = 0;
+
+        //获取阶段4的结束时间戳
+        end_time_4 = *localtime(&now);
+        end_time_4.tm_hour = 22 - 8;
+        end_time_4.tm_min  = 30;
+        end_time_4.tm_sec  = 0;
+        //获取阶段5的结束时间戳
+        end_time_5 = *localtime(&now);
+        end_time_5.tm_hour = 1 - 8;
+        end_time_5.tm_min  = 30;
+        end_time_5.tm_sec  = 0;
+        //获取阶段6的结束时间戳
+        end_time_6 = *localtime(&now);
+        end_time_6.tm_hour = 5 - 8;
+        end_time_6.tm_min  = 30;
+        end_time_6.tm_sec  = 0;
+        //获取阶段6的结束时间戳
+        end_time_7 = *localtime(&now);
+        end_time_7.tm_hour = 6 - 8;
+        end_time_7.tm_min  = 30;
+        end_time_7.tm_sec  = 0;
+        rt_kprintf("阶段1:现在时间:%d-开始时间1:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&start_time),mktime(&end_time_1));
+        rt_kprintf("阶段2:现在时间:%d-开始时间2:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_1),mktime(&end_time_2));
+        rt_kprintf("阶段3:现在时间:%d-开始时间3:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_2),mktime(&end_time_3));
+        rt_kprintf("阶段4:现在时间:%d-开始时间4:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_3),mktime(&end_time_4));
+        rt_kprintf("阶段5:现在时间:%d-开始时间5:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_4),mktime(&end_time_5));
+        rt_kprintf("阶段6:现在时间:%d-开始时间6:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_5),mktime(&end_time_6));
+        rt_kprintf("阶段7:现在时间:%d-开始时间7:%d-结束时间1:%d***\n",mktime(&nowtime),mktime(&end_time_6),mktime(&end_time_7));
+        //如果当前时间大于开始时间且小于结束时间,且没有开始工作
+        if((difftime(mktime(&nowtime), mktime(&start_time)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_1))<0))
+        {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,亮紫灯!!!\n");
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_ON, GREEN_OFF);
+            device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_1)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_2))<0)) {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,黄绿光灯打开,蓝紫光灯关!!!\n");
+            ctr_LED(BLUE_OFF, YELLOW_ON, PURPLE_OFF, GREEN_ON);
+            device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_2)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_3))<0)) {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,紫光灯打开,黄绿蓝光灯关!!!\n");
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_ON, GREEN_OFF);
+            device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_3)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_4))<0)) {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,蓝光灯打开,黄绿紫光灯关!!!\n");
+            ctr_LED(BLUE_ON, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
+            device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_4)) >=0)) {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,紫光灯打开,黄绿蓝光灯关!!!\n");
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_ON, GREEN_OFF);
+            device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime),mktime(&end_time_4))<0)&&(difftime(mktime(&nowtime),mktime(&end_time_5)) < 0)) {
+
+                rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,紫光灯打开,黄绿蓝光灯关!!!\n");
+                ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_ON, GREEN_OFF);
+                device_status.work_status = 1;
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_5)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_6))<0)) {
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
+            device_status.work_status = 0;
+            rt_kprintf("全部关灯,节约用电!!!\n");
+        }
+        else if ((difftime(mktime(&nowtime), mktime(&end_time_6)) >=0) && (difftime(mktime(&nowtime),mktime(&end_time_7))<0)) {
+            rt_kprintf("当前时间大于开始时间,小于结束时间,工作中,黄绿灯打开,紫蓝光灯关!!!\n");
+            ctr_LED(BLUE_OFF, YELLOW_ON, PURPLE_OFF, GREEN_ON);
+            device_status.work_status = 1;
+        }
+        else {
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
+            device_status.work_status = 0;
+            rt_kprintf("全部关灯,进入充电程序!!!\n");
+        }
+        rt_thread_delay(1000);
+    }
+    rt_kprintf("雨控状态,温控状态,电压状态:\n%d\n%d\n%d\n",device_status.rain_status,device_status.temp_status,device_status.bat_status);
+    device_status.work_status = 0;
+    rt_thread_delay(1000);
+}
 //工作任务流程s
 void WorkTast(void)
 {
@@ -840,9 +989,6 @@ void WorkTast(void)
     {
         device_status.work_done = 0;
         if(clt_time==0)    DTU_Write("workstart.mp3");
-        //1.打开灯管
-        ctr_lamp(ON);
-        rt_kprintf("打开灯管!!!\n");
         rt_thread_delay(5000);  //待灯管启动再往下执行,否则会触发电机过流
         //2.打开上仓门
         rt_kprintf("打开上仓门!!!\n");
@@ -857,7 +1003,7 @@ void WorkTast(void)
             //如果触发异常
             if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
             {
-                ctr_lamp(OFF);
+                ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
                 rt_kprintf("异常退出!!!\n");
                 break;
             }
@@ -865,7 +1011,8 @@ void WorkTast(void)
         clt_time = 1;
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
         {
-            ctr_lamp(OFF);
+            //ctr_lamp(OFF);
+            ctr_LED(BLUE_OFF, YELLOW_OFF, PURPLE_OFF, GREEN_OFF);
             rt_kprintf("异常退出!!!\n");
             break;
         }
@@ -929,29 +1076,29 @@ void WorkTast(void)
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)
 {
-    static uint16_t sun_status_num = 300;
-    //如果是光控定时,进行光控监测的消抖
-     if(device_status.timeSwitch==0&&device_status.sun_status==0)
-     {
-        rt_kprintf("光控定时!!!\n");
-        while(sun_status_num!=0)
-        {
-            sun_status_num--;
-            rt_thread_delay(1000);
-            rt_kprintf("开机光控检测:%d\n",sun_status_num);
-        }
-        time_t now;
-        time(&now);
-        static struct tm nowstamp;
-        nowstamp =*localtime(&now);
-        nowstamp.tm_hour = nowstamp.tm_hour - 8;
-        static rt_uint32_t nowstamp_num = 0;
-        nowstamp_num = mktime(&nowstamp);
-        device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
-     }
+//    static uint16_t sun_status_num = 300;
+//    //如果是光控定时,进行光控监测的消抖
+//     if(device_status.timeSwitch==0&&device_status.sun_status==0)
+//     {
+//        rt_kprintf("光控定时!!!\n");
+//        while(sun_status_num!=0)
+//        {
+//            sun_status_num--;
+//            rt_thread_delay(1000);
+//            rt_kprintf("开机光控检测:%d\n",sun_status_num);
+//        }
+//        time_t now;
+//        time(&now);
+//        static struct tm nowstamp;
+//        nowstamp =*localtime(&now);
+//        nowstamp.tm_hour = nowstamp.tm_hour - 8;
+//        static rt_uint32_t nowstamp_num = 0;
+//        nowstamp_num = mktime(&nowstamp);
+//        device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
+//     }
      while(1)
      {
-        WorkCheck();
+        WorkCheck_LED();
         rt_thread_delay(1);
      }
 }

+ 28 - 6
Application_CBD_LED/applications/control.h

@@ -14,10 +14,10 @@
 
 #include <rtdevice.h>
 
-#define VERSION_HK "1.25.41(HK)"         //版本
-#define VERSION_ZP "1.25.1(ZP)"         //版本
+#define VERSION_HK "1.26.41(HK)"         //版本
+#define VERSION_ZP "1.26.1(ZP)"         //版本
 
-#define CompileTime "20210728"
+#define CompileTime "20210914"
 
 
 /*******************************测试任务****************************************/
@@ -46,6 +46,7 @@ typedef struct{
     uint8_t work_done;      //工作结束   1-正常 0-工作已结束
     uint8_t bat_status;     //电压状态   1-正常 0-欠压
     uint8_t heattime;       //加热时间
+    uint8_t heat_time_min;  //实时加热时间
     uint8_t clt_time;       //收集时间
     uint8_t vol;            //音量
     uint16_t thsp;          //息屏时间
@@ -120,7 +121,7 @@ typedef struct{
 //镇流器
 #define  LAMP_SW GET_PIN(C,9)
 //震动电机
-#define SHAKE_SW GET_PIN(B,2)
+
 //补光
 #define LED_SW GET_PIN(A,15)
 //清扫
@@ -137,8 +138,28 @@ typedef struct{
 //清扫限位
 #define CLEAR_R_LIMIT GET_PIN(C,13)
 #define CLEAR_L_LIMIT GET_PIN(B,9)
-//清扫模块
-#define POWER_CLEAR GET_PIN(B,10)
+
+/***************************四色LED****************************/
+#define YELLOW      1
+#define BLUE        2
+#define PURPLE      3
+#define GREEN       4
+
+#define YELLOW_ON   1
+#define YELLOW_OFF  0
+#define BLUE_ON     1
+#define BLUE_OFF    0
+#define PURPLE_ON   1
+#define PURPLE_OFF  0
+#define GREEN_ON    1
+#define GREEN_OFF   0
+
+
+#define LED_YELLOW  GET_PIN(C,9)
+#define LED_BLUE    GET_PIN(B,2)
+#define LED_PURPLE  GET_PIN(B,10)
+#define LED_GREEN   GET_PIN(B,11)
+#define SHAKE_SW    GET_PIN(A,12)
 /***************************高空测报灯*************************/
 
 //上仓门电机限位
@@ -159,6 +180,7 @@ uint8_t ctr_lamp(uint8_t status_lamp);          //镇流器
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec);        //震动
 uint8_t ctr_clear(uint16_t status_clear);       //清扫
 void ctr_TG_Clear(uint16_t clear_timeout);      //清扫2
+void ctr_LED(uint8_t Sta_BLUE,uint8_t Sta_YELLOW,uint8_t Sta_PURPLE,uint8_t Sta_GREEN);
 uint8_t ctr_led(uint8_t status_led);            //补光灯
 void calorstat(uint16_t heat_time);             //恒温
 void ctr_router(uint8_t status_router);         //路由器

+ 3 - 3
Application_CBD_LED/applications/hmi.c

@@ -218,7 +218,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //更新收集时间
         HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
         //更新加热时间
-        HMI_WRITE("workSta.heatTime.val=%d",device_status.heattime);
+        HMI_WRITE("workSta.heatTime.val=%d",device_status.heat_time_min);
         HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
         //
         HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
@@ -454,7 +454,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         else {
             rt_kprintf("参数设置失败!!!\n");
         }
-        //MA_save();
+        MA_save();
         rt_kprintf("系统设置已保存:收集时间-%d,加热时间-%d,加热温度-%d,音量-%d,自动关屏-%d\n",device_status.clt_time,device_status.heattime,device_status.heatvalue,device_status.vol,device_status.thsp);
     }
     else if (strstr(rx_buffer,"rtc_h=")!=NULL) {
@@ -913,7 +913,7 @@ void Check_ParamConfig(void)
             connect_num++;
             rt_kprintf("联网中......%d\n",connect_num);
             //超时时间为3分钟
-            if(connect_num==180)
+            if(connect_num==30)
             {
                 device_status.timeSwitch = 0;
                 //保存光控变量

+ 17 - 2
Application_GK_CBD/applications/control.c

@@ -459,11 +459,13 @@ void Hk_Take_io(void)
 }
 void calorstat(uint16_t heat_time)
 {
+    uint8_t heat_up_cnt = 0;
     uint16_t n = 0;
     uint16_t delay_heat = 60;
     FlagStatus heat_flg = RESET;
-    device_status.heattime = 0;
+    device_status.heat_time_min = 0;
     ctr_Heat(ON);
+    UpLoad_Data();      //开始加热时的第一条数据
     //恒温模式
     for(n=0;n < heat_time;n++)
     {
@@ -483,26 +485,39 @@ void calorstat(uint16_t heat_time)
         }
         if(device_status.heattem < (device_status.heatvalue - 5)&&heat_flg == SET)
         {
+            heat_up_cnt = 0;
             ctr_Heat(ON);
         }
         else if (device_status.heattem>device_status.heatvalue&&heat_flg==SET)
         {
+            if(heat_up_cnt==0)
+            {
+                UpLoad_Data();      //加热到设定温度的数据
+                heat_up_cnt = 1;
+            }
             ctr_Heat(OFF);
         }
         if((n % 60)==0)
         {
-            device_status.heattime = device_status.heattime + 1;
+            device_status.heat_time_min = device_status.heat_time_min + 1;
+            if(device_status.heat_time_min % 2 == 0)
+            {
+                UpLoad_Data();      //从加热开始每两分钟上传的数据
+            }
         }
         //如果触发异常退出加热
         if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
         {
+            rt_kprintf("============================触发异常退出加热==========================");
             ctr_lamp(OFF);
             ctr_Heat(OFF);
             break;
         }
         rt_thread_delay(1000);
+        rt_kprintf("=======正在加热======:%d-%d\n",n,heat_time);
     }
     ctr_Heat(OFF);
+    UpLoad_Data();      //加热结束的数据
 }
 //初始化所有控制驱动,关闭
 void HardWare_Init(uint8_t boot)

+ 3 - 2
Application_GK_CBD/applications/control.h

@@ -15,9 +15,9 @@
 #include <rtdevice.h>
 #define VERSION_HK "1.14.41(HK)"         //版本
 #define VERSION_ZP "1.14.1(ZP)"         //版本
-#define VERSION "1.0.3(GK)"
+#define VERSION "1.1.3(GK)"
 
-#define CompileTime "20210728"
+#define CompileTime "20210917"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/
@@ -45,6 +45,7 @@ typedef struct{
     uint8_t work_done;      //工作结束   1-正常 0-工作已结束
     uint8_t bat_status;     //电压状态   1-正常 0-欠压
     uint8_t heattime;       //加热时间
+    uint8_t heat_time_min;  //实时加热时间
     uint8_t clt_time;       //收集时间
     uint8_t vol;            //音量
     uint16_t thsp;          //息屏时间

+ 2 - 3
Application_GK_CBD/applications/hmi.c

@@ -220,7 +220,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //更新收集时间
         HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
         //更新加热时间
-        HMI_WRITE("workSta.heatTime.val=%d",device_status.heattime);
+        HMI_WRITE("workSta.heatTime.val=%d",device_status.heat_time_min);
         HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
         //
         HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
@@ -291,12 +291,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
-        Motor_Juandai();
     }
     //震动
     else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
         rt_kprintf("\n震动!\n");
-        Motor_shake(ON,device_status.shake_sec);
+
     }
     //打开补光
     else if (strstr(rx_buffer,"putTest.switchFill=1")!=NULL) {

+ 1 - 0
Application_GK_CBD/applications/sht30_collect.c

@@ -192,6 +192,7 @@ static void Power_ReadCheck(void *parameter)
         {
             device_status.rain_status = 1;
             ctr_lamp(OFF);
+            device_status.ctr_up_motor =1;    //打开上仓门
             rain_cnt = 0;
         }
         else {

+ 4 - 0
Application_GK_CBD/readme.md

@@ -1,3 +1,7 @@
+## 2021-09-17-版本:1.1.3(GK)
+###版本更新:
+- 雨控关闭上仓门
+- 加热数据上传
 ## 2021-07-28-版本:1.0.3(GK)
 ###版本更新:
 - 电机驱动PWM

+ 1 - 1
CBD_FOTA_BootLoader/makefile.targets

@@ -4,4 +4,4 @@ clean2:
 	-@echo ' '
 
 
-*.elf: $(wildcard D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/linkscripts/STM32F103RE/link.lds)
+*.elf: $(wildcard ../linkscripts/STM32F103RE/link.lds)