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

+ 9 - 4
Application_cbd_apm32f1/applications/control.c

@@ -209,8 +209,8 @@ uint8_t ctr_Heat(uint8_t status_heat)
     rt_pin_write(Heat_Pin,status_heat);
     return status_heat;
 }
-/*制冷*/
-uint8_t ctr_Cold(uint8_t status_cold)
+/*传感器供电*/
+uint8_t ctr_Sensor_24V(uint8_t status_cold)
 {
     device_status.cold_status = status_cold;
     rt_pin_mode(Cold_Pin, PIN_MODE_OUTPUT);
@@ -1271,10 +1271,11 @@ void pin_guangshan_unbind(void)
 /*上电初始化*/
 void ResetInit(void)
 {
+    ctr_Sensor_24V(ON);   //传感器供电
+
     ctr_router(ON);
     ctr_RTU_DTU(ON);
     ctr_Heat(OFF);
-    ctr_Cold(OFF);
     ctr_led(OFF);
     ctr_shake(OFF, 0);
     ctr_photo(ON);
@@ -1650,7 +1651,11 @@ static void thread_485_play_entry(void *param)
         {
             LOG_I("Interrupt occurred and processed.");
             //发送串口消息,通知JETSON计算卡进行拍照
-            DTU_Write("{\"guangshan\":\"on\"}");
+            DTU_Write("guangshan.mp3"); //提示音
+            //延迟
+            device_status.photo_ws = 5;
+//            DTU_Write("{\"guangshan\":\"on\"}");
+
         }
     }
 }

+ 6 - 1
Application_cbd_apm32f1/applications/control.h

@@ -131,6 +131,10 @@ typedef struct  _packed
     char gps_state[8];         //定位类型
     char tempture[12];         //温度
     char humidity[12];         //湿度
+    char windspeed[12];        //风速
+    char winddir[12];          //风向
+    char ap[12];               //大气压hpa
+    char rainfall[12];         //雨量
     char driver[64];           //版本
     char driver_4g[64];        //4g版本
     char driver_bl[64];        //BL版本
@@ -258,7 +262,7 @@ void ctr_Motor_Driver_Power(uint8_t status_ws);
 #define Motor_EN    GET_PIN(B,14)
 #define Motor_DIR   GET_PIN(B,15)
 void ctr_turn(uint8_t v,uint8_t sta);
-uint8_t ctr_Cold(uint8_t status_cold);
+uint8_t ctr_Sensor_24V(uint8_t status_cold);
 uint8_t ctr_Cool_Fan(uint8_t status_cool);          //散热风机
 uint8_t ctr_Collect_Fan(uint8_t status_collect);    //采集风机
 void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_out); //步进电机
@@ -291,6 +295,7 @@ void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 /*****************************************************/
 uint16_t ctr_xmove(uint32_t xdis,uint16_t pulse);
+uint16_t ctr_Motor86_move(uint32_t xdis,uint32_t pulse,uint8_t dir);
 /***********************孢子仪****************************/
 void alarm_app_router(void);
 /***************************************************/

+ 21 - 53
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -388,7 +388,7 @@ static void dtu_thread_entry_send(void *parameter)
                 {
                     HMI_WRITE("sleep=%d",1);
                 }
-                LOG_I("掉电检测:%d-%d",atoi(device_status.voltage),device_status.power_status);
+                //LOG_I("掉电检测:%d-%d",atoi(device_status.voltage),device_status.power_status);
                 //检测到电源掉电
                 if(atoi(device_status.voltage)<5&&device_status.power_status==1)
                 {
@@ -961,9 +961,17 @@ char * makeJson()
     pJsonRoot = cJSON_CreateObject();
     if(NULL==pJsonRoot)
     {
-        rt_kprintf("cJSON pJsonRoot NULL!!!\n");
+        LOG_E("cJSON pJsonRoot NULL!!!\n");
         return NULL;
     }
+
+    cJSON * qixiang_data = cJSON_CreateObject();
+    if(qixiang_data==NULL)
+    {
+        LOG_E("cJSON_CreateObject qixiang_data Failed!");
+        return NULL;
+    }
+
     memset(device_status.driver,0,sizeof(device_status.driver));
     if(device_status.version_type==5)
     {
@@ -974,7 +982,7 @@ char * makeJson()
     pSubJson = cJSON_CreateObject();
     if(NULL==pSubJson)
     {
-        rt_kprintf("cJSON pSubJson NULL!!!\n");
+        LOG_E("cJSON pSubJson NULL!!!\n");
         return NULL;
     }
 
@@ -994,6 +1002,7 @@ char * makeJson()
         strcat(device_status.driver,".485");
     }
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
+    cJSON_AddItemToObject(pSubJson,"qx_data",qixiang_data);
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
     //设备类型
@@ -1002,6 +1011,14 @@ char * makeJson()
     //类型细分
     cJSON_AddStringToObject(pSubJson,"vtype","5");
 
+
+    cJSON_AddStringToObject(qixiang_data,"at",device_status.tempture);
+    cJSON_AddStringToObject(qixiang_data,"ah",device_status.humidity);
+    cJSON_AddStringToObject(qixiang_data,"qiya",device_status.ap);
+    cJSON_AddStringToObject(qixiang_data,"fengsu",device_status.windspeed);
+    cJSON_AddStringToObject(qixiang_data,"fengxiang",device_status.winddir);
+    cJSON_AddStringToObject(qixiang_data,"yuiang",device_status.rainfall);
+
     if(device_status.version_type!=6&&device_status.dtype!=7)
     {
         //光控定时
@@ -1074,56 +1091,6 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.stopBar);
         cJSON_AddStringToObject(pSubJson,"et",utos);
     }
-    else if(device_status.dtype==7)
-    {
-        char ct1[10],ct2[10];
-        rt_sprintf(ct1,"%d-%d",device_status.collecting_sh1,device_status.collecting_eh1);
-        rt_sprintf(ct2,"%d-%d",device_status.collecting_sh2,device_status.collecting_eh2);
-        rt_kprintf("ct1-ct2:%s\n",ct1);
-        device_status.coll_time[0] = ct1;
-        device_status.coll_time[1] = ct2;
-        cJSON *data_clt = NULL;
-        data_clt = cJSON_CreateStringArray(device_status.coll_time,2);
-        //工作状态
-        rt_sprintf(utos, "%d",device_status.work_status);
-        cJSON_AddStringToObject(pSubJson,"work_sta",utos);
-        //运行状态
-        rt_sprintf(utos, "%d",device_status.run_sta);
-        cJSON_AddStringToObject(pSubJson,"run_sta",utos);
-        //箱体温度-box_tem
-        rt_sprintf(utos, "%d",device_status.box_temp);
-        cJSON_AddStringToObject(pSubJson,"box_tem",utos);
-        //培养时间-cul_time
-        rt_sprintf(utos, "%d",device_status.cul_time);
-        cJSON_AddStringToObject(pSubJson,"cul_time",utos);
-        //制冷状态
-        rt_sprintf(utos, "%d",device_status.cold_sw);
-        cJSON_AddStringToObject(pSubJson,"cold_sw",utos);
-        //电压状态-batStatus
-        rt_sprintf(utos, "%d",device_status.bat_status);
-        cJSON_AddStringToObject(pSubJson,"batStatus",utos);
-        //已培养时间-staytime
-        rt_sprintf(utos, "%d",device_status.stay_time);
-        cJSON_AddStringToObject(pSubJson,"stay_time",utos);
-        //风机开关
-        rt_sprintf(utos, "%d",device_status.wind_sw);
-        cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
-        //培养仓温度
-        rt_sprintf(utos, "%d",device_status.pre_temp);
-        cJSON_AddStringToObject(pSubJson,"pre_temp",utos);
-        //分辨率
-        cJSON_AddStringToObject(pSubJson,"imgres","0");
-        //usb
-        cJSON_AddStringToObject(pSubJson,"usb_sta","0");
-        //雨控状态-rps
-        rt_sprintf(utos, "%d",device_status.rain_status);
-        cJSON_AddStringToObject(pSubJson,"rps",utos);
-        //收集时间
-        cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
-        //设定温度
-        rt_sprintf(utos, "%d",device_status.heatvalue);
-        cJSON_AddStringToObject(pSubJson,"set_temp",utos);
-    }
     if(device_status.dtype!=7)
     {
         //震动开关
@@ -1164,6 +1131,7 @@ char * makeJson()
     //信号强度
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
 
+
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {

+ 44 - 340
Application_cbd_apm32f1/applications/hmi.c

@@ -321,8 +321,13 @@ static void HMI_Decode(void)
             HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
             //ID
             HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
-            HMI_WRITE("menu.deviceId.txt=\"%s\"",device_status.deviceId);
-            //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
+            HMI_WRITE("menu.s1.txt=\"%s\"",device_status.tempture);
+            HMI_WRITE("menu.s2.txt=\"%s\"",device_status.humidity);
+            HMI_WRITE("menu.s3.txt=\"%s\"",device_status.windspeed);
+            HMI_WRITE("menu.s4.txt=\"%s\"",device_status.winddir);
+            HMI_WRITE("menu.s5.txt=\"%s\"",device_status.ap);
+            HMI_WRITE("menu.s6.txt=\"%s\"",device_status.rainfall);
+
             //数据上传间隔
             HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
             //语音音量
@@ -402,30 +407,7 @@ static void HMI_Decode(void)
         device_status.photo_ws = 1;
         #endif
     }
-    //转盘复位
-    else if (strstr(rx_buffer,"turn_init")!=NULL) {
-        LOG_I("转仓复位!");
-        ctr_turn(0,0);
-    }
-    //转盘
-    else if (strstr(rx_buffer,"turn")!=NULL) {
-        LOG_I("转仓!");
-        ctr_turn(90,0);
-    }
-    //打开电磁阀
-    else if (strstr(rx_buffer,"putTest.switchDrop=1")!=NULL) {
-        LOG_I("开始滴液!");
-        #if Color_EN == 1
-        device_status.run_sta = 5;
-        #else
-        ctr_shake(ON, device_status.shake_sec);
-        #endif
-    }
-    //关闭电磁阀
-    else if (strstr(rx_buffer,"putTest.switchDrop=0")!=NULL) {
-        LOG_I("停止滴液!");
-        ctr_shake(OFF, 0);
-    }
+
     //打开补光
     else if (strstr(rx_buffer,"putTest.switchLed=1")!=NULL) {
         LOG_I("打开补光!!");
@@ -448,16 +430,6 @@ static void HMI_Decode(void)
         ctr_Heat(ON);
         LOG_I("Open Heat!");
     }
-    //打开制冷
-    else if(strstr(rx_buffer,"putTest.switchCold=1")!=NULL) {
-        ctr_Cold(ON);
-        LOG_I("Open Cold!");
-    }
-    //关闭制冷
-    else if(strstr(rx_buffer,"putTest.switchCold=0")!=NULL) {
-        ctr_Cold(OFF);
-        LOG_I("Close Cold!");
-    }
     //打开采集
     else if(strstr(rx_buffer,"putTest.switchCollect=1")!=NULL){
         ctr_Collect_Fan(ON);
@@ -468,16 +440,7 @@ static void HMI_Decode(void)
         ctr_Collect_Fan(OFF);
         LOG_I("采集风机已关闭!");
     }
-    //打开散热
-    else if(strstr(rx_buffer,"putTest.switchCool=1")!=NULL){
-        ctr_Cool_Fan(ON);
-        LOG_I("散热风机已打开!");
-    }
-    //关闭散热
-    else if(strstr(rx_buffer,"putTest.switchCool=0")!=NULL){
-        ctr_Cool_Fan(OFF);
-        LOG_I("散热风机已关闭!");
-    }
+
 
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
@@ -516,9 +479,8 @@ static void HMI_Decode(void)
         ctr_lamp(ON,2);
         ctr_lamp(ON,3);
         #endif
-        DTU_Write("{\"cmd\":\"workstart\"}");
-        USHORT dkdg[] = {0xb4f2,0xbfaa,0xb5c6,0xb9dc};
-        _485_play(dkdg,4);
+
+
     }
 
     //关闭灯管
@@ -531,9 +493,7 @@ static void HMI_Decode(void)
         ctr_lamp(OFF,2);
         ctr_lamp(OFF,3);
         #endif
-        DTU_Write("{\"cmd\":\"workdone\"}");
-        USHORT gbdg[] = {0xb9d8,0xb1d5,0xb5c6,0xb9dc};
-        _485_play(gbdg,4);
+
     }
     //关闭加热
     else if(strstr(rx_buffer,"putTest.switchHeat=0")!=NULL) {
@@ -549,66 +509,27 @@ static void HMI_Decode(void)
     }
     //打开上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
-        if(device_status.dtype==7)
-        {
-            ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 0,1000000,500);
-            LOG_I("开始步进上行!");
-        }
-        else
-        {
-            rt_kprintf("Open UP!\n");
-            ctr_cangmen_up(OFF);
-            device_status.ctr_up_motor = 1;
-        }
+        rt_kprintf("Open UP!\n");
+        ctr_cangmen_up(OFF);
+        device_status.ctr_up_motor = 1;
     }
     //关闭上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
-        if(device_status.dtype==7)
-        {
-            LOG_I("停止步进上行!");
-            ctr_lamp(OFF, 1);
-            ctr_Motor_Driver(0, 0,0,0);
-        }
-        else
-        {
-            rt_kprintf("CLOSE UP!\n");
-            ctr_cangmen_up(OFF);
-            device_status.ctr_up_motor = 2;
-        }
-
+        rt_kprintf("CLOSE UP!\n");
+        ctr_cangmen_up(OFF);
+        device_status.ctr_up_motor = 2;
     }
     //打开下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
-        if(device_status.dtype==7)
-        {
-            LOG_I("开始步进下行!");
-            ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 1,1000000,500);
-        }
-        else
-        {
-            ctr_cangmen_down(OFF);
-            device_status.ctr_down_motor = 1;
-            rt_kprintf("Open down!\n");
-        }
-
+        ctr_cangmen_down(OFF);
+        device_status.ctr_down_motor = 1;
+        rt_kprintf("Open down!\n");
     }
     //关闭下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
-        if(device_status.dtype==7)
-        {
-            ctr_lamp(OFF, 1);
-            ctr_Motor_Driver(0, 0,0,0);
-            rt_kprintf("停止步进下行!\n");
-        }
-        else
-        {
-            ctr_cangmen_down(OFF);
-            device_status.ctr_down_motor = 2;
-            rt_kprintf("CLOSE down!\n");
-        }
-
+        ctr_cangmen_down(OFF);
+        device_status.ctr_down_motor = 2;
+        rt_kprintf("CLOSE down!\n");
     }
     else if(strstr(rx_buffer,"putTest.Testpaichong")!=NULL){
         if(device_status.collt_box_sta==0){
@@ -673,35 +594,6 @@ static void HMI_Decode(void)
             }
         }
     }
-    //设备编码设置
-    else if (strstr(rx_buffer,"deviceId=")!=NULL)
-    {
-        char value_str[20];
-        memset(value_str,0,sizeof(value_str));
-        LOG_I("设备编码 长度:%d",strlen(rx_buffer));
-        if(strlen(rx_buffer)!=19){
-            LOG_E("编码长度错误!");
-            return;
-        }
-        var = strstr(rx_buffer,"=");
-        var ++;
-        strncpy(value_str,var,8);  //设备编码为16位
-        if(strstr(value_str,"00000000")!=RT_NULL){
-            char *config_reset = makeJson_Config_Reset();
-            //发送json到RTU
-            DTU_Write("%s",config_reset);
-            rt_free(config_reset);
-            //恢复RTU的默认配置参数
-        }else{
-            rt_sprintf(device_status.deviceId,"10300101%s",value_str);   //设备大类编码103-虫情 设备小类编码 001 生产商代码01
-            ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
-            LOG_I("解析到设备编码:%s",device_status.deviceId);
-            char *device_id = makeJson_Config_BDH(device_status.deviceId);
-            //发送json到RTU
-            DTU_Write("%s",device_id);
-            rt_free(device_id);
-        }
-    }
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
         char value_str[10];
@@ -1065,12 +957,6 @@ static void HMI_Decode(void)
         rt_free(json_temp);
 
     }
-    //获取SIM卡信息
-    else if(strstr(rx_buffer,"getSim")!=NULL)
-    {
-        //http://sim.openluat.com/api/wechat/openapidoc
-        DTU_Write("getsiminfo");
-    }
     else if (strstr(rx_buffer,"DebugEnable")!=NULL) {
         Debug_log_ON();
     }
@@ -1089,20 +975,7 @@ static void HMI_Decode(void)
     {
         UpLoad_Data();
     }
-    else if (strstr(rx_buffer,"checkupdate")!=NULL)
-    {
-        time_t now = time(RT_NULL);
-        static struct tm tm;
-        gmtime_r(&now, &tm);
-        HMI_WRITE("hardcheck.tip_rtc.txt=\"%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);
-        HMI_WRITE("hardcheck.p0.pic=%d",70);
-        //RTC时间判断,如果当前年份小于2020,提示需要设置时间
-        if(tm.tm_year+1900<2020)
-        {
-            rt_kprintf("时间未设置:%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);
-            HMI_WRITE("hardcheck.tip_rtc.txt=%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);
-        }
-    }
+
     //进入bootloader模式
     else if (strstr(rx_buffer,"bootloader")!=NULL) {
         device_status.stop_in_bootloader = 1;
@@ -1120,13 +993,8 @@ static void HMI_Decode(void)
         DTU_Write("{\"cmd\": \"saveLog_usb\"}");
     }
     //屏幕上触发远程升级
-    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();
-
+    else if (strstr(rx_buffer,"board_update")!=NULL) {
+        DTU_Write("board_update");
     }else if (strstr(rx_buffer,"SaveRecordParam")!=NULL){
         //"SaveRecordParam:10000-200"
         int param1, param2;
@@ -1257,70 +1125,51 @@ static void Ctr_Mortor_entry(void* parameter)
         #endif
         if(device_status.ctr_up_motor==1)
         {
-            #if 0
-            if(num_up_open==200&&device_status.clear_status==0&&device_status.work_status==1)
-            {
-                motor_current = atoi(device_status.power);
-                LOG_D("上仓门待机电流:%d",motor_current);
-            }
-            //打开上仓门
-            if(num_up_open<200)
-            #endif
             ctr_cangmen_up(OPEN);
             num_up_open--;
-//            current_t[num_up_open] = atoi(device_status.power);
             if (num_up_open == 0)
             {
                 ctr_cangmen_up(OFF);
                 num_up_open = 200;
             }
-//            else {
-//                LOG_D("上仓门打开电流:%d",current_t[num_up_open]);
-//            }
+            num_up_close= 200;
         }
         else if(device_status.ctr_up_motor==2)
         {
-//            if(num_up_close==200&&device_status.clear_status==0&&device_status.work_status==1)
-//            {
-//                motor_current = atoi(device_status.power);
-//                LOG_D("上仓门待机电流:%d",motor_current);
-//            }
-//            if(num_up_close<200)
             ctr_cangmen_up(CLOSE);
             num_up_close --;
-//            current_t[num_up_close] = atoi(device_status.power);
+
             if (num_up_close == 0)
             {
                 ctr_cangmen_up(OFF);
                 num_up_close= 200;
             }
-            //LOG_D("上仓门关闭电流:%d",current_t[num_up_close]);
+            num_up_open = 200;
         }
         if (device_status.ctr_down_motor == 1)
         {
             ctr_cangmen_down(OPEN);
             num_down_open--;
-//            current_t[num_down_open] = atoi(device_status.power);
+
             //如果关闭仓门1S后检测不到电流增大,则判定为异常
             if (num_down_open == 0)    //2025-07-07,增加限位检测
             {
                 ctr_cangmen_down(OFF);
                 num_down_open = 200;
             }
-//            LOG_D("下仓门打开电流:%d",current_t[num_down_open]);
+
         }
         else if (device_status.ctr_down_motor == 2)
         {
             ctr_cangmen_down(CLOSE);
             num_down_close--;
-//            current_t[num_down_close] = atoi(device_status.power);
 
             if (num_down_close == 0)
             {
                ctr_cangmen_down(OFF);
                num_down_close = 200;
             }
-//            LOG_D("下仓门关闭电流:%d",current_t[num_down_close]);
+
         }
         if(device_status.sun_test==1)
         {
@@ -1369,71 +1218,17 @@ static void Ctr_Mortor_entry(void* parameter)
         }else{
             photo_led_sec = 900;
         }
-        /*对焦拍照*/
-        if(device_status.autotakepic==1)
+        if(device_status.photo_ws==5)
         {
-            DTU_Write("autotakephoto");
-            HMI_WRITE("sysTest.auto_flag.txt=\"Autotest\"");
-            //打开步进电机驱动器电源
-            ctr_lamp(ON, 1);
-            //打开补光灯
-            ctr_led(ON);
-            //电机向下运动
-            ctr_Motor_Driver(1, 1, 1000000,1000);
-            rt_thread_delay(1000);
-            LOG_I("电机到达下方!!!");
-            Hk_Take_io();
-            rt_thread_delay(1000);
-            LOG_I("电机开始向上!!!");
-            rt_pin_write(Motor_EN, 1);
-            rt_pin_write(Motor_DIR, 0);
-            beep_set(1000000, 200000);      //2kzh - 50%
-            while(rt_pin_read(LIMIT_UP)==1)
+            photo_led_sec--;
+            if(photo_led_sec==890)
             {
-                HMI_WRITE("sysTest.result.txt=\"对焦拍照触发次数:%d\"",photo_setup);
-                HMI_WRITE("sysTest.auto_flag.txt=\"AutoTeststart\"");
-                rt_pin_write(Motor_EN, 0);
-                beep_set(0, 0);//驱动器失能
-                Hk_Take_io();              //触发拍照
-                rt_thread_mdelay(200);   //10ms
-                rt_pin_write(Motor_EN, 1);
-                beep_set(1000000, 200000); //驱动器使能
-                rt_thread_mdelay(100);   //10ms
-                beep_set(0, 0); //驱动器失能
-                rt_pin_write(Motor_EN, 0);
-                if(photo_setup>300)         //限制最大拍照数量
-                {
-                    ctr_led(OFF);
-                    device_status.autotakepic=0;
-                    rt_pin_write(Motor_EN, 0); //驱动器失能
-                    beep_set(1000000, 0);      //2kzh - 50%
-                    HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-                    HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-                    ctr_lamp(OFF, 1);
-                    break;
-                }
-                photo_setup++;
-                LOG_I("对焦拍照:%d",photo_setup);
+                Hk_Take_io();
+                device_status.photo_ws = 0;
+            }else if (photo_led_sec==889) {
+                photo_led_sec = 900;
+                ctr_Motor86_move(0, 50000, 0);
             }
-            DTU_Write("takephotodone");
-            ctr_led(OFF);
-            rt_pin_write(Motor_EN, 0); //驱动器失能
-            beep_set(1000000, 0);      //2kzh - 50%
-            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            device_status.autotakepic=0;
-            photo_setup = 0;
-            HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            //关闭步进电机驱动器电源
-            ctr_lamp(OFF, 1);
-            //重置运行标志位
-            device_status.run_sta = 0;
-            ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
-         }
-
-        if(device_status.fsl_sw==1)
-        {
-            ctr_Petroleum_jelly(10);
         }
 
         if(device_status.collt_box_sta==111){
@@ -1497,95 +1292,6 @@ static void Ctr_Mortor_entry(void* parameter)
             }
         }
 
-        //一键测试
-        if(device_status.auto_test_sw==1)
-        {
-            HMI_WRITE("sysTest.auto_flag.txt=\"Autotest\"");
-            //转盘复位
-            LOG_I("转盘复位!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:转盘复位!\"");
-            rt_thread_delay(2000);
-            ctr_turn(0,0);
-            //转90
-            LOG_I("第一次转盘!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:第一次转盘!\"");
-            ctr_turn(90,0);
-            rt_thread_delay(2000);
-            //推杆电机:测试粘附:
-            LOG_I("涂凡士林!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:涂凡士林!\"");
-            ctr_Petroleum_jelly(10);
-            rt_thread_delay(2000);
-            //转90
-            LOG_I("第二次转盘!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:第二次转盘!\"");
-            ctr_turn(90,0);
-            rt_thread_delay(2000);
-            //采集,打开风机
-            LOG_I("采集,打开风机!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:采集,打开风机!\"");
-            ctr_Collect_Fan(ON);
-            rt_thread_delay(5000);
-            LOG_I("采集结束,关闭风机!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:采集结束,关闭风机!\"");
-            rt_thread_delay(2000);
-            ctr_Collect_Fan(OFF);
-            //散热
-            LOG_I("打开散热!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:打开散热!\"");
-            rt_thread_delay(2000);
-            ctr_Cool_Fan(ON);
-            rt_thread_delay(5000);
-            LOG_I("关闭散热!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:关闭散热!\"");
-            rt_thread_delay(2000);
-            ctr_Cool_Fan(OFF);
-            //转90
-            LOG_I("第三次转盘!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:第三次转盘!\"");
-            ctr_turn(90,0);
-            rt_thread_delay(5000);
-            //滴液
-            LOG_I("开始滴液!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:开始滴液!\"");
-            rt_thread_delay(2000);
-            ctr_shake(ON,device_status.shake_sec);
-            rt_thread_delay(5000);
-            LOG_I("停止滴液!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:停止滴液!\"");
-            rt_thread_delay(2000);
-            //加热
-            LOG_I("开始加热!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:开始加热!\"");
-            rt_thread_delay(2000);
-            ctr_Heat(ON);
-            rt_thread_delay(5000);
-            LOG_I("停止加热!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:停止加热!\"");
-            rt_thread_delay(2000);
-            ctr_Heat(OFF);
-            //制冷
-            LOG_I("开始制冷!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:开始制冷!\"");
-            rt_thread_delay(2000);
-            ctr_Cold(ON);
-            rt_thread_delay(5000);
-            LOG_I("停止制冷!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:停止制冷!\"");
-            rt_thread_delay(2000);
-            ctr_Cold(OFF);
-            //转90
-            LOG_I("第四次转盘!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:第四次转盘!\"");
-            ctr_turn(90,0);
-            LOG_I("打开补光灯!!!");
-            HMI_WRITE("sysTest.result.txt=\"一键测试:打开补光灯!\"");
-            rt_thread_delay(2000);
-            ctr_led(ON);
-            device_status.autotakepic=1;
-            device_status.auto_test_sw=0;
-            HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-        }
         if(device_status.selfcheck_ws==2)
         {
            selfcheck(1);
@@ -1870,11 +1576,9 @@ void Check_ParamConfig(void)
         ctr_router(OFF);
 #endif
         Hmi_Fresh();
-        if(device_status.dtype!=7)
-        {
-            Control_clear();
-            Control_Check();    //自检
-        }
+
+        Control_clear();
+
         dtu_data_play();
         sht30_collect();
 #if SENSOR_EN==1

+ 62 - 13
Application_cbd_apm32f1/applications/sample_mb_master.c

@@ -12,6 +12,13 @@
 #include <user_mb_app.h>
 #include "control.h"
 #include "hmi.h"
+
+#define DBG_ENABLE
+#define DBG_COLOR
+#define DBG_TAG "modbus"
+#define DBG_LEVEL         DBG_LOG
+#include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
+
 #ifdef PKG_MODBUS_MASTER_SAMPLE
 #define SLAVE_ADDR      MB_SAMPLE_TEST_SLAVE_ADDR
 #define PORT_NUM        MB_MASTER_USING_PORT_NUM
@@ -95,27 +102,69 @@ static void send_thread_entry(void *parameter)
         #endif
         if(device_status.sensor_485_sta!=200){
 
-            error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
+            error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,13,1000);//读多个保持寄存器
             // 发送写多个保持寄存器请求
             //error_code = eMBMasterReqWriteMultipleHoldingRegister(SLAVE_ADDRESS,REGISTER_ADDRESS,REGISTER_COUNT,usDataBuffer,1000);
-            rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
+            LOG_I("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
             if(error_code==0)
             {
                 device_status.sensor_485_sta = 100;
                 error_count = 0;
-                //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
-    //            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
-    //            {
-                    rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (unsigned int)usMRegHoldBuf[0][0] % 100);
-                    rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (unsigned int)usMRegHoldBuf[0][1] % 100);
-    //                sprintf(device_status.tempture,"%0.01f",(float)usMRegHoldBuf[0][0]/100);
-    //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
-    //            }
-                    //rt_thread_delay(1000);
+                LOG_I("usMRegHoldBuf[0]:%d\n",(int)usMRegHoldBuf[0][0]);    //温度
+                LOG_I("usMRegHoldBuf[1]:%d\n",(int)usMRegHoldBuf[0][1]);    //湿度
+                LOG_I("usMRegHoldBuf[2]:%d\n",(int)usMRegHoldBuf[0][2]);    //照度十位
+                LOG_I("usMRegHoldBuf[3]:%d\n",(int)usMRegHoldBuf[0][3]);    //照度个位
+                LOG_I("usMRegHoldBuf[4]:%d\n",(int)usMRegHoldBuf[0][4]);    //雨量累计
+                LOG_I("usMRegHoldBuf[5]:%d\n",(int)usMRegHoldBuf[0][5]);    //C02
+                LOG_I("usMRegHoldBuf[6]:%d\n",(int)usMRegHoldBuf[0][6]);    //大气压力
+                LOG_I("usMRegHoldBuf[7]:%d\n",(int)usMRegHoldBuf[0][7]);    //辐射
+                LOG_I("usMRegHoldBuf[8]:%d\n",(int)usMRegHoldBuf[0][8]);    //PM2.5
+                LOG_I("usMRegHoldBuf[9]:%d\n",(int)usMRegHoldBuf[0][9]);    //PM10
+                LOG_I("usMRegHoldBuf[10]:%d\n",(int)usMRegHoldBuf[0][10]);    //PM100
+                LOG_I("usMRegHoldBuf[11]:%d\n",(int)usMRegHoldBuf[0][11]);    //风速
+                LOG_I("usMRegHoldBuf[12]:%d\n",(int)usMRegHoldBuf[0][12]);    //风向
+
+
+                rt_sprintf(device_status.tempture,"%d.%01d",(int)usMRegHoldBuf[0][0]/10, (unsigned int)usMRegHoldBuf[0][0] % 10);
+                rt_sprintf(device_status.humidity,"%d.%01d",(int)usMRegHoldBuf[0][1]/10, (unsigned int)usMRegHoldBuf[0][1] % 10);
+                rt_sprintf(device_status.ap,"%d.%01d",(int)usMRegHoldBuf[0][6]/10, (unsigned int)usMRegHoldBuf[0][6] % 10);
+                rt_sprintf(device_status.windspeed,"%d.%02d",(int)usMRegHoldBuf[0][11]/100, (unsigned int)usMRegHoldBuf[0][11] % 100);
+                rt_sprintf(device_status.winddir,"%d",(int)usMRegHoldBuf[0][12]);
+
+                if(usMRegHoldBuf[0][0]==32767)
+                {
+                    rt_sprintf(device_status.tempture,"NA");
+                }else if (usMRegHoldBuf[0][1]==32767) {
+                    rt_sprintf(device_status.humidity,"NA");
+                }else if (usMRegHoldBuf[0][6]==32767) {
+                    rt_sprintf(device_status.ap,"NA");
+                }else if (usMRegHoldBuf[0][11]==32767) {
+                    rt_sprintf(device_status.windspeed,"NA");
+                }else if (usMRegHoldBuf[0][12]==32767) {
+                    rt_sprintf(device_status.winddir,"NA");
+                }
+
+                LOG_I("温度:%s 湿度:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
+                LOG_I("大气压:%s\n",device_status.ap);//0代表从机ID=1
+                LOG_I("风速:%s\n",device_status.windspeed);//0代表从机ID=1
+                LOG_I("风向:%s\n",device_status.winddir);//0代表从机ID=1
             }
+        }else {
+            rt_sprintf(device_status.tempture,"NA");
+            rt_sprintf(device_status.humidity,"NA");
+            rt_sprintf(device_status.windspeed,"NA");
+            rt_sprintf(device_status.winddir,"NA");
+        }
+        rt_thread_delay(1000);
+        eMBMasterReqErrCode rainfall_e = eMBMasterReqReadHoldingRegister(0x02, MB_SEND_REG_START,1,1000);//读单个保持寄存器
+        if(rainfall_e==0)
+        {
+            LOG_I("usMRegHoldBuf[0]:%d\n",(int)usMRegHoldBuf[0][0]);    //雨量
+            rt_sprintf(device_status.rainfall,"%d.%01d",(int)usMRegHoldBuf[0][0]/10, (unsigned int)usMRegHoldBuf[0][0] % 10);
+            LOG_I("雨量:%s mm/min",device_status.rainfall);
+        }else {
+            rt_sprintf(device_status.rainfall,"NA");
         }
-        rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
-        rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1
         rt_thread_delay(5000);
         /* Record the number of errors */
         if (error_code != 0)

+ 0 - 1
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -229,7 +229,6 @@ static void Power_ReadCheck(void *parameter)
             ctr_photo(OFF); //关闭相机供电
             ctr_led(OFF);   //关闭补光灯
             ctr_Heat(OFF);  //关闭加热
-            ctr_Cold(OFF);  //关闭制冷
             #if Color_EN == 0
             ctr_cangmen_down(OFF);  //关闭下仓门输出(转盘)
             ctr_cangmen_up(OFF);    //关闭上仓门输出(散热)

+ 1 - 1
Application_cbd_apm32f1/rtconfig.h

@@ -156,7 +156,7 @@
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
 #define RT_M_REG_HOLDING_START 0
-#define RT_M_REG_HOLDING_NREGS 10
+#define RT_M_REG_HOLDING_NREGS 13
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4
 #define RT_M_CO_RESERVE 0